Don't print debug messages unless the user explicitly requested them

[mesa.git] / src / mesa / drivers / dri / r300 / radeon_lock.c

diff --git a/src/mesa/drivers/dri/r300/radeon_lock.c b/src/mesa/drivers/dri/r300/radeon_lock.c
index 4579bc4ac4039ff9a4c256043cfa9bca2992369d..3c7fc72a426496ed9464e3ac90a44fe9200b0541 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_lock.c
+++ b/src/mesa/drivers/dri/r300/radeon_lock.c
@@ -40,6 +40,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_ioctl.h"
 #include "radeon_state.h"
 
+#include "framebuffer.h"
+
 #if DEBUG_LOCKING
 char *prevLockFile = NULL;
 int prevLockLine = 0;
@@ -53,7 +55,7 @@ static void radeonUpdatePageFlipping(radeonContextPtr radeon)
 
        radeon->doPageFlip = radeon->sarea->pfState;
 
-       use_back = (radeon->glCtx->Color._DrawDestMask[0] == DD_BACK_LEFT_BIT);
+       use_back = (radeon->glCtx->DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_BACK_LEFT);
        use_back ^= (radeon->sarea->pfCurrentPage == 1);
 
        if (use_back) {
@@ -68,6 +70,7 @@ static void radeonUpdatePageFlipping(radeonContextPtr radeon)
 /**
  * Called by radeonGetLock() after the lock has been obtained.
  */
+#if R200_MERGED
 static void r200RegainedLock(r200ContextPtr r200)
 {
        __DRIdrawablePrivate *dPriv = r200->radeon.dri.drawable;
@@ -82,7 +85,7 @@ static void r200RegainedLock(r200ContextPtr r200)
                r200->hw.ctx.cmd[CTX_RB3D_COLORPITCH] =
                        r200->radeon.state.color.drawPitch;
 
-               if (r200->radeon.glCtx->Color._DrawDestMask[0] == DD_BACK_LEFT_BIT)
+               if (r200->radeon.glCtx->DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_BACK_LEFT)
                        radeonSetCliprects(&r200->radeon, GL_BACK_LEFT);
                else
                        radeonSetCliprects(&r200->radeon, GL_FRONT_LEFT);
@@ -94,15 +97,20 @@ static void r200RegainedLock(r200ContextPtr r200)
                DRI_AGE_TEXTURES(r200->texture_heaps[i]);
        }
 }
+#endif
 
 static void r300RegainedLock(radeonContextPtr radeon)
 {
        __DRIdrawablePrivate *dPriv = radeon->dri.drawable;
 
        if (radeon->lastStamp != dPriv->lastStamp) {
+               _mesa_resize_framebuffer(radeon->glCtx,
+                       (GLframebuffer*)dPriv->driverPrivate,
+                       dPriv->w, dPriv->h);
+
                radeonUpdatePageFlipping(radeon);
 
-               if (radeon->glCtx->Color._DrawDestMask[0] == DD_BACK_LEFT_BIT)
+               if (radeon->glCtx->DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_BACK_LEFT)
                        radeonSetCliprects(radeon, GL_BACK_LEFT);
                else
                        radeonSetCliprects(radeon, GL_FRONT_LEFT);
@@ -111,7 +119,7 @@ static void r300RegainedLock(radeonContextPtr radeon)
                radeon->lastStamp = dPriv->lastStamp;
        }
 
-#if 0
+#if R200_MERGED
        for (i = 0; i < r200->nr_heaps; i++) {
                DRI_AGE_TEXTURES(r200->texture_heaps[i]);
        }
@@ -149,8 +157,10 @@ void radeonGetLock(radeonContextPtr radeon, GLuint flags)
 
        if (IS_FAMILY_R300(radeon))
                r300RegainedLock(radeon);
+#if R200_MERGED
        else
                r200RegainedLock((r200ContextPtr)radeon);
-
+#endif
+       
        radeon->lost_context = GL_TRUE;
 }