nouveau: Always render offscreen, emulate front buffer rendering.

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 44392c0267cd25d2415102e13a942efa208547b2..9b92f2001d92fee6f97fe078ca7fa4cf718ac538 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -315,19 +315,23 @@ GLboolean nouveauUnbindContext( __DRIcontextPrivate *driContextPriv )
        return GL_TRUE;
 }
 
-static void nouveauDoSwapBuffers(nouveauContextPtr nmesa,
-                                __DRIdrawablePrivate *dPriv)
+void
+nouveauDoSwapBuffers(nouveauContextPtr nmesa, __DRIdrawablePrivate *dPriv)
 {
        struct gl_framebuffer *fb;
-       nouveau_renderbuffer *src, *dst;
+       nouveauScreenPtr screen = dPriv->driScreenPriv->private;
+       nouveau_renderbuffer_t *src;
        drm_clip_rect_t *box;
        int nbox, i;
 
        fb = (struct gl_framebuffer *)dPriv->driverPrivate;
-       dst = (nouveau_renderbuffer*)
-               fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer;
-       src = (nouveau_renderbuffer*)
-               fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
+       if (fb->_ColorDrawBufferMask[0] == BUFFER_BIT_FRONT_LEFT) {
+               src = (nouveau_renderbuffer_t *)
+                       fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer;
+       } else {
+               src = (nouveau_renderbuffer_t *)
+                       fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
+       }
 
 #ifdef ALLOW_MULTI_SUBCHANNEL
        LOCK_HARDWARE(nmesa);
@@ -341,9 +345,10 @@ static void nouveauDoSwapBuffers(nouveauContextPtr nmesa,
                        OUT_RING       (6); /* X8R8G8B8 */
                else
                        OUT_RING       (4); /* R5G6B5 */
-               OUT_RING       ((dst->pitch << 16) | src->pitch);
-               OUT_RING       (src->offset);
-               OUT_RING       (dst->offset);
+               OUT_RING(((screen->frontPitch * screen->fbFormat) << 16) |
+                         src->pitch);
+               OUT_RING(src->offset);
+               OUT_RING(screen->frontOffset);
        }
 
        for (i=0; i<nbox; i++, box++) {

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h
index 03f778a13c469c6a529f636f90fea44447f0737d..37c8f40d098d5ec62fe2c8abf96c3492442cd9de 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
@@ -83,8 +83,8 @@ typedef struct nouveau_hw_func_t {
        GLboolean (*InitCard)(struct nouveau_context *);
        /* Update buffer offset/pitch/format */
        GLboolean (*BindBuffers)(struct nouveau_context *, int num_color,
-                                nouveau_renderbuffer **color,
-                                nouveau_renderbuffer *depth);
+                                nouveau_renderbuffer_t **color,
+                                nouveau_renderbuffer_t *depth);
        /* Update anything that depends on the window position/size */
        void      (*WindowMoved)(struct nouveau_context *);
 } nouveau_hw_func;
@@ -223,6 +223,9 @@ extern GLboolean nouveauMakeCurrent( __DRIcontextPrivate *driContextPriv,
 
 extern GLboolean nouveauUnbindContext( __DRIcontextPrivate *driContextPriv );
 
+extern void nouveauDoSwapBuffers(nouveauContextPtr nmesa,
+                                __DRIdrawablePrivate *dPriv);
+
 extern void nouveauSwapBuffers(__DRIdrawablePrivate *dPriv);
 
 extern void nouveauCopySubBuffer(__DRIdrawablePrivate *dPriv,

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
index ddc9535624b80f2394982a5833da396e56511abf..4851c6683560c0fa8f810d11ba981b1352e20e51 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
@@ -117,6 +117,9 @@ static const GLubyte *nouveauGetString( GLcontext *ctx, GLenum name )
 static void nouveauFlush( GLcontext *ctx )
 {
        nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+
+       if (ctx->DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_FRONT_LEFT)
+               nouveauDoSwapBuffers(nmesa, nmesa->driDrawable);
        FIRE_RING();
 }
 
@@ -124,6 +127,7 @@ static void nouveauFlush( GLcontext *ctx )
 static void nouveauFinish( GLcontext *ctx )
 {
        nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+
        nouveauFlush( ctx );
        nouveauWaitForIdle( nmesa );
 }

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
index 54c0c26d0831e694200824bbc0697af2cd45be4a..cc3da8b9bde853fc8cde72c5bf66e81d6c98ab9b 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
@@ -11,7 +11,7 @@
 #include "nouveau_reg.h"
 
 static GLboolean
-nouveau_renderbuffer_pixelformat(nouveau_renderbuffer * nrb,
+nouveau_renderbuffer_pixelformat(nouveau_renderbuffer_t * nrb,
                                 GLenum internalFormat)
 {
        nrb->mesa.InternalFormat = internalFormat;
@@ -84,7 +84,7 @@ nouveau_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
                             GLenum internalFormat,
                             GLuint width, GLuint height)
 {
-       nouveau_renderbuffer *nrb = (nouveau_renderbuffer *) rb;
+       nouveau_renderbuffer_t *nrb = (nouveau_renderbuffer_t *) rb;
 
        if (!nouveau_renderbuffer_pixelformat(nrb, internalFormat)) {
                fprintf(stderr, "%s: unknown internalFormat\n", __func__);
@@ -93,7 +93,7 @@ nouveau_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
 
        /* If this buffer isn't statically alloc'd, we may need to ask the
         * drm for more memory */
-       if (!nrb->dPriv && (rb->Width != width || rb->Height != height)) {
+       if (rb->Width != width || rb->Height != height) {
                GLuint pitch;
 
                /* align pitches to 64 bytes */
@@ -116,62 +116,48 @@ nouveau_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
        rb->Width = width;
        rb->Height = height;
        rb->InternalFormat = internalFormat;
+
+       nouveauSpanSetFunctions(nrb);
+
        return GL_TRUE;
 }
 
-static void nouveau_renderbuffer_delete(struct gl_renderbuffer *rb)
+static void
+nouveau_renderbuffer_delete(struct gl_renderbuffer *rb)
 {
        GET_CURRENT_CONTEXT(ctx);
-       nouveau_renderbuffer *nrb = (nouveau_renderbuffer *) rb;
+       nouveau_renderbuffer_t *nrb = (nouveau_renderbuffer_t *) rb;
 
        if (nrb->mem)
                nouveau_mem_free(ctx, nrb->mem);
        FREE(nrb);
 }
 
-nouveau_renderbuffer *nouveau_renderbuffer_new(GLenum internalFormat,
-                                              GLvoid * map, GLuint offset,
-                                              GLuint pitch,
-                                              __DRIdrawablePrivate *
-                                              dPriv)
+nouveau_renderbuffer_t *
+nouveau_renderbuffer_new(GLenum internalFormat)
 {
-       nouveau_renderbuffer *nrb;
+       nouveau_renderbuffer_t *nrb;
 
-       nrb = CALLOC_STRUCT(nouveau_renderbuffer_t);
-       if (nrb) {
-               _mesa_init_renderbuffer(&nrb->mesa, 0);
-
-               nouveau_renderbuffer_pixelformat(nrb, internalFormat);
+       nrb = CALLOC_STRUCT(nouveau_renderbuffer);
+       if (!nrb)
+               return NULL;
 
-               nrb->mesa.AllocStorage = nouveau_renderbuffer_storage;
-               nrb->mesa.Delete = nouveau_renderbuffer_delete;
+       _mesa_init_renderbuffer(&nrb->mesa, 0);
 
-               nrb->dPriv = dPriv;
-               nrb->offset = offset;
-               nrb->pitch = pitch;
-               nrb->map = map;
+       if (!nouveau_renderbuffer_pixelformat(nrb, internalFormat)) {
+               fprintf(stderr, "%s: unknown internalFormat\n", __func__);
+               return GL_FALSE;
        }
 
-       return nrb;
-}
+       nrb->mesa.AllocStorage = nouveau_renderbuffer_storage;
+       nrb->mesa.Delete = nouveau_renderbuffer_delete;
 
-static void
-nouveau_cliprects_drawable_set(nouveauContextPtr nmesa,
-                              nouveau_renderbuffer * nrb)
-{
-       __DRIdrawablePrivate *dPriv = nrb->dPriv;
-
-       nmesa->numClipRects = dPriv->numClipRects;
-       nmesa->pClipRects = dPriv->pClipRects;
-       nmesa->drawX = dPriv->x;
-       nmesa->drawY = dPriv->y;
-       nmesa->drawW = dPriv->w;
-       nmesa->drawH = dPriv->h;
+       return nrb;
 }
 
 static void
 nouveau_cliprects_renderbuffer_set(nouveauContextPtr nmesa,
-                                  nouveau_renderbuffer * nrb)
+                                  nouveau_renderbuffer_t * nrb)
 {
        nmesa->numClipRects = 1;
        nmesa->pClipRects = &nmesa->osClipRect;
@@ -185,19 +171,18 @@ nouveau_cliprects_renderbuffer_set(nouveauContextPtr nmesa,
        nmesa->drawH = nrb->mesa.Height;
 }
 
-void nouveau_window_moved(GLcontext * ctx)
+void
+nouveau_window_moved(GLcontext * ctx)
 {
        nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-       nouveau_renderbuffer *nrb;
+       nouveau_renderbuffer_t *nrb;
 
-       nrb = (nouveau_renderbuffer *)ctx->DrawBuffer->_ColorDrawBuffers[0][0];
+       nrb = (nouveau_renderbuffer_t *)
+               ctx->DrawBuffer->_ColorDrawBuffers[0][0];
        if (!nrb)
                return;
 
-       if (!nrb->dPriv)
-               nouveau_cliprects_renderbuffer_set(nmesa, nrb);
-       else
-               nouveau_cliprects_drawable_set(nmesa, nrb);
+       nouveau_cliprects_renderbuffer_set(nmesa, nrb);
 
        /* Viewport depends on window size/position, nouveauCalcViewport
         * will take care of calling the hw-specific WindowMoved
@@ -210,20 +195,20 @@ void nouveau_window_moved(GLcontext * ctx)
 }
 
 GLboolean
-nouveau_build_framebuffer(GLcontext * ctx, struct gl_framebuffer *fb)
+nouveau_build_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb)
 {
        nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-       nouveau_renderbuffer *color[MAX_DRAW_BUFFERS];
-       nouveau_renderbuffer *depth;
+       nouveau_renderbuffer_t *color[MAX_DRAW_BUFFERS];
+       nouveau_renderbuffer_t *depth;
 
        _mesa_update_framebuffer(ctx);
        _mesa_update_draw_buffer_bounds(ctx);
 
-       color[0] = (nouveau_renderbuffer *) fb->_ColorDrawBuffers[0][0];
+       color[0] = (nouveau_renderbuffer_t *) fb->_ColorDrawBuffers[0][0];
        if (fb->_DepthBuffer && fb->_DepthBuffer->Wrapped)
-               depth = (nouveau_renderbuffer *) fb->_DepthBuffer->Wrapped;
+               depth = (nouveau_renderbuffer_t *) fb->_DepthBuffer->Wrapped;
        else
-               depth = (nouveau_renderbuffer *) fb->_DepthBuffer;
+               depth = (nouveau_renderbuffer_t *) fb->_DepthBuffer;
 
        if (!nmesa->hw_func.BindBuffers(nmesa, 1, color, depth))
                return GL_FALSE;
@@ -232,34 +217,36 @@ nouveau_build_framebuffer(GLcontext * ctx, struct gl_framebuffer *fb)
        return GL_TRUE;
 }
 
-static void nouveauDrawBuffer(GLcontext * ctx, GLenum buffer)
+static void
+nouveauDrawBuffer(GLcontext *ctx, GLenum buffer)
 {
        nouveau_build_framebuffer(ctx, ctx->DrawBuffer);
 }
 
-static struct gl_framebuffer *nouveauNewFramebuffer(GLcontext * ctx,
-                                                   GLuint name)
+static struct gl_framebuffer *
+nouveauNewFramebuffer(GLcontext *ctx, GLuint name)
 {
        return _mesa_new_framebuffer(ctx, name);
 }
 
-static struct gl_renderbuffer *nouveauNewRenderbuffer(GLcontext * ctx,
-                                                     GLuint name)
+static struct gl_renderbuffer *
+nouveauNewRenderbuffer(GLcontext *ctx, GLuint name)
 {
-       nouveau_renderbuffer *nrb;
+       nouveau_renderbuffer_t *nrb;
 
-       nrb = CALLOC_STRUCT(nouveau_renderbuffer_t);
-       if (nrb) {
-               _mesa_init_renderbuffer(&nrb->mesa, name);
+       nrb = CALLOC_STRUCT(nouveau_renderbuffer);
+       if (!nrb)
+               return NULL;
 
-               nrb->mesa.AllocStorage = nouveau_renderbuffer_storage;
-               nrb->mesa.Delete = nouveau_renderbuffer_delete;
-       }
+       _mesa_init_renderbuffer(&nrb->mesa, name);
+
+       nrb->mesa.AllocStorage = nouveau_renderbuffer_storage;
+       nrb->mesa.Delete = nouveau_renderbuffer_delete;
        return &nrb->mesa;
 }
 
 static void
-nouveauBindFramebuffer(GLcontext * ctx, GLenum target,
+nouveauBindFramebuffer(GLcontext *ctx, GLenum target,
                       struct gl_framebuffer *fb,
                       struct gl_framebuffer *fbread)
 {
@@ -269,18 +256,15 @@ nouveauBindFramebuffer(GLcontext * ctx, GLenum target,
 }
 
 static void
-nouveauFramebufferRenderbuffer(GLcontext * ctx,
-                              struct gl_framebuffer *fb,
-                              GLenum attachment,
-                              struct gl_renderbuffer *rb)
+nouveauFramebufferRenderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+                              GLenum attachment, struct gl_renderbuffer *rb)
 {
        _mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);
        nouveau_build_framebuffer(ctx, fb);
 }
 
 static void
-nouveauRenderTexture(GLcontext * ctx,
-                    struct gl_framebuffer *fb,
+nouveauRenderTexture(GLcontext * ctx, struct gl_framebuffer *fb,
                     struct gl_renderbuffer_attachment *att)
 {
 }
@@ -291,7 +275,8 @@ nouveauFinishRenderTexture(GLcontext * ctx,
 {
 }
 
-void nouveauInitBufferFuncs(struct dd_function_table *func)
+void
+nouveauInitBufferFuncs(struct dd_function_table *func)
 {
        func->DrawBuffer = nouveauDrawBuffer;
 
@@ -302,3 +287,4 @@ void nouveauInitBufferFuncs(struct dd_function_table *func)
        func->RenderTexture = nouveauRenderTexture;
        func->FinishRenderTexture = nouveauFinishRenderTexture;
 }
+

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.h b/src/mesa/drivers/dri/nouveau/nouveau_fbo.h
index 757a784f8f8af75dbfd26a6e71cd81a15138a35f..787af4e9e4bf37bf85315a39ecd1d64be26a6a5c 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.h
@@ -8,9 +8,8 @@
 
 #include "nouveau_mem.h"
 
-typedef struct nouveau_renderbuffer_t {
+typedef struct nouveau_renderbuffer {
        struct gl_renderbuffer mesa;    /* must be first! */
-       __DRIdrawablePrivate *dPriv;
 
        nouveau_mem *mem;
        void *map;
@@ -18,17 +17,13 @@ typedef struct nouveau_renderbuffer_t {
        int cpp;
        uint32_t offset;
        uint32_t pitch;
-} nouveau_renderbuffer;
+} nouveau_renderbuffer_t;
 
-extern nouveau_renderbuffer *nouveau_renderbuffer_new(GLenum internalFormat,
-                                                     GLvoid *map,
-                                                     GLuint offset,
-                                                     GLuint pitch,
-                                                     __DRIdrawablePrivate *);
+extern nouveau_renderbuffer_t *nouveau_renderbuffer_new(GLenum internalFormat);
 extern void nouveau_window_moved(GLcontext *);
 extern GLboolean nouveau_build_framebuffer(GLcontext *,
                                           struct gl_framebuffer *);
-extern nouveau_renderbuffer *nouveau_current_draw_buffer(GLcontext *);
+extern nouveau_renderbuffer_t *nouveau_current_draw_buffer(GLcontext *);
 
 extern void nouveauInitBufferFuncs(struct dd_function_table *);
 

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 4d22ecc83e5d390da9d145cce73f2b68aafa69c9..065aa81746c96127ecf07af37d0c00f8ba87a785 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -132,10 +132,11 @@ nouveauCreateBuffer(__DRIscreenPrivate *driScrnPriv,
                     GLboolean isPixmap)
 {
        nouveauScreenPtr screen = (nouveauScreenPtr) driScrnPriv->private;
-       nouveau_renderbuffer  *nrb;
+       nouveau_renderbuffer_t *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)
@@ -146,37 +147,25 @@ nouveauCreateBuffer(__DRIscreenPrivate *driScrnPriv,
                return GL_FALSE;
 
        /* Front buffer */
-       nrb = nouveau_renderbuffer_new(color_format,
-                                      driScrnPriv->pFB + screen->frontOffset,
-                                      screen->frontOffset,
-                                      screen->frontPitch * screen->fbFormat,
-                                      driDrawPriv);
-       nouveauSpanSetFunctions(nrb, mesaVis);
+       nrb = nouveau_renderbuffer_new(color_format);
        _mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, &nrb->mesa);
 
        if (mesaVis->doubleBufferMode) {
-               nrb = nouveau_renderbuffer_new(color_format, NULL, 0, 0, NULL);
-               nouveauSpanSetFunctions(nrb, mesaVis);
+               nrb = nouveau_renderbuffer_new(color_format);
                _mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &nrb->mesa);
        }
 
        if (mesaVis->depthBits == 24 && mesaVis->stencilBits == 8) {
-               nrb = nouveau_renderbuffer_new(GL_DEPTH24_STENCIL8_EXT, NULL,
-                                              0, 0, NULL);
-               nouveauSpanSetFunctions(nrb, mesaVis);
+               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, NULL,
-                                              0, 0, NULL);
-               nouveauSpanSetFunctions(nrb, mesaVis);
+               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, NULL,
-                                              0, 0, NULL);
-               nouveauSpanSetFunctions(nrb, mesaVis);
+               nrb = nouveau_renderbuffer_new(GL_DEPTH_COMPONENT16);
                _mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
        }
 

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_span.c b/src/mesa/drivers/dri/nouveau/nouveau_span.c
index 6e3f9fadf4ec496c818f3e01ce92ef42c2c21b97..453bc5f6c49f7d384cefdc5a4fc055c33d5bc930 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_span.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_span.c
@@ -37,8 +37,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define HAVE_HW_STENCIL_SPANS  0
 #define HAVE_HW_STENCIL_PIXELS 0
 
-static char *fake_span[1280*1024*4];
-
 #define HW_CLIPLOOP()                                                  \
    do {                                                                        \
       int _nc = nmesa->numClipRects;                                   \
@@ -50,11 +48,10 @@ static char *fake_span[1280*1024*4];
 
 #define LOCAL_VARS                                                     \
    nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);                     \
-   nouveau_renderbuffer *nrb = (nouveau_renderbuffer *)rb;             \
+   nouveau_renderbuffer_t *nrb = (nouveau_renderbuffer_t *)rb;         \
    GLuint height = nrb->mesa.Height;                                   \
    GLubyte *map = (GLubyte *)(nrb->map ? nrb->map : nrb->mem->map) +    \
         (nmesa->drawY * nrb->pitch) + (nmesa->drawX * nrb->cpp);       \
-   map = fake_span; \
    GLuint p;                                                           \
    (void) p;
 
@@ -119,10 +116,11 @@ void nouveauSpanInitFunctions( GLcontext *ctx )
  * Plug in the Get/Put routines for the given driRenderbuffer.
  */
 void
-nouveauSpanSetFunctions(nouveau_renderbuffer *nrb, const GLvisual *vis)
+nouveauSpanSetFunctions(nouveau_renderbuffer_t *nrb)
 {
    if (nrb->mesa._ActualFormat == GL_RGBA8)
       nouveauInitPointers_ARGB8888(&nrb->mesa);
    else // if (nrb->mesa._ActualFormat == GL_RGB5)
       nouveauInitPointers_RGB565(&nrb->mesa);
 }
+

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_span.h b/src/mesa/drivers/dri/nouveau/nouveau_span.h
index c4142a10ef4a6e7907b8a77c7d3216a24215a326..d3f31c9cb23d9dbcbccd561b0824264bde903038 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_span.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_span.h
@@ -32,8 +32,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "drirenderbuffer.h"
 #include "nouveau_fbo.h"
 
-extern void nouveauSpanInitFunctions( GLcontext *ctx );
-extern void nouveauSpanSetFunctions(nouveau_renderbuffer *nrb, const GLvisual *vis);
+extern void nouveauSpanInitFunctions(GLcontext *ctx);
+extern void nouveauSpanSetFunctions(nouveau_renderbuffer_t *nrb);
 
 #endif /* __NOUVEAU_SPAN_H__ */
 

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state.c b/src/mesa/drivers/dri/nouveau/nv04_state.c
index 25df3d2a6246c7063d0ebec5ca03004fc827ea2b..d3031aa5b197dc6eae48c9b90ff1618c32cc96da 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state.c
@@ -451,8 +451,8 @@ static GLboolean nv04InitCard(nouveauContextPtr nmesa)
 
 /* Update buffer offset/pitch/format */
 static GLboolean nv04BindBuffers(nouveauContextPtr nmesa, int num_color,
-               nouveau_renderbuffer **color,
-               nouveau_renderbuffer *depth)
+               nouveau_renderbuffer_t **color,
+               nouveau_renderbuffer_t *depth)
 {
        GLuint x, y, w, h;
        uint32_t depth_pitch=(depth?depth->pitch:0+15)&~15+16;

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 47c4b14ba6b68fc4dc4ea5205d2b53e7ca39e795..0e1637015fdfbcf7284b3dfbe2d839a3b964ed72 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -709,8 +709,8 @@ static GLboolean nv10InitCard(nouveauContextPtr nmesa)
 
 /* Update buffer offset/pitch/format */
 static GLboolean nv10BindBuffers(nouveauContextPtr nmesa, int num_color,
-                                nouveau_renderbuffer **color,
-                                nouveau_renderbuffer *depth)
+                                nouveau_renderbuffer_t **color,
+                                nouveau_renderbuffer_t *depth)
 {
        GLuint x, y, w, h;
        GLuint pitch, format, depth_pitch;

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state.c b/src/mesa/drivers/dri/nouveau/nv20_state.c
index ccf2f6148b4908d41403dc3276eb3feaeb628eb8..6b583980a49975e50a2978fcfc8de660ba5e080e 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv20_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state.c
@@ -728,8 +728,8 @@ static GLboolean nv20InitCard(nouveauContextPtr nmesa)
 
 /* Update buffer offset/pitch/format */
 static GLboolean nv20BindBuffers(nouveauContextPtr nmesa, int num_color,
-                                nouveau_renderbuffer **color,
-                                nouveau_renderbuffer *depth)
+                                nouveau_renderbuffer_t **color,
+                                nouveau_renderbuffer_t *depth)
 {
        GLuint x, y, w, h;
        GLuint pitch, format, depth_pitch;

diff --git a/src/mesa/drivers/dri/nouveau/nv30_state.c b/src/mesa/drivers/dri/nouveau/nv30_state.c
index 9b010954b3309e0ec1cc89f7bfbd82ff4119ab17..cd3ee9868805f8cab3c84f55391276caac72c541 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv30_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv30_state.c
@@ -905,9 +905,9 @@ static GLboolean nv40InitCard(nouveauContextPtr nmesa)
        return GL_TRUE;
 }
 
-static GLboolean nv30BindBuffers(nouveauContextPtr nmesa, int num_color,
-               nouveau_renderbuffer **color,
-               nouveau_renderbuffer *depth)
+static GLboolean
+nv30BindBuffers(nouveauContextPtr nmesa, int num_color,
+               nouveau_renderbuffer_t **color, nouveau_renderbuffer_t *depth)
 {
        GLuint x, y, w, h;
 

diff --git a/src/mesa/drivers/dri/nouveau/nv50_state.c b/src/mesa/drivers/dri/nouveau/nv50_state.c
index 818e268615c24c4626db006223246f35aa6eba10..a9236f093c34adb06337139bd5cf0503341fdd5f 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv50_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv50_state.c
@@ -584,9 +584,9 @@ static GLboolean nv50InitCard(nouveauContextPtr nmesa)
        return GL_FALSE;
 }
 
-static GLboolean nv50BindBuffers(nouveauContextPtr nmesa, int num_color,
-                                nouveau_renderbuffer **color,
-                                nouveau_renderbuffer *depth)
+static GLboolean
+nv50BindBuffers(nouveauContextPtr nmesa, int num_color,
+               nouveau_renderbuffer_t **color, nouveau_renderbuffer_t *depth)
 {
        return GL_FALSE;
 }