summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-02 20:18:10 +0000
committeralexst@chromium.org <alexst@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-02 20:18:10 +0000
commit8acca586fc00bc2570011fe3347ad2de89001992 (patch)
treed3a6c7ad149c9c38f9f0133bc2836d2d5aee395d /webkit
parent672898bcd1f04dd3678dc1aa7aaa38c17b404fc3 (diff)
downloadchromium_src-8acca586fc00bc2570011fe3347ad2de89001992.zip
chromium_src-8acca586fc00bc2570011fe3347ad2de89001992.tar.gz
chromium_src-8acca586fc00bc2570011fe3347ad2de89001992.tar.bz2
Adding necessary plumbing for bindUniformLocationCHROMIUM extension.
BUG=133438 TEST=unit tests Review URL: https://chromiumcodereview.appspot.com/10708002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145180 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc3
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h3
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.cc5
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.h2
4 files changed, 13 insertions, 0 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
index 91a37a5..b7e93df 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -1637,5 +1637,8 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::OnContextLost() {
}
}
+DELEGATE_TO_GL_3(bindUniformLocationCHROMIUM, BindUniformLocationCHROMIUM,
+ WebGLId, WGC3Dint, const WGC3Dchar*)
+
} // namespace gpu
} // namespace webkit
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
index 0fc140a..f436c9a6 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
@@ -479,6 +479,9 @@ class WebGraphicsContext3DInProcessCommandBufferImpl
WGC3Duint dest_id, WGC3Dint level,
WGC3Denum internal_format);
+ virtual void bindUniformLocationCHROMIUM(WebGLId program, WGC3Dint location,
+ const WGC3Dchar* uniform);
+
protected:
virtual GrGLInterface* onCreateGrGLInterface();
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
index 6539487..14701c3 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
@@ -747,6 +747,11 @@ void WebGraphicsContext3DInProcessImpl::copyTextureToParentTextureCHROMIUM(
NOTIMPLEMENTED();
}
+void WebGraphicsContext3DInProcessImpl::bindUniformLocationCHROMIUM(
+ WebGLId program, WGC3Dint location, const WGC3Dchar* uniform) {
+ NOTIMPLEMENTED();
+}
+
WebString WebGraphicsContext3DInProcessImpl::
getRequestableExtensionsCHROMIUM() {
return WebString();
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
index 3579d90..1be900e 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
@@ -475,6 +475,8 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D {
virtual void copyTextureCHROMIUM(WGC3Denum target, WGC3Duint source_id,
WGC3Duint dest_id, WGC3Dint level,
WGC3Denum internal_format);
+ virtual void bindUniformLocationCHROMIUM(WebGLId program, WGC3Dint location,
+ const WGC3Dchar* uniform);
protected:
virtual GrGLInterface* onCreateGrGLInterface();