summaryrefslogtreecommitdiffstats
path: root/webkit/gpu
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 02:47:48 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-11 02:47:48 +0000
commitc02a52e862774d1f5f40e75d15924571f96121f1 (patch)
tree2e0878f4ed997833dd9224832c385efa93e14124 /webkit/gpu
parent497f98356f9f46879f478873f11b6528ef56c368 (diff)
downloadchromium_src-c02a52e862774d1f5f40e75d15924571f96121f1.zip
chromium_src-c02a52e862774d1f5f40e75d15924571f96121f1.tar.gz
chromium_src-c02a52e862774d1f5f40e75d15924571f96121f1.tar.bz2
Add entry points for compressed textures.
This is needed for a coming webkit patch that will use these functions. TEST=none BUG=none R=kbr@chromium.org Review URL: http://codereview.chromium.org/8523001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc8
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h17
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.cc8
-rw-r--r--webkit/gpu/webgraphicscontext3d_in_process_impl.h19
4 files changed, 52 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 b9a5b00..71a8a70 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -1105,6 +1105,14 @@ DELEGATE_TO_GL_4(colorMask, ColorMask,
DELEGATE_TO_GL_1(compileShader, CompileShader, WebGLId)
+DELEGATE_TO_GL_8(compressedTexImage2D, CompressedTexImage2D,
+ WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dint, WGC3Dint,
+ WGC3Dsizei, WGC3Dsizei, const void*)
+
+DELEGATE_TO_GL_9(compressedTexSubImage2D, CompressedTexSubImage2D,
+ WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint,
+ WGC3Denum, WGC3Dsizei, const void*)
+
DELEGATE_TO_GL_8(copyTexImage2D, CopyTexImage2D,
WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dint, WGC3Dint,
WGC3Dsizei, WGC3Dsizei, WGC3Dint)
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
index f8fbb4b3..9a65ae9 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h
@@ -112,6 +112,23 @@ class WebGraphicsContext3DInProcessCommandBufferImpl
WGC3Dboolean blue, WGC3Dboolean alpha);
virtual void compileShader(WebGLId shader);
+ virtual void compressedTexImage2D(WGC3Denum target,
+ WGC3Dint level,
+ WGC3Denum internalformat,
+ WGC3Dsizei width,
+ WGC3Dsizei height,
+ WGC3Dint border,
+ WGC3Dsizei imageSize,
+ const void* data);
+ virtual void compressedTexSubImage2D(WGC3Denum target,
+ WGC3Dint level,
+ WGC3Dint xoffset,
+ WGC3Dint yoffset,
+ WGC3Dsizei width,
+ WGC3Dsizei height,
+ WGC3Denum format,
+ WGC3Dsizei imageSize,
+ const void* data);
virtual void copyTexImage2D(WGC3Denum target,
WGC3Dint level,
WGC3Denum internalformat,
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
index 7723305..835bd61 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
@@ -924,6 +924,14 @@ void WebGraphicsContext3DInProcessImpl::compileShader(WebGLId shader) {
#endif
}
+DELEGATE_TO_GL_8(compressedTexImage2D, CompressedTexImage2D,
+ WGC3Denum, WGC3Dint, WGC3Denum, WGC3Dint, WGC3Dint,
+ WGC3Dsizei, WGC3Dsizei, const void*)
+
+DELEGATE_TO_GL_9(compressedTexSubImage2D, CompressedTexSubImage2D,
+ WGC3Denum, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint, WGC3Dint,
+ WGC3Denum, WGC3Dsizei, const void*)
+
void WebGraphicsContext3DInProcessImpl::copyTexImage2D(
WGC3Denum target, WGC3Dint level, WGC3Denum internalformat, WGC3Dint x,
WGC3Dint y, WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border) {
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
index 0817e4a..ac23af4 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h
@@ -149,6 +149,25 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D {
WGC3Dboolean blue, WGC3Dboolean alpha);
virtual void compileShader(WebGLId shader);
+ virtual void compressedTexImage2D(
+ WGC3Denum target,
+ WGC3Dint level,
+ WGC3Denum internalformat,
+ WGC3Dsizei width,
+ WGC3Dsizei height,
+ WGC3Dint border,
+ WGC3Dsizei imageSize,
+ const void* data);
+ virtual void compressedTexSubImage2D(
+ WGC3Denum target,
+ WGC3Dint level,
+ WGC3Dint xoffset,
+ WGC3Dint yoffset,
+ WGC3Dsizei width,
+ WGC3Dsizei height,
+ WGC3Denum format,
+ WGC3Dsizei imageSize,
+ const void* data);
virtual void copyTexImage2D(
WGC3Denum target,
WGC3Dint level,