nouveau: Convert to use GLbitfield64 directly.

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

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
index 6b10d28c3cf10006003daecde52176aa981019dd..dc5b1528b071343b82900b96b4606bc0396aaa1a 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
@@ -115,7 +115,7 @@ nouveau_bufferobj_subdata(struct gl_context *ctx, GLintptrARB offset,
 }
 
 static void
-nouveau_bufferobj_get_subdata(struct gl_context *ctx, GLenum target, GLintptrARB offset,
+nouveau_bufferobj_get_subdata(struct gl_context *ctx, GLintptrARB offset,
                           GLsizeiptrARB size, GLvoid *data,
                           struct gl_buffer_object *obj)
 {
@@ -123,24 +123,7 @@ nouveau_bufferobj_get_subdata(struct gl_context *ctx, GLenum target, GLintptrARB
 }
 
 static void *
-nouveau_bufferobj_map(struct gl_context *ctx, GLenum access,
-                  struct gl_buffer_object *obj)
-{
-       unsigned flags = 0;
-
-       if (access == GL_READ_ONLY_ARB ||
-           access == GL_READ_WRITE_ARB)
-               flags |= GL_MAP_READ_BIT;
-       if (access == GL_WRITE_ONLY_ARB ||
-           access == GL_READ_WRITE_ARB)
-               flags |= GL_MAP_WRITE_BIT;
-
-       return ctx->Driver.MapBufferRange(ctx, 0, 0, obj->Size, flags,
-                                         obj);
-}
-
-static void *
-nouveau_bufferobj_map_range(struct gl_context *ctx, GLenum target, GLintptr offset,
+nouveau_bufferobj_map_range(struct gl_context *ctx, GLintptr offset,
                            GLsizeiptr length, GLbitfield access,
                            struct gl_buffer_object *obj)
 {
@@ -189,7 +172,6 @@ nouveau_bufferobj_functions_init(struct dd_function_table *functions)
        functions->BufferData = nouveau_bufferobj_data;
        functions->BufferSubData = nouveau_bufferobj_subdata;
        functions->GetBufferSubData = nouveau_bufferobj_get_subdata;
-       functions->MapBuffer = nouveau_bufferobj_map;
        functions->MapBufferRange = nouveau_bufferobj_map_range;
        functions->UnmapBuffer = nouveau_bufferobj_unmap;
 }