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

mesa: check for null ptr in _mesa_is_bufferobj()

Browse Source 
This simplifies a few callers.  And it adds a bit of robustness.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
This commit is contained in:
Brian Paul
2011-11-23 15:33:46 -07:00
parent 37bf720da4
commit 56b870e441
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1286,14 +1286,14 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
ASSERT_OUTSIDE_BEGIN_END(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx);
src = get_buffer(ctx, readTarget); src = get_buffer(ctx, readTarget);
if (!src || !_mesa_is_bufferobj(src)) { if (!_mesa_is_bufferobj(src)) {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
"glCopyBuffserSubData(readTarget = 0x%x)", readTarget); "glCopyBuffserSubData(readTarget = 0x%x)", readTarget);
return; return;
} }
dst = get_buffer(ctx, writeTarget); dst = get_buffer(ctx, writeTarget);
if (!dst || !_mesa_is_bufferobj(dst)) { if (!_mesa_is_bufferobj(dst)) {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
"glCopyBuffserSubData(writeTarget = 0x%x)", writeTarget); "glCopyBuffserSubData(writeTarget = 0x%x)", writeTarget);
return; return;
@@ -1421,7 +1421,7 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
} }
bufObj = get_buffer(ctx, target); bufObj = get_buffer(ctx, target);
if (!bufObj || !_mesa_is_bufferobj(bufObj)) { if (!_mesa_is_bufferobj(bufObj)) {
_mesa_error(ctx, GL_INVALID_ENUM, _mesa_error(ctx, GL_INVALID_ENUM,
"glMapBufferRange(target = 0x%x)", target); "glMapBufferRange(target = 0x%x)", target);
return NULL; return NULL;

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

@@ -53,7 +53,7 @@ _mesa_bufferobj_mapped(const struct gl_buffer_object *obj)
static inline GLboolean static inline GLboolean
_mesa_is_bufferobj(const struct gl_buffer_object *obj) _mesa_is_bufferobj(const struct gl_buffer_object *obj)
{ {
return obj->Name != 0; return obj != NULL && obj->Name != 0;
} }

10
src/mesa/state_tracker/st_draw.c
View File

@@ -325,7 +325,7 @@ is_interleaved_arrays(const struct st_vertex_program *vp,
if (abs(array->Ptr - firstPtr) > firstStride) if (abs(array->Ptr - firstPtr) > firstStride)
return GL_FALSE; /* arrays start too far apart */ return GL_FALSE; /* arrays start too far apart */
if ((!bufObj || !_mesa_is_bufferobj(bufObj)) != userSpaceBuffer) if ((!_mesa_is_bufferobj(bufObj)) != userSpaceBuffer)
return GL_FALSE; /* mix of VBO and user-space arrays */ return GL_FALSE; /* mix of VBO and user-space arrays */
} }
} }
@@ -390,7 +390,7 @@ setup_interleaved_attribs(struct gl_context *ctx,
} }
/* are the arrays in user space? */ /* are the arrays in user space? */
usingVBO = bufobj && _mesa_is_bufferobj(bufobj); usingVBO = _mesa_is_bufferobj(bufobj);
for (attr = 0; attr < vpv->num_inputs; attr++) { for (attr = 0; attr < vpv->num_inputs; attr++) {
const GLuint mesaAttr = vp->index_to_input[attr]; const GLuint mesaAttr = vp->index_to_input[attr];
@@ -497,7 +497,7 @@ setup_non_interleaved_attribs(struct gl_context *ctx,
assert(element_size == array->Size * _mesa_sizeof_type(array->Type)); assert(element_size == array->Size * _mesa_sizeof_type(array->Type));
if (bufobj && _mesa_is_bufferobj(bufobj)) { if (_mesa_is_bufferobj(bufobj)) {
/* Attribute data is in a VBO. /* Attribute data is in a VBO.
* Recall that for VBOs, the gl_client_array->Ptr field is * Recall that for VBOs, the gl_client_array->Ptr field is
* really an offset from the start of the VBO, not a pointer. * really an offset from the start of the VBO, not a pointer.
@@ -599,7 +599,7 @@ setup_index_buffer(struct gl_context *ctx,
} }
/* get/create the index buffer object */ /* get/create the index buffer object */
if (bufobj && _mesa_is_bufferobj(bufobj)) { if (_mesa_is_bufferobj(bufobj)) {
/* elements/indexes are in a real VBO */ /* elements/indexes are in a real VBO */
struct st_buffer_object *stobj = st_buffer_object(bufobj); struct st_buffer_object *stobj = st_buffer_object(bufobj);
pipe_resource_reference(&ibuffer->buffer, stobj->buffer); pipe_resource_reference(&ibuffer->buffer, stobj->buffer);
@@ -775,7 +775,7 @@ handle_fallback_primitive_restart(struct pipe_context *pipe,
info.primitive_restart = FALSE; info.primitive_restart = FALSE;
info.instance_count = 1; info.instance_count = 1;
if (ib->obj && _mesa_is_bufferobj(ib->obj)) { if (_mesa_is_bufferobj(ib->obj)) {
ptr = pipe_buffer_map_range(pipe, ibuffer->buffer, ptr = pipe_buffer_map_range(pipe, ibuffer->buffer,
start * ibuffer->index_size, /* start */ start * ibuffer->index_size, /* start */
count * ibuffer->index_size, /* length */ count * ibuffer->index_size, /* length */