summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 17:01:05 +0000
committerzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 17:01:05 +0000
commitd1916c75731d27972e0f61303296766e624ebfa7 (patch)
treeb8ff5a2b82d0ade500063092785598ede1bac86d
parent551707a49fc4381149e5aebe1f276c7dfead862b (diff)
downloadchromium_src-d1916c75731d27972e0f61303296766e624ebfa7.zip
chromium_src-d1916c75731d27972e0f61303296766e624ebfa7.tar.gz
chromium_src-d1916c75731d27972e0f61303296766e624ebfa7.tar.bz2
Add makeContextCurrent() to all gl functions.
Review URL: http://codereview.chromium.org/2846007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49966 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
index 6caa0ae..2f91cce 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
+++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
@@ -392,6 +392,7 @@ DELEGATE_TO_GL_1(generateMipmap, GenerateMipmap, unsigned long)
bool WebGraphicsContext3DCommandBufferImpl::getActiveAttrib(
WebGLId program, unsigned long index, ActiveInfo& info) {
+ makeContextCurrent();
if (!program) {
synthesizeGLError(GL_INVALID_VALUE);
return false;
@@ -421,6 +422,7 @@ bool WebGraphicsContext3DCommandBufferImpl::getActiveAttrib(
bool WebGraphicsContext3DCommandBufferImpl::getActiveUniform(
WebGLId program, unsigned long index, ActiveInfo& info) {
+ makeContextCurrent();
GLint max_name_length = -1;
glGetProgramiv(program, GL_ACTIVE_UNIFORM_MAX_LENGTH, &max_name_length);
if (max_name_length < 0)