radeon: Use _mesa_is_front_buffer_drawing

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.c b/src/mesa/drivers/dri/radeon/radeon_common.c
index 6e4b4c48808bcef5e36f083b058e6a836c3e9048..155d3a392c76f1afa2c15be48c7116c9ee920f4f 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_common.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common.c
@@ -175,27 +175,6 @@ uint32_t radeonGetAge(radeonContextPtr radeon)
        return age;
 }
 
-/**
- * Check if we're about to draw into the front color buffer.
- * If so, set the intel->front_buffer_dirty field to true.
- */
-void
-radeon_check_front_buffer_rendering(struct gl_context *ctx)
-{
-       radeonContextPtr radeon = RADEON_CONTEXT(ctx);
-       const struct gl_framebuffer *fb = ctx->DrawBuffer;
-
-       if (fb->Name == 0) {
-               /* drawing to window system buffer */
-               if (fb->_NumColorDrawBuffers > 0) {
-                       if (fb->_ColorDrawBufferIndexes[0] == BUFFER_FRONT_LEFT) {
-                               radeon->front_buffer_dirty = GL_TRUE;
-                       }
-               }
-       }
-}
-
-
 void radeon_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
        radeonContextPtr radeon = RADEON_CONTEXT(ctx);

diff --git a/src/mesa/drivers/dri/radeon/radeon_common.h b/src/mesa/drivers/dri/radeon/radeon_common.h
index fedaf5063a762e6a260643cbfdb71a285edb7141..ada49560662b7d5349d73edcfb509eb72cea1599 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_common.h
+++ b/src/mesa/drivers/dri/radeon/radeon_common.h
@@ -37,7 +37,6 @@ radeonReadPixels(struct gl_context * ctx,
                                GLenum format, GLenum type,
                                const struct gl_pixelstore_attrib *pack, GLvoid * pixels);
 
-void radeon_check_front_buffer_rendering(struct gl_context *ctx);
 static inline struct radeon_renderbuffer *radeon_renderbuffer(struct gl_renderbuffer *rb)
 {
        struct radeon_renderbuffer *rrb = (struct radeon_renderbuffer *)rb;

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h
index e70e334aba4ccd8cb842477fa1e040b7b439ad20..efb2e6016b70af8d5b29aa33e425bb6f733d0e1d 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_screen.h
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.h
@@ -126,7 +126,6 @@ struct __DRIimageRec {
 #define radeon_prepare_render               r200_radeon_prepare_render
 #define radeonUnbindContext                 r200_radeonUnbindContext
 #define radeon_update_renderbuffers         r200_radeon_update_renderbuffers
-#define radeon_check_front_buffer_rendering r200_radeon_check_front_buffer_rendering
 #define radeonCountStateEmitSize            r200_radeonCountStateEmitSize
 #define radeon_draw_buffer                  r200_radeon_draw_buffer
 #define radeonDrawBuffer                    r200_radeonDrawBuffer

diff --git a/src/mesa/drivers/dri/radeon/radeon_span.c b/src/mesa/drivers/dri/radeon/radeon_span.c
index 42f62a0cb7f418cf9b264d671bbb3eb27b03fe38..648df5cc146f5d6a28a386b1b62e905f02710002 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_span.c
+++ b/src/mesa/drivers/dri/radeon/radeon_span.c
@@ -44,6 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/texformat.h"
 #include "main/renderbuffer.h"
 #include "main/samplerobj.h"
+#include "main/framebuffer.h"
 #include "swrast/swrast.h"
 #include "swrast/s_renderbuffer.h"
 
@@ -97,7 +98,8 @@ radeon_map_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
        for (i = 0; i < BUFFER_COUNT; i++)
                radeon_renderbuffer_map(ctx, fb->Attachment[i].Renderbuffer);
 
-       radeon_check_front_buffer_rendering(ctx);
+        if (_mesa_is_front_buffer_drawing(fb))
+               RADEON_CONTEXT(ctx)->front_buffer_dirty = true;
 }
 
 static void
@@ -113,7 +115,8 @@ radeon_unmap_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
        for (i = 0; i < BUFFER_COUNT; i++)
                radeon_renderbuffer_unmap(ctx, fb->Attachment[i].Renderbuffer);
 
-       radeon_check_front_buffer_rendering(ctx);
+        if (_mesa_is_front_buffer_drawing(fb))
+               RADEON_CONTEXT(ctx)->front_buffer_dirty = true;
 }
 
 static void radeonSpanRenderStart(struct gl_context * ctx)