Mesa (master): r300: fallback on depth buffer blits
Maciej Cencora
osiris at kemper.freedesktop.org
Sat Jan 9 18:55:00 UTC 2010
Module: Mesa
Branch: master
Commit: cf1748053af4a8c2f3fa4e033f8b28c4390ddd3b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf1748053af4a8c2f3fa4e033f8b28c4390ddd3b
Author: Maciej Cencora <m.cencora at gmail.com>
Date: Sat Jan 9 18:12:55 2010 +0100
r300: fallback on depth buffer blits
Depth buffer accelerated blits aren't implemented yet.
---
src/mesa/drivers/dri/r300/r300_blit.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/r300/r300_blit.c b/src/mesa/drivers/dri/r300/r300_blit.c
index ea626d9..9e3836a 100644
--- a/src/mesa/drivers/dri/r300/r300_blit.c
+++ b/src/mesa/drivers/dri/r300/r300_blit.c
@@ -181,8 +181,6 @@ static uint32_t mesa_format_to_us_format(gl_format mesa_format)
{
switch(mesa_format)
{
- case MESA_FORMAT_S8_Z24:
- case MESA_FORMAT_X8_Z24:
case MESA_FORMAT_RGBA8888: // x
return EASY_US_FORMAT(R500_OUT_FMT_C4_8, A, B, G, R, 0);
case MESA_FORMAT_RGB565: // x
@@ -216,7 +214,8 @@ static uint32_t mesa_format_to_us_format(gl_format mesa_format)
return EASY_US_FORMAT(R500_OUT_FMT_C4_16, R, G, B, A, 0xf);
default:
- assert(!"Invalid format for US output\n");
+ fprintf(stderr, "Unsupported format %s for US output\n", _mesa_get_format_name(mesa_format));
+ assert(0);
return 0;
}
}
@@ -541,6 +540,9 @@ GLboolean r300_blit(struct r300_context *r300,
unsigned reg_height,
unsigned flip_y)
{
+ if (_mesa_get_format_bits(src_mesaformat, GL_DEPTH_BITS) > 0)
+ return GL_FALSE;
+
/* Need to clamp the region size to make sure
* we don't read outside of the source buffer
* or write outside of the destination buffer.
More information about the mesa-commit
mailing list