projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
83a782c
)
glx: Fix for commit 2c86668694.
author
Matt Turner
<mattst88@gmail.com>
Thu, 23 Jun 2016 06:11:27 +0000
(23:11 -0700)
committer
Matt Turner
<mattst88@gmail.com>
Fri, 8 Jul 2016 23:46:17 +0000
(16:46 -0700)
Ian suggested these changes in his review and I made them, but I pushed
the old version of the patch.
src/glx/indirect_vertex_array.c
patch
|
blob
|
history
diff --git
a/src/glx/indirect_vertex_array.c
b/src/glx/indirect_vertex_array.c
index a7073433a5f95253e957d9de4540aab4b23dea1c..c81aae603866c8f3e7d7ba9e2a01c9a409f48787 100644
(file)
--- a/
src/glx/indirect_vertex_array.c
+++ b/
src/glx/indirect_vertex_array.c
@@
-207,6
+207,7
@@
__glXInitVertexArrayState(struct glx_context * gc)
arrays->arrays = calloc(array_count, sizeof(struct array_state));
if (arrays->arrays == NULL) {
+ state->array_state = NULL;
free(arrays);
__glXSetError(gc, GL_OUT_OF_MEMORY);
return;
@@
-295,6
+296,7
@@
__glXInitVertexArrayState(struct glx_context * gc)
* __GL_CLIENT_ATTRIB_STACK_DEPTH);
if (arrays->stack == NULL) {
+ state->array_state = NULL;
free(arrays->arrays);
free(arrays);
__glXSetError(gc, GL_OUT_OF_MEMORY);