Mesa (master): intel: Fix scatter/gather for depthstencil textures

Chad Versace chadversary at kemper.freedesktop.org
Tue Oct 18 11:44:27 PDT 2011


Module: Mesa
Branch: master
Commit: ef6de0141ca7c9757ef40b3db18202b11ab2ec98
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef6de0141ca7c9757ef40b3db18202b11ab2ec98

Author: Chad Versace <chad at chad-versace.us>
Date:   Fri Oct  7 12:12:46 2011 -0700

intel: Fix scatter/gather for depthstencil textures

During anholt's MapTextureImage refactoring, the call to
intel_tex_image_s8z24_create_renderbuffers was missplaced. It needs to
occur *after* the miptree is allocated.

Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Chad Versace <chad at chad-versace.us>

---

 src/mesa/drivers/dri/intel/intel_tex.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c
index 83ba50e..fff2dae 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.c
+++ b/src/mesa/drivers/dri/intel/intel_tex.c
@@ -66,11 +66,6 @@ intel_alloc_texture_image_buffer(struct gl_context *ctx,
     */
    ctx->Driver.FreeTextureImageBuffer(ctx, image);
 
-   if (intel->must_use_separate_stencil
-       && image->TexFormat == MESA_FORMAT_S8_Z24) {
-      intel_tex_image_s8z24_create_renderbuffers(intel, intel_image);
-   }
-
    if (intel_texobj->mt &&
        intel_miptree_match_image(intel_texobj->mt, image)) {
       intel_miptree_reference(&intel_image->mt, intel_texobj->mt);
@@ -90,6 +85,11 @@ intel_alloc_texture_image_buffer(struct gl_context *ctx,
        */
       intel_miptree_reference(&intel_texobj->mt, intel_image->mt);
 
+      if (intel->must_use_separate_stencil
+          && image->TexFormat == MESA_FORMAT_S8_Z24) {
+         intel_tex_image_s8z24_create_renderbuffers(intel, intel_image);
+      }
+
       DBG("%s: alloc obj %p level %d %dx%dx%d using new miptree %p\n",
           __FUNCTION__, texobj, image->Level,
           width, height, depth, intel_image->mt);



More information about the mesa-commit mailing list