From: Maciej Cencora <m.cencora@gmail.com>
Date: Tue, 10 Nov 2009 18:47:04 +0000 (+0100)
Subject: more blit fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1a7cc1e44e2c318eaa1de67893d20774f6fec5f;p=mesa.git

more blit fixes
---

diff --git a/src/mesa/drivers/dri/r300/r300_blit.c b/src/mesa/drivers/dri/r300/r300_blit.c
index 515a85caa29..b4c4b9c9cc2 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 039276eaccd..1e10c7326cb 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);
     }