X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fnouveau%2Fnouveau_bufferobj.c;h=afccf353960d02222119ab944c145f667852ed2b;hb=da9e6fdfe27065b8ede8b2fe30c8cccc3b573245;hp=433590c41813c9289fd5b6c50a29e76024f347fe;hpb=28249bd260f4c52badf3eb61ade2744604b21bca;p=mesa.git

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
index 433590c4181..afccf353960 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
@@ -31,7 +31,8 @@
 #include "main/bufferobj.h"
 
 static inline char *
-get_bufferobj_map(struct gl_buffer_object *obj, unsigned flags)
+get_bufferobj_map(struct gl_context *ctx, struct gl_buffer_object *obj,
+		  unsigned flags)
 {
 	struct nouveau_bufferobj *nbo = to_nouveau_bufferobj(obj);
 	void *map = NULL;
@@ -39,16 +40,15 @@ get_bufferobj_map(struct gl_buffer_object *obj, unsigned flags)
 	if (nbo->sys) {
 		map = nbo->sys;
 	} else if (nbo->bo) {
-		nouveau_bo_map(nbo->bo, flags);
+		nouveau_bo_map(nbo->bo, flags, context_client(ctx));
 		map = nbo->bo->map;
-		nouveau_bo_unmap(nbo->bo);
 	}
 
 	return map;
 }
 
 static struct gl_buffer_object *
-nouveau_bufferobj_new(struct gl_context *ctx, GLuint buffer, GLenum target)
+nouveau_bufferobj_new(struct gl_context *ctx, GLuint buffer)
 {
 	struct nouveau_bufferobj *nbo;
 
@@ -56,7 +56,7 @@ nouveau_bufferobj_new(struct gl_context *ctx, GLuint buffer, GLenum target)
 	if (!nbo)
 		return NULL;
 
-	_mesa_initialize_buffer_object(&nbo->base, buffer, target);
+	_mesa_initialize_buffer_object(ctx, &nbo->base, buffer);
 
 	return &nbo->base;
 }
@@ -67,13 +67,13 @@ nouveau_bufferobj_del(struct gl_context *ctx, struct gl_buffer_object *obj)
 	struct nouveau_bufferobj *nbo = to_nouveau_bufferobj(obj);
 
 	nouveau_bo_ref(NULL, &nbo->bo);
-	FREE(nbo->sys);
-	FREE(nbo);
+	free(nbo->sys);
+	free(nbo);
 }
 
 static GLboolean
 nouveau_bufferobj_data(struct gl_context *ctx, GLenum target, GLsizeiptrARB size,
-		       const GLvoid *data, GLenum usage,
+		       const GLvoid *data, GLenum usage, GLbitfield storageFlags,
 		       struct gl_buffer_object *obj)
 {
 	struct nouveau_bufferobj *nbo = to_nouveau_bufferobj(obj);
@@ -81,27 +81,30 @@ nouveau_bufferobj_data(struct gl_context *ctx, GLenum target, GLsizeiptrARB size
 
 	obj->Size = size;
 	obj->Usage = usage;
+        obj->StorageFlags = storageFlags;
 
 	/* Free previous storage */
 	nouveau_bo_ref(NULL, &nbo->bo);
-	FREE(nbo->sys);
+	free(nbo->sys);
+	nbo->sys = NULL;
 
 	if (target == GL_ELEMENT_ARRAY_BUFFER_ARB ||
 	    (size < 512 && usage == GL_DYNAMIC_DRAW_ARB) ||
 	    context_chipset(ctx) < 0x10) {
 		/* Heuristic: keep it in system ram */
-		nbo->sys = MALLOC(size);
+		nbo->sys = malloc(size);
 
 	} else {
 		/* Get a hardware BO */
 		ret = nouveau_bo_new(context_dev(ctx),
-				     NOUVEAU_BO_GART | NOUVEAU_BO_MAP, 0,
-				     size, &nbo->bo);
+				     NOUVEAU_BO_GART | NOUVEAU_BO_MAP,
+				     ctx->Const.MinMapBufferAlignment,
+				     size, NULL, &nbo->bo);
 		assert(!ret);
 	}
 
 	if (data)
-		memcpy(get_bufferobj_map(obj, NOUVEAU_BO_WR), data, size);
+		memcpy(get_bufferobj_map(ctx, obj, NOUVEAU_BO_WR), data, size);
 
 	return GL_TRUE;
 }
@@ -111,7 +114,7 @@ nouveau_bufferobj_subdata(struct gl_context *ctx, GLintptrARB offset,
 			  GLsizeiptrARB size, const GLvoid *data,
 			  struct gl_buffer_object *obj)
 {
-	memcpy(get_bufferobj_map(obj, NOUVEAU_BO_WR) + offset, data, size);
+	memcpy(get_bufferobj_map(ctx, obj, NOUVEAU_BO_WR) + offset, data, size);
 }
 
 static void
@@ -119,47 +122,49 @@ nouveau_bufferobj_get_subdata(struct gl_context *ctx, GLintptrARB offset,
 			   GLsizeiptrARB size, GLvoid *data,
 			   struct gl_buffer_object *obj)
 {
-	memcpy(data, get_bufferobj_map(obj, NOUVEAU_BO_RD) + offset, size);
+	memcpy(data, get_bufferobj_map(ctx, obj, NOUVEAU_BO_RD) + offset, size);
 }
 
 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)
+			    struct gl_buffer_object *obj,
+                            gl_map_buffer_index index)
 {
 	unsigned flags = 0;
 	char *map;
 
-	assert(!obj->Pointer);
+	assert(!obj->Mappings[index].Pointer);
 
-	if (access & GL_MAP_READ_BIT)
-		flags |= NOUVEAU_BO_RD;
-	if (access & GL_MAP_WRITE_BIT)
-		flags |= NOUVEAU_BO_WR;
-	if (access & GL_MAP_UNSYNCHRONIZED_BIT)
-		flags |= NOUVEAU_BO_NOSYNC;
+	if (!(access & GL_MAP_UNSYNCHRONIZED_BIT)) {
+		if (access & GL_MAP_READ_BIT)
+			flags |= NOUVEAU_BO_RD;
+		if (access & GL_MAP_WRITE_BIT)
+			flags |= NOUVEAU_BO_WR;
+	}
 
-	map = get_bufferobj_map(obj, flags);
+	map = get_bufferobj_map(ctx, obj, flags);
 	if (!map)
 		return NULL;
 
-	obj->Pointer = map + offset;
-	obj->Offset = offset;
-	obj->Length = length;
-	obj->AccessFlags = access;
+	obj->Mappings[index].Pointer = map + offset;
+	obj->Mappings[index].Offset = offset;
+	obj->Mappings[index].Length = length;
+	obj->Mappings[index].AccessFlags = access;
 
-	return obj->Pointer;
+	return obj->Mappings[index].Pointer;
 }
 
 static GLboolean
-nouveau_bufferobj_unmap(struct gl_context *ctx, struct gl_buffer_object *obj)
+nouveau_bufferobj_unmap(struct gl_context *ctx, struct gl_buffer_object *obj,
+                        gl_map_buffer_index index)
 {
-	assert(obj->Pointer);
+	assert(obj->Mappings[index].Pointer);
 
-	obj->Pointer = NULL;
-	obj->Offset = 0;
-	obj->Length = 0;
-	obj->AccessFlags = 0;
+	obj->Mappings[index].Pointer = NULL;
+	obj->Mappings[index].Offset = 0;
+	obj->Mappings[index].Length = 0;
+	obj->Mappings[index].AccessFlags = 0;
 
 	return GL_TRUE;
 }