summaryrefslogtreecommitdiff
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorCorbin Simpson <MostAwesomeDude@gmail.com>2009-10-12 20:47:00 -0700
committerCorbin Simpson <MostAwesomeDude@gmail.com>2009-10-12 21:48:07 -0700
commit95a05621eb750c07e5c7a5eb64b8458d202192b3 (patch)
treeca1c37c52a32bf6749da6a3ac936b4a63fc574d4 /src/gallium/drivers
parent36ccdf09b8483305c7fa1366de9df2dea2fd6985 (diff)
r300g: Fallback on surfaces we can't render to or from.
Still not sure why st keeps handing down things we can't render to.
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/r300/r300_surface.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/gallium/drivers/r300/r300_surface.c b/src/gallium/drivers/r300/r300_surface.c
index cc6288cb51..4d0ccd6b0f 100644
--- a/src/gallium/drivers/r300/r300_surface.c
+++ b/src/gallium/drivers/r300/r300_surface.c
@@ -113,9 +113,10 @@ static void r300_surface_fill(struct pipe_context* pipe,
dest, x, y, w, h, pixpitch, color);
/* Fallback? */
- if (FALSE) {
+ if (!pipe->screen->is_format_supported(pipe->screen, dest->format,
+ PIPE_TEXTURE_2D, PIPE_TEXTURE_USAGE_RENDER_TARGET, 0)) {
fallback:
- debug_printf("r300: Falling back on surface clear...");
+ debug_printf("r300: Falling back on surface clear...\n");
util_surface_fill(pipe, dest, x, y, w, h, color);
return;
}
@@ -245,10 +246,18 @@ static void r300_surface_copy(struct pipe_context* pipe,
if ((srctex->buffer == desttex->buffer) &&
((destx < srcx + w) || (srcx < destx + w)) &&
((desty < srcy + h) || (srcy < desty + h))) {
+ goto fallback;
+ }
+
+ if (!pipe->screen->is_format_supported(pipe->screen, src->format,
+ PIPE_TEXTURE_2D, PIPE_TEXTURE_USAGE_SAMPLER, 0) ||
+ !pipe->screen->is_format_supported(pipe->screen, dest->format,
+ PIPE_TEXTURE_2D, PIPE_TEXTURE_USAGE_RENDER_TARGET, 0)) {
fallback:
debug_printf("r300: Falling back on surface_copy\n");
util_surface_copy(pipe, FALSE, dest, destx, desty, src,
srcx, srcy, w, h);
+ return;
}
/* Add our target BOs to the list. */