OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove renderbuffer deletion debug field.

Browse Source 
It has presumably served its purpose by now, and other object deletion
doesn't do this.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Eric Anholt
2011-04-15 11:06:36 -07:00
parent 641dd899bd
commit 91226ce648
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/mtypes.h
View File

@@ -2406,8 +2406,6 @@ struct gl_shared_state
*/ */
struct gl_renderbuffer struct gl_renderbuffer
{ {
#define RB_MAGIC 0xaabbccdd
int Magic; /** XXX TEMPORARY DEBUG INFO */
_glthread_Mutex Mutex; /**< for thread safety */ _glthread_Mutex Mutex; /**< for thread safety */
GLuint ClassID; /**< Useful for drivers */ GLuint ClassID; /**< Useful for drivers */
GLuint Name; GLuint Name;

5
src/mesa/main/renderbuffer.c
View File

@@ -1395,7 +1395,6 @@ _mesa_init_renderbuffer(struct gl_renderbuffer *rb, GLuint name)
{ {
_glthread_INIT_MUTEX(rb->Mutex); _glthread_INIT_MUTEX(rb->Mutex);
rb->Magic = RB_MAGIC;
rb->ClassID = 0; rb->ClassID = 0;
rb->Name = name; rb->Name = name;
rb->RefCount = 0; rb->RefCount = 0;
@@ -1970,9 +1969,7 @@ _mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
GLboolean deleteFlag = GL_FALSE; GLboolean deleteFlag = GL_FALSE;
struct gl_renderbuffer *oldRb = *ptr; struct gl_renderbuffer *oldRb = *ptr;
assert(oldRb->Magic == RB_MAGIC);
_glthread_LOCK_MUTEX(oldRb->Mutex); _glthread_LOCK_MUTEX(oldRb->Mutex);
assert(oldRb->Magic == RB_MAGIC);
ASSERT(oldRb->RefCount > 0); ASSERT(oldRb->RefCount > 0);
oldRb->RefCount--; oldRb->RefCount--;
/*printf("RB DECR %p (%d) to %d\n", (void*) oldRb, oldRb->Name, oldRb->RefCount);*/ /*printf("RB DECR %p (%d) to %d\n", (void*) oldRb, oldRb->Name, oldRb->RefCount);*/
@@ -1980,7 +1977,6 @@ _mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
_glthread_UNLOCK_MUTEX(oldRb->Mutex); _glthread_UNLOCK_MUTEX(oldRb->Mutex);
if (deleteFlag) { if (deleteFlag) {
oldRb->Magic = 0; /* now invalid memory! */
oldRb->Delete(oldRb); oldRb->Delete(oldRb);
} }
@@ -1989,7 +1985,6 @@ _mesa_reference_renderbuffer(struct gl_renderbuffer **ptr,
assert(!*ptr); assert(!*ptr);
if (rb) { if (rb) {
assert(rb->Magic == RB_MAGIC);
/* reference new renderbuffer */ /* reference new renderbuffer */
_glthread_LOCK_MUTEX(rb->Mutex); _glthread_LOCK_MUTEX(rb->Mutex);
rb->RefCount++; rb->RefCount++;