[Mesa-dev] [PATCH 61/70] i965: Move the stencil cache-flush into the common stencil meta op

[Chris Wilson]

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
index f13a8b7..4d1473a 100644
--- a/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
+++ b/src/mesa/drivers/dri/i965/brw_meta_stencil_blit.c
@@ -454,6 +454,7 @@ brw_meta_stencil_blit(struct brw_context *brw,
    _mesa_set_enable(ctx, GL_DEPTH_TEST, false);
 
    _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
+   ctx->NewDriverState |= BRW_NEW_CACHE_FLUSH;
 
 error:
    ctx->Extensions.ARB_texture_stencil8 = false;
@@ -499,11 +500,9 @@ brw_meta_fbo_stencil_blit(struct brw_context *brw,
                              .mirror_x = mirror_x, .mirror_y = mirror_y };
    adjust_mip_level(dst_mt, dst_irb->mt_level, dst_irb->mt_layer, &dims);
 
-   ctx->NewDriverState |= BRW_NEW_CACHE_FLUSH;
    _mesa_meta_begin(ctx, MESA_META_ALL);
    brw_meta_stencil_blit(brw,
                          dst_mt, dst_irb->mt_level, dst_irb->mt_layer, &dims);
-   ctx->NewDriverState |= BRW_NEW_CACHE_FLUSH;
 }
 
 void
@@ -523,7 +522,6 @@ brw_meta_stencil_updownsample(struct brw_context *brw,
    if (dst->stencil_mt)
       dst = dst->stencil_mt;
 
-   ctx->NewDriverState |= BRW_NEW_CACHE_FLUSH;
    _mesa_meta_begin(ctx, MESA_META_ALL);
 
    _mesa_GenFramebuffers(1, &fbo);
@@ -534,7 +532,6 @@ brw_meta_stencil_updownsample(struct brw_context *brw,
                                  GL_RENDERBUFFER, rbo);
 
    brw_meta_stencil_blit(brw, dst, 0, 0, &dims);
-   ctx->NewDriverState |= BRW_NEW_CACHE_FLUSH;
 
    _mesa_DeleteRenderbuffers(1, &rbo);
    _mesa_DeleteFramebuffers(1, &fbo);
-- 
2.5.0