summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2014-03-03 10:39:08 -0800
committerEric Anholt <eric@anholt.net>2014-03-11 12:47:44 -0700
commitfeb3d8dacd587683ded706049d696d1904cb87cd (patch)
tree76e55c7607f5ee1650b1c8c17747156e4d2dd52d /src/mesa/drivers/dri
parentec542d74578bbef6b55125dd6aba1dc7f5079e65 (diff)
downloadexternal_mesa3d-feb3d8dacd587683ded706049d696d1904cb87cd.zip
external_mesa3d-feb3d8dacd587683ded706049d696d1904cb87cd.tar.gz
external_mesa3d-feb3d8dacd587683ded706049d696d1904cb87cd.tar.bz2
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 <kenneth@whitecape.org> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/brw_state_upload.c2
-rw-r--r--src/mesa/drivers/dri/i965/intel_buffers.c18
-rw-r--r--src/mesa/drivers/dri/i965/intel_buffers.h2
-rw-r--r--src/mesa/drivers/dri/i965/intel_pixel_bitmap.c2
-rw-r--r--src/mesa/drivers/dri/i965/intel_pixel_copy.c1
-rw-r--r--src/mesa/drivers/dri/i965/intel_pixel_draw.c2
6 files changed, 0 insertions, 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 226a9c0..7ae2e1e 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 23d936f..f151287 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 f0f6b68..9014029 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 49a9bed..29c2d28 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 486e308..858be26 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 2925b63..8ca8ae4 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;
}