Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1850ea3a authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am b439f561: am 13feccf5: Merge change I39f0003e into eclair 

Merge commit 'b439f561a6aa3900f1850e71a4aa60618af13f90' into eclair-mr2-plus-aosp

* commit 'b439f561a6aa3900f1850e71a4aa60618af13f90':
  fix [2235414] libagl glDeleteBuffers() crashes
parents 34803aa0 8386ce0d

opengl/libagl/array.cpp

+24 −12
Original line number Diff line number Diff line
@@ -1548,28 +1548,40 @@ void glDeleteBuffers(GLsizei n, const GLuint* buffers) 
        GLuint name = buffers[i];

        if (name) {

            // unbind bound deleted buffers...

            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) {

                if (c->arrays.array_buffer->name == name) {

                    c->arrays.array_buffer = 0;

                }

            }

            if (c->arrays.vertex.bo) {

                if (c->arrays.vertex.bo->name == name) {

                    c->arrays.vertex.bo = 0;

                }

            }

            if (c->arrays.normal.bo) {

                if (c->arrays.normal.bo->name == name) {

                    c->arrays.normal.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) {

                    if (c->arrays.texture[t].bo->name == name) {

                        c->arrays.texture[t].bo = 0;

                    }

                }

            }

        }

    }

    c->bufferObjectManager->deleteBuffers(n, buffers);

    c->bufferObjectManager->recycleTokens(n, buffers);

}