summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorMaciej Cencora <m.cencora@gmail.com>2009-11-10 19:47:04 +0100
committerMaciej Cencora <m.cencora@gmail.com>2009-12-12 00:52:51 +0100
commitc1a7cc1e44e2c318eaa1de67893d20774f6fec5f (patch)
tree5826bd27e510856a6a2feaf4be13ba8062be3093 /src/mesa/drivers/dri
parentcd5f167353f16fb4f5b349002625b704f3e23778 (diff)
more blit fixes
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/r300/r300_blit.c2
-rw-r--r--src/mesa/drivers/dri/r300/r300_texcopy.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_blit.c b/src/mesa/drivers/dri/r300/r300_blit.c
index 515a85caa2..b4c4b9c9cc 100644
--- a/src/mesa/drivers/dri/r300/r300_blit.c
+++ b/src/mesa/drivers/dri/r300/r300_blit.c
@@ -218,6 +218,8 @@ 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
diff --git a/src/mesa/drivers/dri/r300/r300_texcopy.c b/src/mesa/drivers/dri/r300/r300_texcopy.c
index 039276eacc..1e10c7326c 100644
--- a/src/mesa/drivers/dri/r300/r300_texcopy.c
+++ b/src/mesa/drivers/dri/r300/r300_texcopy.c
@@ -49,10 +49,8 @@ do_copy_texsubimage(GLcontext *ctx,
struct r300_context *r300 = R300_CONTEXT(ctx);
struct radeon_renderbuffer *rrb;
- if (_mesa_get_format_bits(timg->base.TexFormat, GL_DEPTH_BITS) ||
- _mesa_get_format_bits(timg->base.TexFormat, GL_STENCIL_BITS)) {
+ if (_mesa_get_format_bits(timg->base.TexFormat, GL_DEPTH_BITS) > 0) {
rrb = radeon_get_depthbuffer(&r300->radeon);
- return GL_FALSE;
} else {
rrb = radeon_get_colorbuffer(&r300->radeon);
}