From feb3d8dacd587683ded706049d696d1904cb87cd Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 3 Mar 2014 10:39:08 -0800 Subject: [PATCH] i965: Drop intel_check_front_buffer_rendering(). This was being applied in a subset of the places that intel_prepare_render() was called, to set the same flag that intel_prepare_render() was setting. Reviewed-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i965/brw_state_upload.c | 2 -- src/mesa/drivers/dri/i965/intel_buffers.c | 18 ------------------ src/mesa/drivers/dri/i965/intel_buffers.h | 2 -- src/mesa/drivers/dri/i965/intel_pixel_bitmap.c | 2 -- src/mesa/drivers/dri/i965/intel_pixel_copy.c | 1 - src/mesa/drivers/dri/i965/intel_pixel_draw.c | 2 -- 6 files changed, 27 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 226a9c021e2..7ae2e1e6825 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -607,8 +607,6 @@ void brw_upload_state(struct brw_context *brw) if ((state->mesa | state->cache | state->brw) == 0) return; - intel_check_front_buffer_rendering(brw); - if (unlikely(INTEL_DEBUG)) { /* Debug version which enforces various sanity checks on the * state flags which are generated and checked to help ensure diff --git a/src/mesa/drivers/dri/i965/intel_buffers.c b/src/mesa/drivers/dri/i965/intel_buffers.c index 23d936ff10c..f1512872c3b 100644 --- a/src/mesa/drivers/dri/i965/intel_buffers.c +++ b/src/mesa/drivers/dri/i965/intel_buffers.c @@ -34,24 +34,6 @@ #include "main/framebuffer.h" #include "main/renderbuffer.h" -/** - * Check if we're about to draw into the front color buffer. - * If so, set the brw->front_buffer_dirty field to true. - */ -void -intel_check_front_buffer_rendering(struct brw_context *brw) -{ - struct gl_context *ctx = &brw->ctx; - const struct gl_framebuffer *fb = ctx->DrawBuffer; - if (_mesa_is_winsys_fbo(fb)) { - /* drawing to window system buffer */ - if (fb->_NumColorDrawBuffers > 0) { - if (fb->_ColorDrawBufferIndexes[0] == BUFFER_FRONT_LEFT) { - brw->front_buffer_dirty = true; - } - } - } -} bool brw_is_front_buffer_reading(struct gl_framebuffer *fb) diff --git a/src/mesa/drivers/dri/i965/intel_buffers.h b/src/mesa/drivers/dri/i965/intel_buffers.h index f0f6b68b889..9014029e3be 100644 --- a/src/mesa/drivers/dri/i965/intel_buffers.h +++ b/src/mesa/drivers/dri/i965/intel_buffers.h @@ -35,8 +35,6 @@ struct intel_framebuffer; -extern void intel_check_front_buffer_rendering(struct brw_context *brw); - extern void intelInitBufferFuncs(struct dd_function_table *functions); bool brw_is_front_buffer_reading(struct gl_framebuffer *fb); diff --git a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c index 49a9bed1921..29c2d28aaba 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_bitmap.c @@ -321,8 +321,6 @@ out: ctx->Driver.UnmapBuffer(ctx, unpack->BufferObj, MAP_INTERNAL); } - intel_check_front_buffer_rendering(brw); - return true; } diff --git a/src/mesa/drivers/dri/i965/intel_pixel_copy.c b/src/mesa/drivers/dri/i965/intel_pixel_copy.c index 486e3082533..858be26e699 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_copy.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_copy.c @@ -190,7 +190,6 @@ do_blit_copypixels(struct gl_context * ctx, ctx->Query.CurrentOcclusionObject->Result += width * height; out: - intel_check_front_buffer_rendering(brw); DBG("%s: success\n", __FUNCTION__); return true; diff --git a/src/mesa/drivers/dri/i965/intel_pixel_draw.c b/src/mesa/drivers/dri/i965/intel_pixel_draw.c index 2925b63192d..8ca8ae4fdbc 100644 --- a/src/mesa/drivers/dri/i965/intel_pixel_draw.c +++ b/src/mesa/drivers/dri/i965/intel_pixel_draw.c @@ -133,8 +133,6 @@ do_blit_drawpixels(struct gl_context * ctx, if (ctx->Query.CurrentOcclusionObject) ctx->Query.CurrentOcclusionObject->Result += width * height; - intel_check_front_buffer_rendering(brw); - DBG("%s: success\n", __FUNCTION__); return true; } -- 2.30.2