Major check-in of changes for GL_EXT_framebuffer_object extension.

Main driver impacts:
- new code for creating the Mesa GLframebuffer
- new span/pixel read/write code
Some drivers not yet updated/tested.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/mesa/drivers/dri/gamma/gamma_span.c b/src/mesa/drivers/dri/gamma/gamma_span.c
index c953dfd08f..db61f1c777 100644
--- a/src/mesa/drivers/dri/gamma/gamma_span.c
+++ b/src/mesa/drivers/dri/gamma/gamma_span.c
@@ -268,10 +268,10 @@ static void gammaSetBuffer( GLcontext *ctx,
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
 
    switch ( bufferBit ) {
-   case DD_FRONT_LEFT_BIT:
+   case BUFFER_BIT_FRONT_LEFT:
       gmesa->readOffset = 0;
       break;
-   case DD_BACK_LEFT_BIT:
+   case BUFFER_BIT_BACK_LEFT:
       gmesa->readOffset = gmesa->driScreen->fbHeight * gmesa->driScreen->fbWidth * gmesa->gammaScreen->cpp; 
       break;
    default:
diff --git a/src/mesa/drivers/dri/gamma/gamma_state.c b/src/mesa/drivers/dri/gamma/gamma_state.c
index 4d9d92fdb6..24a6b3672c 100644
--- a/src/mesa/drivers/dri/gamma/gamma_state.c
+++ b/src/mesa/drivers/dri/gamma/gamma_state.c
@@ -230,12 +230,12 @@ static void gammaDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
     VALIDATE_DRAWABLE_INFO_NO_LOCK(gmesa);
 #endif
 
-    if (mask & DD_DEPTH_BIT) {
+    if (mask & BUFFER_BIT_DEPTH) {
 	 /* Turn off writes the FB */
 	 CHECK_DMA_BUFFER(gmesa, 1);
 	 WRITE(gmesa->buf, FBWriteMode, FBWriteModeDisable);
 
-	 mask &= ~DD_DEPTH_BIT;
+	 mask &= ~BUFFER_BIT_DEPTH;
 
 	 /*
 	  * Turn Rectangle2DControl off when the window is not clipped
@@ -349,13 +349,13 @@ static void gammaDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 	}
     }
 
-    if (mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT)) {
+    if (mask & (BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT)) {
 	int y = gmesa->driScreen->fbHeight - gmesa->driDrawable->y - gmesa->driDrawable->h;
 	int x = gmesa->driDrawable->x;
 	int w = gmesa->driDrawable->w;
 	int h = gmesa->driDrawable->h;
 
-	mask &= ~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT);
+	mask &= ~(BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT);
 
 	if (x < 0) { w -= -x; x = 0; }