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

Error detection/reporting was broken in several places.

Browse Source
This commit is contained in:
Brian Paul
2006-08-25 22:06:02 +00:00
parent 3fea5910b9
commit 4277ea4c0b
1 changed files with 70 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 6.5 * Version: 6.5.1
* *
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
* *
@@ -44,13 +44,11 @@
* \param ctx GL context * \param ctx GL context
* \param target Buffer object target to be retrieved. Currently this must * \param target Buffer object target to be retrieved. Currently this must
* be either \c GL_ARRAY_BUFFER or \c GL_ELEMENT_ARRAY_BUFFER. * be either \c GL_ARRAY_BUFFER or \c GL_ELEMENT_ARRAY_BUFFER.
* \param caller Name of calling function for recording errors.
* \return A pointer to the buffer object bound to \c target in the * \return A pointer to the buffer object bound to \c target in the
* specified context or \c NULL if \c target is invalid or no * specified context or \c NULL if \c target is invalid.
* buffer object is bound.
*/ */
static INLINE struct gl_buffer_object * static INLINE struct gl_buffer_object *
buffer_object_get_target(GLcontext *ctx, GLenum target, const char *caller) get_buffer(GLcontext *ctx, GLenum target)
{ {
struct gl_buffer_object * bufObj = NULL; struct gl_buffer_object * bufObj = NULL;
@@ -68,12 +66,12 @@ buffer_object_get_target(GLcontext *ctx, GLenum target, const char *caller)
bufObj = ctx->Unpack.BufferObj; bufObj = ctx->Unpack.BufferObj;
break; break;
default: default:
_mesa_error(ctx, GL_INVALID_ENUM, "gl%s(target)", caller); /* error must be recorded by caller */
return NULL; return NULL;
} }
if (bufObj->Name == 0) /* bufObj should point to NullBufferObj or a user-created buffer object */
return NULL; ASSERT(bufObj);
return bufObj; return bufObj;
} }
@@ -112,17 +110,20 @@ buffer_object_subdata_range_good( GLcontext * ctx, GLenum target,
return NULL; return NULL;
} }
bufObj = buffer_object_get_target(ctx, target, caller); bufObj = get_buffer(ctx, target);
if (!bufObj || bufObj->Name == 0) { if (!bufObj) {
_mesa_error(ctx, GL_INVALID_ENUM, "%s(target)", caller);
return NULL;
}
if (bufObj->Name == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
return NULL; return NULL;
} }
if ((GLuint) (offset + size) > bufObj->Size) { if ((GLuint) (offset + size) > bufObj->Size) {
_mesa_error(ctx, GL_INVALID_VALUE, _mesa_error(ctx, GL_INVALID_VALUE,
"%s(size + offset > buffer size)", caller); "%s(size + offset > buffer size)", caller);
return NULL; return NULL;
} }
if (bufObj->Pointer) { if (bufObj->Pointer) {
/* Buffer is currently mapped */ /* Buffer is currently mapped */
_mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller); _mesa_error(ctx, GL_INVALID_OPERATION, "%s", caller);
@@ -491,9 +492,29 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
GET_CURRENT_CONTEXT(ctx); GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *oldBufObj; struct gl_buffer_object *oldBufObj;
struct gl_buffer_object *newBufObj = NULL; struct gl_buffer_object *newBufObj = NULL;
struct gl_buffer_object **bindTarget = NULL;
ASSERT_OUTSIDE_BEGIN_END(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);
oldBufObj = buffer_object_get_target( ctx, target, "BindBufferARB" ); switch (target) {
case GL_ARRAY_BUFFER_ARB:
bindTarget = &ctx->Array.ArrayBufferObj;
break;
case GL_ELEMENT_ARRAY_BUFFER_ARB:
bindTarget = &ctx->Array.ElementArrayBufferObj;
break;
case GL_PIXEL_PACK_BUFFER_EXT:
bindTarget = &ctx->Pack.BufferObj;
break;
case GL_PIXEL_UNPACK_BUFFER_EXT:
bindTarget = &ctx->Unpack.BufferObj;
break;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferARB(target)");
return;
}
/* Get pointer to old buffer object (to be unbound) */
oldBufObj = get_buffer(ctx, target);
if (oldBufObj && oldBufObj->Name == buffer) if (oldBufObj && oldBufObj->Name == buffer)
return; /* rebinding the same buffer object- no change */ return; /* rebinding the same buffer object- no change */
@@ -519,31 +540,17 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
} }
_mesa_save_buffer_object(ctx, newBufObj); _mesa_save_buffer_object(ctx, newBufObj);
} }
newBufObj->RefCount++;
} }
switch (target) { /* Make new binding */
case GL_ARRAY_BUFFER_ARB: *bindTarget = newBufObj;
ctx->Array.ArrayBufferObj = newBufObj; newBufObj->RefCount++;
break;
case GL_ELEMENT_ARRAY_BUFFER_ARB:
ctx->Array.ElementArrayBufferObj = newBufObj;
break;
case GL_PIXEL_PACK_BUFFER_EXT:
ctx->Pack.BufferObj = newBufObj;
break;
case GL_PIXEL_UNPACK_BUFFER_EXT:
ctx->Unpack.BufferObj = newBufObj;
break;
default:
_mesa_problem(ctx, "Bad target in _mesa_BindBufferARB");
return;
}
/* Pass BindBuffer call to device driver */ /* Pass BindBuffer call to device driver */
if (ctx->Driver.BindBuffer && newBufObj) if (ctx->Driver.BindBuffer && newBufObj)
ctx->Driver.BindBuffer( ctx, target, newBufObj ); ctx->Driver.BindBuffer( ctx, target, newBufObj );
/* decr ref count on old buffer obj, delete if needed */
if (oldBufObj) { if (oldBufObj) {
oldBufObj->RefCount--; oldBufObj->RefCount--;
assert(oldBufObj->RefCount >= 0); assert(oldBufObj->RefCount >= 0);
@@ -759,8 +766,12 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
return; return;
} }
bufObj = buffer_object_get_target( ctx, target, "BufferDataARB" ); bufObj = get_buffer(ctx, target);
if (!bufObj || bufObj->Name ==0) { if (!bufObj) {
_mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(target)" );
return;
}
if (bufObj->Name == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB" ); _mesa_error(ctx, GL_INVALID_OPERATION, "glBufferDataARB" );
return; return;
} }
@@ -786,7 +797,7 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
ASSERT_OUTSIDE_BEGIN_END(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);
bufObj = buffer_object_subdata_range_good( ctx, target, offset, size, bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,
"BufferSubDataARB" ); "glBufferSubDataARB" );
if (!bufObj) { if (!bufObj) {
/* error already recorded */ /* error already recorded */
return; return;
@@ -806,7 +817,7 @@ _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
ASSERT_OUTSIDE_BEGIN_END(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);
bufObj = buffer_object_subdata_range_good( ctx, target, offset, size, bufObj = buffer_object_subdata_range_good( ctx, target, offset, size,
"GetBufferSubDataARB" ); "glGetBufferSubDataARB" );
if (!bufObj) { if (!bufObj) {
/* error already recorded */ /* error already recorded */
return; return;
@@ -835,12 +846,15 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
return NULL; return NULL;
} }
bufObj = buffer_object_get_target( ctx, target, "MapBufferARB" ); bufObj = get_buffer(ctx, target);
if (!bufObj || bufObj->Name == 0) { if (!bufObj) {
_mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(target)" );
return NULL;
}
if (bufObj->Name == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB" ); _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB" );
return NULL; return NULL;
} }
if (bufObj->Pointer) { if (bufObj->Pointer) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)"); _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferARB(already mapped)");
return NULL; return NULL;
@@ -866,12 +880,15 @@ _mesa_UnmapBufferARB(GLenum target)
GLboolean status = GL_TRUE; GLboolean status = GL_TRUE;
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
bufObj = buffer_object_get_target( ctx, target, "UnmapBufferARB" ); bufObj = get_buffer(ctx, target);
if (!bufObj || bufObj->Name == 0) { if (!bufObj) {
_mesa_error(ctx, GL_INVALID_ENUM, "glUnmapBufferARB(target)" );
return GL_FALSE;
}
if (bufObj->Name == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" ); _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB" );
return GL_FALSE; return GL_FALSE;
} }
if (!bufObj->Pointer) { if (!bufObj->Pointer) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB"); _mesa_error(ctx, GL_INVALID_OPERATION, "glUnmapBufferARB");
return GL_FALSE; return GL_FALSE;
@@ -895,8 +912,12 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
struct gl_buffer_object *bufObj; struct gl_buffer_object *bufObj;
ASSERT_OUTSIDE_BEGIN_END(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);
bufObj = buffer_object_get_target( ctx, target, "GetBufferParameterivARB" ); bufObj = get_buffer(ctx, target);
if (!bufObj || bufObj->Name == 0) { if (!bufObj) {
_mesa_error(ctx, GL_INVALID_ENUM, "GetBufferParameterivARB(target)" );
return;
}
if (bufObj->Name == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, "GetBufferParameterivARB" ); _mesa_error(ctx, GL_INVALID_OPERATION, "GetBufferParameterivARB" );
return; return;
} }
@@ -933,8 +954,12 @@ _mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
return; return;
} }
bufObj = buffer_object_get_target( ctx, target, "GetBufferPointervARB" ); bufObj = get_buffer(ctx, target);
if (!bufObj || bufObj->Name == 0) { if (!bufObj) {
_mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferPointervARB(target)" );
return;
}
if (bufObj->Name == 0) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferPointervARB" ); _mesa_error(ctx, GL_INVALID_OPERATION, "glGetBufferPointervARB" );
return; return;
} }