nouveau: record *actual* type of memory that was alloc'd, not the requested types.

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_buffers.c b/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
index 6d73e9ff5187c75452d1a1c28fb732d9c70a40bf..e628dd5b3c45d777528e6072f4810aa00303371d 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
@@ -91,7 +91,7 @@ nouveau_mem_alloc(GLcontext *ctx, int type, GLuint size, GLuint align)
    if (!mem)
       return NULL;
 
-   mema.flags     = mem->type = type;
+   mema.flags     = type;
    mema.size      = mem->size = size;
    mema.alignment = align;
    mem->map       = NULL;
@@ -102,6 +102,7 @@ nouveau_mem_alloc(GLcontext *ctx, int type, GLuint size, GLuint align)
       return NULL;
    }
    mem->offset = mema.region_offset;
+   mem->type   = mema.flags;
 
    if (type & NOUVEAU_MEM_MAPPED)
       ret = drmMap(nmesa->driFd, mem->offset, mem->size, &mem->map);

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_buffers.h b/src/mesa/drivers/dri/nouveau/nouveau_buffers.h
index a8d85b279bff866042f1006e745ff638e8edd06b..d86455184c29c41ad8449a4a60dff8601beee5d3 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_buffers.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_buffers.h
@@ -19,8 +19,10 @@ extern void nouveau_mem_free(GLcontext *ctx, nouveau_mem *mem);
 extern uint32_t nouveau_mem_gpu_offset_get(GLcontext *ctx, nouveau_mem *mem);
 
 extern GLboolean nouveau_memformat_flat_emit(GLcontext *ctx,
-                                            nouveau_mem *dst, nouveau_mem *src,
-                                            GLuint dst_offset, GLuint src_offset,
+                                            nouveau_mem *dst,
+                                            nouveau_mem *src,
+                                            GLuint dst_offset,
+                                            GLuint src_offset,
                                             GLuint size);
 
 typedef struct nouveau_renderbuffer_t {