diff options
| author | Mathias Agopian <mathias@google.com> | 2009-11-19 19:16:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-19 19:16:58 -0800 |
| commit | 7e2609fdddbf21933eb078d3f30d95bbd4d6a147 (patch) | |
| tree | 39d05d28153ec417df37b18d94e1b6db3f73bc3e /opengl | |
| parent | 3b90f65c02e1e36945b7c131fdc4a1112332458e (diff) | |
| parent | 8e9af2bd1d600cd2c69c88c7d60c7d455921677e (diff) | |
| download | frameworks_base-7e2609fdddbf21933eb078d3f30d95bbd4d6a147.zip frameworks_base-7e2609fdddbf21933eb078d3f30d95bbd4d6a147.tar.gz frameworks_base-7e2609fdddbf21933eb078d3f30d95bbd4d6a147.tar.bz2 | |
am 8e9af2bd: am b439f561: am 13feccf5: Merge change I39f0003e into eclair
Merge commit '8e9af2bd1d600cd2c69c88c7d60c7d455921677e'
* commit '8e9af2bd1d600cd2c69c88c7d60c7d455921677e':
fix [2235414] libagl glDeleteBuffers() crashes
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/array.cpp | 36 |
1 files changed, 24 insertions, 12 deletions
diff --git a/opengl/libagl/array.cpp b/opengl/libagl/array.cpp index 4878722..71825c5 100644 --- a/opengl/libagl/array.cpp +++ b/opengl/libagl/array.cpp @@ -1548,24 +1548,36 @@ void glDeleteBuffers(GLsizei n, const GLuint* buffers) GLuint name = buffers[i]; if (name) { // unbind bound deleted buffers... - if (c->arrays.element_array_buffer->name == name) { - c->arrays.element_array_buffer = 0; + if (c->arrays.element_array_buffer) { + if (c->arrays.element_array_buffer->name == name) { + c->arrays.element_array_buffer = 0; + } } - if (c->arrays.array_buffer->name == name) { - c->arrays.array_buffer = 0; + if (c->arrays.array_buffer) { + if (c->arrays.array_buffer->name == name) { + c->arrays.array_buffer = 0; + } } - if (c->arrays.vertex.bo->name == name) { - c->arrays.vertex.bo = 0; + if (c->arrays.vertex.bo) { + if (c->arrays.vertex.bo->name == name) { + c->arrays.vertex.bo = 0; + } } - if (c->arrays.normal.bo->name == name) { - c->arrays.normal.bo = 0; + if (c->arrays.normal.bo) { + if (c->arrays.normal.bo->name == name) { + c->arrays.normal.bo = 0; + } } - if (c->arrays.color.bo->name == name) { - c->arrays.color.bo = 0; + if (c->arrays.color.bo) { + if (c->arrays.color.bo->name == name) { + c->arrays.color.bo = 0; + } } for (int t=0 ; t<GGL_TEXTURE_UNIT_COUNT ; t++) { - if (c->arrays.texture[t].bo->name == name) { - c->arrays.texture[t].bo = 0; + if (c->arrays.texture[t].bo) { + if (c->arrays.texture[t].bo->name == name) { + c->arrays.texture[t].bo = 0; + } } } } |