summaryrefslogtreecommitdiffstats
path: root/webkit/gpu
diff options
context:
space:
mode:
authorvangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-06 17:26:17 +0000
committervangelis@chromium.org <vangelis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-06 17:26:17 +0000
commit97dc7cbe1b802facd4ccf92c6f7da78bd5a8ce51 (patch)
tree93e396f7cef6348bbebcd3c83cbdf7eb023d0d3f /webkit/gpu
parentfa8e6464f65a0f0304ea199d04ca531dbab79f99 (diff)
downloadchromium_src-97dc7cbe1b802facd4ccf92c6f7da78bd5a8ce51.zip
chromium_src-97dc7cbe1b802facd4ccf92c6f7da78bd5a8ce51.tar.gz
chromium_src-97dc7cbe1b802facd4ccf92c6f7da78bd5a8ce51.tar.bz2
Adds support for the GL_ANGLE_texture_usage and GL_EXT_texture_storage
extensions to the command buffer and the WebGraphicsContext3D APIs. BUG=106142 TEST=unittests Review URL: http://codereview.chromium.org/8772033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc3
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h4
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.cc3
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.h4
4 files changed, 14 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 9581fda..9daaa74 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -1666,6 +1666,9 @@ WGC3Denum WebGraphicsContext3DInProcessCommandBufferImpl::
DELEGATE_TO_GL_5(texImageIOSurface2DCHROMIUM, TexImageIOSurface2DCHROMIUM,
WGC3Denum, WGC3Dint, WGC3Dint, WGC3Duint, WGC3Duint)
+DELEGATE_TO_GL_5(texStorage2DEXT, TexStorage2DEXT,
+ WGC3Denum, WGC3Dint, WGC3Duint, WGC3Dint, WGC3Dint)
+
#if WEBKIT_USING_SKIA
GrGLInterface* WebGraphicsContext3DInProcessCommandBufferImpl::
onCreateGrGLInterface() {
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
index a619213..b6da864 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
@@ -458,6 +458,10 @@ class WebGraphicsContext3DInProcessCommandBufferImpl
WGC3Denum target, WGC3Dint width, WGC3Dint height,
WGC3Duint ioSurfaceId, WGC3Duint plane);
+ virtual void texStorage2DEXT(
+ WGC3Denum target, WGC3Dint levels, WGC3Duint internalformat,
+ WGC3Dint width, WGC3Dint height);
+
protected:
#if WEBKIT_USING_SKIA
virtual GrGLInterface* onCreateGrGLInterface();
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
index 3d1de34..548cf4d 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
@@ -1619,6 +1619,9 @@ void WebGraphicsContext3DInProcessImpl::texImageIOSurface2DCHROMIUM(
WGC3Duint ioSurfaceId, WGC3Duint plane) {
}
+DELEGATE_TO_GL_5(texStorage2DEXT, TexStorage2DEXT,
+ WGC3Denum, WGC3Dint, WGC3Duint, WGC3Dint, WGC3Dint)
+
#if WEBKIT_USING_SKIA
GrGLInterface* WebGraphicsContext3DInProcessImpl::onCreateGrGLInterface() {
return gfx::CreateInProcessSkiaGLBinding();
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
index d964d2d..4603afb 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
@@ -446,6 +446,10 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D {
WGC3Denum target, WGC3Dint width, WGC3Dint height,
WGC3Duint ioSurfaceId, WGC3Duint plane);
+ virtual void texStorage2DEXT(
+ WGC3Denum target, WGC3Dint levels, WGC3Duint internalformat,
+ WGC3Dint width, WGC3Dint height);
+
protected:
#if WEBKIT_USING_SKIA
virtual GrGLInterface* onCreateGrGLInterface();