summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 01:05:23 +0000
committerzmo@google.com <zmo@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 01:05:23 +0000
commitd1d413e2a985fe03a680387aced6cfb4a2aaba92 (patch)
treecc9f64e2877a730886c564d4ea9326e6f8ff0828
parent5dfe0dcc0e08a38284f66b6b882ce6f215ebc120 (diff)
downloadchromium_src-d1d413e2a985fe03a680387aced6cfb4a2aaba92.zip
chromium_src-d1d413e2a985fe03a680387aced6cfb4a2aaba92.tar.gz
chromium_src-d1d413e2a985fe03a680387aced6cfb4a2aaba92.tar.bz2
Implement getAttachedShaders for WebGL.
Review URL: http://codereview.chromium.org/2805047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51206 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc3
-rw-r--r--chrome/renderer/webgraphicscontext3d_command_buffer_impl.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
index f6e6a2a..7501c2c 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
+++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
@@ -465,6 +465,9 @@ bool WebGraphicsContext3DCommandBufferImpl::getActiveUniform(
return true;
}
+DELEGATE_TO_GL_4(getAttachedShaders, GetAttachedShaders,
+ WebGLId, int, int*, unsigned int*)
+
DELEGATE_TO_GL_2R(getAttribLocation, GetAttribLocation,
WebGLId, const char*, int)
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
index ad46606..8c7f7b2 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
+++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
@@ -146,6 +146,11 @@ class WebGraphicsContext3DCommandBufferImpl
unsigned long index,
ActiveInfo&);
+ virtual void getAttachedShaders(WebGLId program,
+ int maxCount,
+ int* count,
+ unsigned int* shaders);
+
virtual int getAttribLocation(WebGLId program, const char* name);
virtual void getBooleanv(unsigned long pname, unsigned char* value);