nouveau: add nouveau_mem_alloc/free debugging

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_buffers.c b/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
index e628dd5b3c45d777528e6072f4810aa00303371d..b54f68f4023e89da23110fcaeae75348d5b0cd7c 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
@@ -71,6 +71,11 @@ nouveau_mem_free(GLcontext *ctx, nouveau_mem *mem)
    nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
    drm_nouveau_mem_free_t memf;
 
+   if (NOUVEAU_DEBUG & DEBUG_MEM)  {
+      fprintf(stderr, "%s: type=0x%x, offset=0x%x, size=0x%x\n",
+           __func__, mem->type, (GLuint)mem->offset, (GLuint)mem->size);
+   }
+
    if (mem->map)
       drmUnmap(mem->map, mem->size);
    memf.flags         = mem->type;
@@ -87,6 +92,11 @@ nouveau_mem_alloc(GLcontext *ctx, int type, GLuint size, GLuint align)
    nouveau_mem *mem;
    int ret;
 
+   if (NOUVEAU_DEBUG & DEBUG_MEM)  {
+      fprintf(stderr, "%s: requested: type=0x%x, size=0x%x, align=0x%x\n",
+           __func__, type, (GLuint)size, align);
+   }
+
    mem = CALLOC(sizeof(nouveau_mem));
    if (!mem)
       return NULL;
@@ -104,6 +114,11 @@ nouveau_mem_alloc(GLcontext *ctx, int type, GLuint size, GLuint align)
    mem->offset = mema.region_offset;
    mem->type   = mema.flags;
 
+   if (NOUVEAU_DEBUG & DEBUG_MEM)  {
+      fprintf(stderr, "%s: actual: type=0x%x, offset=0x%x, size=0x%x\n",
+           __func__, mem->type, (GLuint)mem->offset, (GLuint)mem->size);
+   }
+
    if (type & NOUVEAU_MEM_MAPPED)
       ret = drmMap(nmesa->driFd, mem->offset, mem->size, &mem->map);
    if (ret) {

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 3718900b62748ec6b79669041f382bb856fbcdb3..bb67f72f4a8f79062ff3ff860eb4f66953fe09d8 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -63,8 +63,9 @@ int NOUVEAU_DEBUG = 0;
 
 static const struct dri_debug_control debug_control[] =
 {
-       { "shaders", DEBUG_SHADERS },
-       { NULL,    0 }
+       { "shaders"   , DEBUG_SHADERS    },
+       { "mem"       , DEBUG_MEM        },
+       { NULL        , 0                }
 };
 
 #define need_GL_ARB_vertex_program

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h
index 0efbcce1293415782b0b2147e33fdfbefd437f47..b0952070c7792fbcdf8c855b263eb2a7e98d6644 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
@@ -216,7 +216,8 @@ extern void nouveauCopySubBuffer(__DRIdrawablePrivate *dPriv,
 /* Debugging utils: */
 extern int NOUVEAU_DEBUG;
 
-#define DEBUG_SHADERS 0x00000001
+#define DEBUG_SHADERS  0x00000001
+#define DEBUG_MEM      0x00000002
 
 #endif /* __NOUVEAU_CONTEXT_H__ */