From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 24 Apr 2009 23:39:00 +0000 (-0700)
Subject: intel: Fix more issues with the combined depth-stencil attachment
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=022319b92ccd2f3bfc4aca54ebc7e39aeddd8b21;p=mesa.git

intel: Fix more issues with the combined depth-stencil attachment
---

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 84460327426..eb224a8a413 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -361,13 +361,20 @@ intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
        intel_region_release(&region);
 
        if (buffers[i].attachment == __DRI_BUFFER_DEPTH_STENCIL) {
-	  struct intel_region *stencil_region = NULL;
-
-	  intel_region_reference(&stencil_region, region);
-
 	  rb = intel_get_renderbuffer(&intel_fb->Base, BUFFER_STENCIL);
-	  intel_renderbuffer_set_region(rb, stencil_region);
-	  intel_region_release(&stencil_region);
+	  if (rb != NULL) {
+	     struct intel_region *stencil_region = NULL;
+
+	     if (rb->region) {
+		dri_bo_flink(rb->region->buffer, &name);
+		if (name == buffers[i].name)
+		   continue;
+	     }
+
+	     intel_region_reference(&stencil_region, region);
+	     intel_renderbuffer_set_region(rb, stencil_region);
+	     intel_region_release(&stencil_region);
+	  }
        }
    }