i965/gen7: Use stencil copy when sampling the stencil texture

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 9f340ef92de..1298d4e5fc5 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -452,9 +452,17 @@ brw_update_texture_surface(struct gl_context *ctx,
       }
 
       if (obj->StencilSampling && firstImage->_BaseFormat == GL_DEPTH_STENCIL) {
-         assert(brw->gen >= 8);
-         mt = mt->stencil_mt;
+         if (brw->gen == 7) {
+            assert(mt->stencil_tex_mt && !mt->stencil_mt->stencil_tex_needs_update);
+            mt = mt->stencil_tex_mt;
+         } else {
+            assert(brw->gen >= 8);
+            mt = mt->stencil_mt;
+         }
          format = BRW_SURFACEFORMAT_R8_UINT;
+      } else if (brw->gen == 7 && mt->format == MESA_FORMAT_S_UINT8) {
+         assert(!mt->stencil_tex_needs_update);
+         mt = mt->stencil_tex_mt;
       }
 
       const int surf_index = surf_offset - &brw->wm.base.surf_offset[0];