i965/gs: implement EndPrimitive() functionality in the visitor.

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

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
index 32d8f2d0f9bbcca1ad0c8e6e981c343b47c0c244..25543e458b44e9b0fb30b1c81b92ee4e3925304e 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
@@ -45,34 +45,30 @@ set_renderbuffer_format(struct gl_renderbuffer *rb, GLenum internalFormat)
        case GL_RGB8:
                rb->_BaseFormat  = GL_RGB;
                rb->Format = MESA_FORMAT_XRGB8888;
-               rb->DataType = GL_UNSIGNED_BYTE;
                s->cpp = 4;
                break;
        case GL_RGBA:
        case GL_RGBA8:
                rb->_BaseFormat  = GL_RGBA;
                rb->Format = MESA_FORMAT_ARGB8888;
-               rb->DataType = GL_UNSIGNED_BYTE;
                s->cpp = 4;
                break;
        case GL_RGB5:
                rb->_BaseFormat  = GL_RGB;
                rb->Format = MESA_FORMAT_RGB565;
-               rb->DataType = GL_UNSIGNED_BYTE;
                s->cpp = 2;
                break;
        case GL_DEPTH_COMPONENT16:
                rb->_BaseFormat  = GL_DEPTH_COMPONENT;
                rb->Format = MESA_FORMAT_Z16;
-               rb->DataType = GL_UNSIGNED_SHORT;
                s->cpp = 2;
                break;
+       case GL_DEPTH_COMPONENT:
        case GL_DEPTH_COMPONENT24:
        case GL_STENCIL_INDEX8_EXT:
        case GL_DEPTH24_STENCIL8_EXT:
                rb->_BaseFormat  = GL_DEPTH_STENCIL;
                rb->Format = MESA_FORMAT_Z24_S8;
-               rb->DataType = GL_UNSIGNED_INT_24_8_EXT;
                s->cpp = 4;
                break;
        default:
@@ -85,7 +81,7 @@ set_renderbuffer_format(struct gl_renderbuffer *rb, GLenum internalFormat)
 }
 
 static GLboolean
-nouveau_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
+nouveau_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
                             GLenum internalFormat,
                             GLuint width, GLuint height)
 {
@@ -105,16 +101,16 @@ nouveau_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 }
 
 static void
-nouveau_renderbuffer_del(struct gl_renderbuffer *rb)
+nouveau_renderbuffer_del(struct gl_context *ctx, struct gl_renderbuffer *rb)
 {
        struct nouveau_surface *s = &to_nouveau_renderbuffer(rb)->surface;
 
        nouveau_surface_ref(NULL, s);
-       FREE(rb);
+       _mesa_delete_renderbuffer(ctx, rb);
 }
 
 static struct gl_renderbuffer *
-nouveau_renderbuffer_new(GLcontext *ctx, GLuint name)
+nouveau_renderbuffer_new(struct gl_context *ctx, GLuint name)
 {
        struct gl_renderbuffer *rb;
 
@@ -131,8 +127,49 @@ nouveau_renderbuffer_new(GLcontext *ctx, GLuint name)
        return rb;
 }
 
+static void
+nouveau_renderbuffer_map(struct gl_context *ctx,
+                        struct gl_renderbuffer *rb,
+                        GLuint x, GLuint y, GLuint w, GLuint h,
+                        GLbitfield mode,
+                        GLubyte **out_map,
+                        GLint *out_stride)
+{
+       struct nouveau_surface *s = &to_nouveau_renderbuffer(rb)->surface;
+       GLubyte *map;
+       int stride;
+       int flags = 0;
+
+       if (mode & GL_MAP_READ_BIT)
+               flags |= NOUVEAU_BO_RD;
+       if (mode & GL_MAP_WRITE_BIT)
+               flags |= NOUVEAU_BO_WR;
+
+       nouveau_bo_map(s->bo, flags, context_client(ctx));
+
+       map = s->bo->map;
+       stride = s->pitch;
+
+       if (rb->Name == 0) {
+               map += stride * (rb->Height - 1);
+               stride = -stride;
+       }
+
+       map += x * s->cpp;
+       map += (int)y * stride;
+
+       *out_map = map;
+       *out_stride = stride;
+}
+
+static void
+nouveau_renderbuffer_unmap(struct gl_context *ctx,
+                          struct gl_renderbuffer *rb)
+{
+}
+
 static GLboolean
-nouveau_renderbuffer_dri_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
+nouveau_renderbuffer_dri_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
                                 GLenum internalFormat,
                                 GLuint width, GLuint height)
 {
@@ -157,7 +194,7 @@ nouveau_renderbuffer_dri_new(GLenum format, __DRIdrawable *drawable)
        rb->AllocStorage = nouveau_renderbuffer_dri_storage;
 
        if (!set_renderbuffer_format(rb, format)) {
-               nouveau_renderbuffer_del(rb);
+               nouveau_renderbuffer_del(NULL, rb);
                return NULL;
        }
 
@@ -165,7 +202,7 @@ nouveau_renderbuffer_dri_new(GLenum format, __DRIdrawable *drawable)
 }
 
 static struct gl_framebuffer *
