From 242c982192615a10912025281326c9b189a8bb9c Mon Sep 17 00:00:00 2001 From: "vmiura@chromium.org" Date: Tue, 15 Apr 2014 21:36:11 +0000 Subject: glDeleteVertexArraysOES on bound VAO restores default VAO 0. The default VAO attributes were not being restored when using emulated VAO, for example on ARM GPUs (e.g. Nexus 10) Chrome forces VAO emulation, and the following WebGL conformance test fails: http://www.khronos.org/registry/webgl/sdk/tests/conformance/extensions/oes-vertex-array-object.html BUG=263398 Review URL: https://codereview.chromium.org/237603003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264005 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/command_buffer/service/gles2_cmd_decoder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gpu/command_buffer/service/gles2_cmd_decoder.cc') diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 80ca209..9a5cb1a 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -9631,7 +9631,7 @@ void GLES2DecoderImpl::DeleteVertexArraysOESHelper( GetVertexAttribManager(client_ids[ii]); if (vao && !vao->IsDeleted()) { if (state_.vertex_attrib_manager.get() == vao) { - state_.vertex_attrib_manager = default_vertex_attrib_manager_; + DoBindVertexArrayOES(0); } RemoveVertexAttribManager(client_ids[ii]); } -- cgit v1.1