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

Merge commit 'origin/master' into gallium-0.2

Browse Source 
Conflicts:

	progs/trivial/Makefile
	src/mesa/glapi/glthread.c
This commit is contained in:
Keith Whitwell
2008-09-18 18:57:46 +01:00
parent 1074e8e4e4 5e530d8384
commit 89ab66448e
37 changed files with 399 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,11 +205,14 @@ _mesa_reference_buffer_object(GLcontext *ctx,
if (deleteFlag) {
/* some sanity checking: don't delete a buffer still in use */
#if 0
/* unfortunately, these tests are invalid during context tear-down */
ASSERT(ctx->Array.ArrayBufferObj != bufObj);
ASSERT(ctx->Array.ElementArrayBufferObj != bufObj);
ASSERT(ctx->Array.ArrayObj->Vertex.BufferObj != bufObj);
ASSERT(ctx->Driver.DeleteBuffer);
#endif
ASSERT(ctx->Driver.DeleteBuffer);
ctx->Driver.DeleteBuffer(ctx, oldObj);
}