-nouveau_framebuffer_new(GLcontext *ctx, GLuint name)
+nouveau_framebuffer_new(struct gl_context *ctx, GLuint name)
 {
        struct nouveau_framebuffer *nfb;
 
@@ -179,7 +216,7 @@ nouveau_framebuffer_new(GLcontext *ctx, GLuint name)
 }
 
 struct gl_framebuffer *
-nouveau_framebuffer_dri_new(const GLvisual *visual)
+nouveau_framebuffer_dri_new(const struct gl_config *visual)
 {
        struct nouveau_framebuffer *nfb;
 
@@ -188,12 +225,13 @@ nouveau_framebuffer_dri_new(const GLvisual *visual)
                return NULL;
 
        _mesa_initialize_window_framebuffer(&nfb->base, visual);
+       nfb->need_front = !visual->doubleBufferMode;
 
        return &nfb->base;
 }
 
 static void
-nouveau_bind_framebuffer(GLcontext *ctx, GLenum target,
+nouveau_bind_framebuffer(struct gl_context *ctx, GLenum target,
                         struct gl_framebuffer *dfb,
                         struct gl_framebuffer *rfb)
 {
@@ -201,7 +239,7 @@ nouveau_bind_framebuffer(GLcontext *ctx, GLenum target,
 }
 
 static void
-nouveau_framebuffer_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
+nouveau_framebuffer_renderbuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
                                 GLenum attachment, struct gl_renderbuffer *rb)
 {
        _mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);
@@ -209,43 +247,14 @@ nouveau_framebuffer_renderbuffer(GLcontext *ctx, struct gl_framebuffer *fb,
        context_dirty(ctx, FRAMEBUFFER);
 }
 
-static GLenum
-get_tex_format(struct gl_texture_image *ti)
-{
-       switch (ti->TexFormat) {
-       case MESA_FORMAT_ARGB8888:
-               return GL_RGBA8;
-       case MESA_FORMAT_XRGB8888:
-               return GL_RGB8;
-       case MESA_FORMAT_RGB565:
-               return GL_RGB5;
-       default:
-               return GL_NONE;
-       }
-}
-
 static void
-nouveau_render_texture(GLcontext *ctx, struct gl_framebuffer *fb,
+nouveau_render_texture(struct gl_context *ctx, struct gl_framebuffer *fb,
                       struct gl_renderbuffer_attachment *att)
 {
        struct gl_renderbuffer *rb = att->Renderbuffer;
-       struct gl_texture_image *ti =
-               att->Texture->Image[att->CubeMapFace][att->TextureLevel];
-
-       /* Allocate a renderbuffer object for the texture if we
-        * haven't already done so. */
-       if (!rb) {
-               rb = nouveau_renderbuffer_new(ctx, ~0);
-               assert(rb);
-
-               rb->AllocStorage = NULL;
-               _mesa_reference_renderbuffer(&att->Renderbuffer, rb);
-       }
+       struct gl_texture_image *ti = rb->TexImage;
 
        /* Update the renderbuffer fields from the texture. */
-       set_renderbuffer_format(rb, get_tex_format(ti));
-       rb->Width = ti->Width;
-       rb->Height = ti->Height;
        nouveau_surface_ref(&to_nouveau_teximage(ti)->surface,
                            &to_nouveau_renderbuffer(rb)->surface);
 
@@ -253,21 +262,21 @@ nouveau_render_texture(GLcontext *ctx, struct gl_framebuffer *fb,
 }
 
 static void
-nouveau_finish_render_texture(GLcontext *ctx,
-                             struct gl_renderbuffer_attachment *att)
+nouveau_finish_render_texture(struct gl_context *ctx,
+                             struct gl_renderbuffer *rb)
 {
-       texture_dirty(att->Texture);
+       texture_dirty(rb->TexImage->TexObject);
 }
 
 void
 nouveau_fbo_functions_init(struct dd_function_table *functions)
 {
-#if FEATURE_EXT_framebuffer_object
        functions->NewFramebuffer = nouveau_framebuffer_new;
        functions->NewRenderbuffer = nouveau_renderbuffer_new;
+       functions->MapRenderbuffer = nouveau_renderbuffer_map;
+       functions->UnmapRenderbuffer = nouveau_renderbuffer_unmap;
        functions->BindFramebuffer = nouveau_bind_framebuffer;
        functions->FramebufferRenderbuffer = nouveau_framebuffer_renderbuffer;
        functions->RenderTexture = nouveau_render_texture;
        functions->FinishRenderTexture = nouveau_finish_render_texture;
-#endif
 }