projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a87950
)
st/mesa: fix setup_edgeflags() regression
author
Brian Paul
<brianp@vmware.com>
Mon, 22 Jun 2009 23:49:22 +0000
(17:49 -0600)
committer
Brian Paul
<brianp@vmware.com>
Mon, 22 Jun 2009 23:49:22 +0000
(17:49 -0600)
stobj is now non-null for the default/null buffer object. Update the
test to check the buffer ID to see if it's a real buffer object.
src/mesa/state_tracker/st_draw.c
patch
|
blob
|
history
diff --git
a/src/mesa/state_tracker/st_draw.c
b/src/mesa/state_tracker/st_draw.c
index 8e036223c65a5e5dfb9fa9f9405fec7b8c954f57..914a507bef61268415d148498523ccf85f052b43 100644
(file)
--- a/
src/mesa/state_tracker/st_draw.c
+++ b/
src/mesa/state_tracker/st_draw.c
@@
-229,8
+229,10
@@
setup_edgeflags(GLcontext *ctx, GLenum primMode, GLint start, GLint count,
struct st_buffer_object *stobj = st_buffer_object(array->BufferObj);
ubyte *map;
- if (!stobj)
+ if (!stobj || stobj->Base.Name == 0) {
+ /* edge flags are not in a VBO */
return NULL;
+ }
vec = (unsigned *) _mesa_calloc(sizeof(unsigned) * ((count + 31) / 32));
if (!vec)