From 3f41f7d1a033dfafc5c3aa1600ecfffd94de0406 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 7 Dec 2011 18:12:04 -0800 Subject: [PATCH] i965: Drop separate stencil assertions in update_draw_buffer(). The comment said they deserved to be in emit_depthbuffer, and at this point they were all there already. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_vtbl.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c index c0a0b52434d..bc76ec23749 100644 --- a/src/mesa/drivers/dri/i965/brw_vtbl.c +++ b/src/mesa/drivers/dri/i965/brw_vtbl.c @@ -95,16 +95,12 @@ brw_update_draw_buffer(struct intel_context *intel) { struct gl_context *ctx = &intel->ctx; struct gl_framebuffer *fb = ctx->DrawBuffer; - struct intel_renderbuffer *irbStencil = NULL; - bool fb_has_hiz = intel_framebuffer_has_hiz(fb); if (!fb) { /* this can happen during the initial context initialization */ return; } - irbStencil = intel_get_renderbuffer(fb, BUFFER_STENCIL); - /* Do this here, not core Mesa, since this function is called from * many places within the driver. */ @@ -123,18 +119,6 @@ brw_update_draw_buffer(struct intel_context *intel) return; } - /* Check some stencil invariants. These should probably be in - * emit_depthbuffer(). - */ - if (irbStencil && irbStencil->mt) { - if (!intel->has_separate_stencil) - assert(irbStencil->Base.Format == MESA_FORMAT_S8_Z24); - if (fb_has_hiz || intel->must_use_separate_stencil) - assert(irbStencil->Base.Format == MESA_FORMAT_S8); - if (irbStencil->Base.Format == MESA_FORMAT_S8) - assert(intel->has_separate_stencil); - } - /* Mesa's Stencil._Enabled field is updated when * _NEW_BUFFERS | _NEW_STENCIL, but i965 code assumes that the value * only changes with _NEW_STENCIL (which seems sensible). So flag it -- 2.30.2