Add new void *addr and __DRIdrawablePrivate parameters to

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

diff --git a/src/mesa/drivers/dri/r300/radeon_screen.c b/src/mesa/drivers/dri/r300/radeon_screen.c
index 03c30f82973bbdcad76c72da4f52ef91a770699c..eb6100c62715f055e0dea2fd6b478f78926a9d5e 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_screen.c
+++ b/src/mesa/drivers/dri/r300/radeon_screen.c
@@ -665,46 +665,59 @@ radeonCreateBuffer(__DRIscreenPrivate * driScrnPriv,
                const GLboolean swAccum = mesaVis->accumRedBits > 0;
                const GLboolean swStencil = mesaVis->stencilBits > 0 &&
                    mesaVis->depthBits != 24;
-#if 0
-               driDrawPriv->driverPrivate = (void *)
-                   _mesa_create_framebuffer(mesaVis,
-                                            swDepth,
-                                            swStencil, swAccum, swAlpha);
-#else
+
                struct gl_framebuffer *fb = _mesa_create_framebuffer(mesaVis);
                {
                        driRenderbuffer *frontRb
-                               = driNewRenderbuffer(GL_RGBA, screen->cpp,
-                                       screen->frontOffset, screen->frontPitch);
+                               = driNewRenderbuffer(GL_RGBA, NULL,
+                                                    screen->cpp,
+                                                    screen->frontOffset,
+                                                    screen->frontPitch,
+                                                    driDrawPriv);
                        radeonSetSpanFunctions(frontRb, mesaVis);
                        _mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &frontRb->Base);
                }
                if (mesaVis->doubleBufferMode) {
                        driRenderbuffer *backRb
-                               = driNewRenderbuffer(GL_RGBA, screen->cpp,
-                                       screen->backOffset, screen->backPitch);
+                               = driNewRenderbuffer(GL_RGBA, NULL,
+                                                    screen->cpp,
+                                                    screen->backOffset,
+                                                    screen->backPitch,
+                                                    driDrawPriv);
                        radeonSetSpanFunctions(backRb, mesaVis);
                        _mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &backRb->Base);
                }
                if (mesaVis->depthBits == 16) {
                        driRenderbuffer *depthRb
-                               = driNewRenderbuffer(GL_DEPTH_COMPONENT16, screen->cpp,
-                                       screen->depthOffset, screen->depthPitch);
+                               = driNewRenderbuffer(GL_DEPTH_COMPONENT16,
+                                                    NULL,
+                                                    screen->cpp,
+                                                    screen->depthOffset,
+                                                    screen->depthPitch,
+                                                    driDrawPriv);
                        radeonSetSpanFunctions(depthRb, mesaVis);
                        _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &depthRb->Base);
                }
                else if (mesaVis->depthBits == 24) {
                        driRenderbuffer *depthRb
-                               = driNewRenderbuffer(GL_DEPTH_COMPONENT24, screen->cpp,
-                       screen->depthOffset, screen->depthPitch);
+                               = driNewRenderbuffer(GL_DEPTH_COMPONENT24,
+                                                    NULL,
+                                                    screen->cpp,
+                                                    screen->depthOffset,
+                                                    screen->depthPitch,
+                                                    driDrawPriv);
                        radeonSetSpanFunctions(depthRb, mesaVis);
                        _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &depthRb->Base);
                }
         
                if (mesaVis->stencilBits > 0 && !swStencil) {
                        driRenderbuffer *stencilRb
-                               = driNewRenderbuffer(GL_STENCIL_INDEX8_EXT, screen->cpp,
-                                       screen->depthOffset, screen->depthPitch);
+                               = driNewRenderbuffer(GL_STENCIL_INDEX8_EXT,
+                                                    NULL,
+                                                    screen->cpp,
+                                                    screen->depthOffset,
+                                                    screen->depthPitch,
+                                                    driDrawPriv);
                        radeonSetSpanFunctions(stencilRb, mesaVis);
                        _mesa_add_renderbuffer(fb, BUFFER_STENCIL, &stencilRb->Base);
                }
@@ -717,7 +730,7 @@ radeonCreateBuffer(__DRIscreenPrivate * driScrnPriv,
                                        swAlpha,
                                        GL_FALSE /* aux */);
                driDrawPriv->driverPrivate = (void *) fb;       
-#endif
+
                return (driDrawPriv->driverPrivate != NULL);
        }
 }