summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/gles2_cmd_decoder.cc
diff options
context:
space:
mode:
authorvmiura@chromium.org <vmiura@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-15 21:36:11 +0000
committervmiura@chromium.org <vmiura@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-15 21:36:11 +0000
commit242c982192615a10912025281326c9b189a8bb9c (patch)
tree889a8c031822f4213716a637c6dc0185c71bce38 /gpu/command_buffer/service/gles2_cmd_decoder.cc
parent040a734e276f6e6311de3edbbe7d42196183c0d8 (diff)
downloadchromium_src-242c982192615a10912025281326c9b189a8bb9c.zip
chromium_src-242c982192615a10912025281326c9b189a8bb9c.tar.gz
chromium_src-242c982192615a10912025281326c9b189a8bb9c.tar.bz2
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
Diffstat (limited to 'gpu/command_buffer/service/gles2_cmd_decoder.cc')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc2
1 files changed, 1 insertions, 1 deletions
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]);
}