summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 21:13:53 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-03 21:13:53 +0000
commit0daa69b89baf4369da28bfcfa3e06e3715afb9cb (patch)
tree92eaa1177a7323049784ff7e23ac99eca25bb240 /chrome/renderer
parent19de90f0acda975a59c8e1fd3be212246bc15dcc (diff)
downloadchromium_src-0daa69b89baf4369da28bfcfa3e06e3715afb9cb.zip
chromium_src-0daa69b89baf4369da28bfcfa3e06e3715afb9cb.tar.gz
chromium_src-0daa69b89baf4369da28bfcfa3e06e3715afb9cb.tar.bz2
Advertise the GL_CHROMIUM_copy_texture_to_parent_texture and
GL_CHROMIUM_map_sub extensions by default. These are needed in WebGraphicsContext3D instances in support of the accelerated 2D canvas and video rendering functionality. Associated WebKit bug is https://bugs.webkit.org/show_bug.cgi?id=46894 . Tested on Linux with this refactoring, accelerated 2D canvas, and HTML5 video. BUG=none TEST=none Review URL: http://codereview.chromium.org/4268004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc2
-rw-r--r--chrome/renderer/webgraphicscontext3d_command_buffer_impl.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
index c52360c..5246bdc 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
+++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc
@@ -57,6 +57,8 @@ WebGraphicsContext3DCommandBufferImpl::
static const char* kWebGraphicsContext3DPerferredGLExtensions =
"GL_OES_packed_depth_stencil "
"GL_OES_depth24 "
+ "GL_CHROMIUM_copy_texture_to_parent_texture "
+ "GL_CHROMIUM_map_sub "
"GL_CHROMIUM_strict_attribs "
"GL_CHROMIUM_webglsl";
diff --git a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
index b650b4f..116bced 100644
--- a/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
+++ b/chrome/renderer/webgraphicscontext3d_command_buffer_impl.h
@@ -340,9 +340,9 @@ class WebGraphicsContext3DCommandBufferImpl
virtual void deleteTexture(unsigned);
virtual void synthesizeGLError(unsigned long error);
- virtual bool supportsBGRA();
+ virtual bool supportsBGRA(); // TODO(kbr): remove
- virtual bool supportsMapSubCHROMIUM();
+ virtual bool supportsMapSubCHROMIUM(); // TODO(kbr): remove
virtual void* mapBufferSubDataCHROMIUM(
unsigned target, int offset, int size, unsigned access);
virtual void unmapBufferSubDataCHROMIUM(const void*);
@@ -358,6 +358,7 @@ class WebGraphicsContext3DCommandBufferImpl
unsigned access);
virtual void unmapTexSubImage2DCHROMIUM(const void*);
+ // TODO(kbr): remove supportsCopyTextureToParentTextureCHROMIUM
virtual bool supportsCopyTextureToParentTextureCHROMIUM();
virtual void copyTextureToParentTextureCHROMIUM(
unsigned texture, unsigned parentTexture);