Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_screen.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index cab53f41ad496295276e949012aceb5031fcd6b7..2cf6f979e406e66fc99fdbf15ff37e97ed946ed0 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -132,11 +132,10 @@ nouveauCreateBuffer(__DRIscreenPrivate *driScrnPriv,
                     GLboolean isPixmap)
 {
        nouveauScreenPtr screen = (nouveauScreenPtr) driScrnPriv->private;
-       nouveau_renderbuffer_t *nrb;
+       nouveau_renderbuffer  *nrb;
        struct gl_framebuffer *fb;
        const GLboolean swAccum = mesaVis->accumRedBits > 0;
-       const GLboolean swStencil = (mesaVis->stencilBits > 0 &&
-                                    mesaVis->depthBits != 24);
+       const GLboolean swStencil = mesaVis->stencilBits > 0 && mesaVis->depthBits != 24;
        GLenum color_format = screen->fbFormat == 4 ? GL_RGBA8 : GL_RGB5;
 
        if (isPixmap)
@@ -147,26 +146,44 @@ nouveauCreateBuffer(__DRIscreenPrivate *driScrnPriv,
                return GL_FALSE;
 
        /* Front buffer */
-       nrb = nouveau_renderbuffer_new(color_format);
+       nrb = nouveau_renderbuffer_new(color_format,
+                                      driScrnPriv->pFB + screen->frontOffset,
+                                      screen->frontOffset,
+                                      screen->frontPitch * screen->fbFormat,
+                                      driDrawPriv);
+       nouveauSpanSetFunctions(nrb, mesaVis);
        _mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &nrb->mesa);
 
-       if (mesaVis->doubleBufferMode) {
-               nrb = nouveau_renderbuffer_new(color_format);
-               _mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &nrb->mesa);
-       }
+       if (0 /* unified buffers if we choose to support them.. */) {
+       } else {
+               if (mesaVis->doubleBufferMode) {
+                       nrb = nouveau_renderbuffer_new(color_format, NULL,
+                                                      0, 0,
+                                                      NULL);
+                       nouveauSpanSetFunctions(nrb, mesaVis);
+                       _mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &nrb->mesa);
+               }
 
-       if (mesaVis->depthBits == 24 && mesaVis->stencilBits == 8) {
-               nrb = nouveau_renderbuffer_new(GL_DEPTH24_STENCIL8_EXT);
-               _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
-               _mesa_add_renderbuffer(fb, BUFFER_STENCIL, &nrb->mesa);
-       } else
-       if (mesaVis->depthBits == 24) {
-               nrb = nouveau_renderbuffer_new(GL_DEPTH_COMPONENT24);
-               _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
-       } else
-       if (mesaVis->depthBits == 16) {
-               nrb = nouveau_renderbuffer_new(GL_DEPTH_COMPONENT16);
-               _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
+               if (mesaVis->depthBits == 24 && mesaVis->stencilBits == 8) {
+                       nrb = nouveau_renderbuffer_new(GL_DEPTH24_STENCIL8_EXT, NULL,
+                                                      0, 0,
+                                                      NULL);
+                       nouveauSpanSetFunctions(nrb, mesaVis);
+                       _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
+                       _mesa_add_renderbuffer(fb, BUFFER_STENCIL, &nrb->mesa);
+               } else if (mesaVis->depthBits == 24) {
+                       nrb = nouveau_renderbuffer_new(GL_DEPTH_COMPONENT24, NULL,
+                                                      0, 0,
+                                                      NULL);
+                       nouveauSpanSetFunctions(nrb, mesaVis);
+                       _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
+               } else if (mesaVis->depthBits == 16) {
+                       nrb = nouveau_renderbuffer_new(GL_DEPTH_COMPONENT16, NULL,
+                                                      0, 0,
+                                                      NULL);
+                       nouveauSpanSetFunctions(nrb, mesaVis);
+                       _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
+               }
        }
 
        _mesa_add_soft_renderbuffers(fb,
@@ -240,8 +257,8 @@ nouveauFillInModes( unsigned pixel_bits, unsigned depth_bits,
                GLX_NONE, GLX_SWAP_UNDEFINED_OML, GLX_SWAP_COPY_OML
        };
 
-       u_int8_t depth_bits_array[4]   = { 0, 16, 24, 24 };
-       u_int8_t stencil_bits_array[4] = { 0,  0,  0,  8 };
+       uint8_t depth_bits_array[4]   = { 0, 16, 24, 24 };
+       uint8_t stencil_bits_array[4] = { 0,  0,  0,  8 };
 
        depth_buffer_factor = 4;
        back_buffer_factor  = (have_back_buffer) ? 3 : 1;
@@ -295,23 +312,23 @@ nouveauFillInModes( unsigned pixel_bits, unsigned depth_bits,
  *         failure.
  */
 PUBLIC
-void * __DRI_CREATE_NEW_SCREEN(int scrn, __DRIscreen *psc,
-                              const __GLcontextModes * modes,
-                              const __DRIversion * ddx_version,
-                              const __DRIversion * dri_version,
-                              const __DRIversion * drm_version,
-                              const __DRIframebuffer * frame_buffer,
-                              drmAddress pSAREA, int fd, 
-                              int internal_api_version,
-                              const __DRIinterfaceMethods * interface,
-                              __GLcontextModes ** driver_modes)
+void * __driCreateNewScreen_20050727( __DRInativeDisplay *dpy, int scrn, __DRIscreen *psc,
+                                    const __GLcontextModes * modes,
+                                    const __DRIversion * ddx_version,
+                                    const __DRIversion * dri_version,
+                                    const __DRIversion * drm_version,
+                                    const __DRIframebuffer * frame_buffer,
+                                    drmAddress pSAREA, int fd, 
+                                    int internal_api_version,
+                                    const __DRIinterfaceMethods * interface,
+                                    __GLcontextModes ** driver_modes)
                             
 {
        __DRIscreenPrivate *psp;
        static const __DRIversion ddx_expected = { 1, 2, 0 };
        static const __DRIversion dri_expected = { 4, 0, 0 };
        static const __DRIversion drm_expected = { 0, 0, NOUVEAU_DRM_HEADER_PATCHLEVEL };
-#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 10
+#if NOUVEAU_DRM_HEADER_PATCHLEVEL != 9
 #error nouveau_drm.h version doesn't match expected version
 #endif
        dri_interface = interface;
@@ -331,7 +348,7 @@ void * __DRI_CREATE_NEW_SCREEN(int scrn, __DRIscreen *psc,
                return NULL;
        }
 
-       psp = __driUtilCreateNewScreen(scrn, psc, NULL,
+       psp = __driUtilCreateNewScreen(dpy, scrn, psc, NULL,
                                       ddx_version, dri_version, drm_version,
                                       frame_buffer, pSAREA, fd,
                                       internal_api_version, &nouveauAPI);