diff options
| author | Mathias Agopian <mathias@google.com> | 2009-11-19 19:07:36 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-19 19:07:36 -0800 |
| commit | b439f561a6aa3900f1850e71a4aa60618af13f90 (patch) | |
| tree | d14d7c51404256a86fceb8481411f2068f94b68e /opengl | |
| parent | 4f81eac4ea57aaf9d2b89ab8b201c60ca5bf3c09 (diff) | |
| parent | 13feccf592d6870b41b3b8a0a31d2abefad0d7ae (diff) | |
| download | frameworks_base-b439f561a6aa3900f1850e71a4aa60618af13f90.zip frameworks_base-b439f561a6aa3900f1850e71a4aa60618af13f90.tar.gz frameworks_base-b439f561a6aa3900f1850e71a4aa60618af13f90.tar.bz2 | |
am 13feccf5: Merge change I39f0003e into eclair
Merge commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae' into eclair-mr2
* commit '13feccf592d6870b41b3b8a0a31d2abefad0d7ae':
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; + } } } } |