diff options
| -rw-r--r-- | chrome/renderer/webgraphicscontext3d_command_buffer_impl.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/webgraphicscontext3d_command_buffer_impl.h | 5 | ||||
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 4 |
3 files changed, 9 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); diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 3edb49e..00fed83 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -95,6 +95,10 @@ void FeatureInfo::AddFeatures(const char* desired_features) { AddExtensionString("GL_CHROMIUM_map_sub"); } + if (ext.Desire("GL_CHROMIUM_copy_texture_to_parent_texture")) { + AddExtensionString("GL_CHROMIUM_copy_texture_to_parent_texture"); + } + // Only turn this feature on if it is requested. Not by default. if (desired_features && ext.Desire("GL_CHROMIUM_strict_attribs")) { AddExtensionString("GL_CHROMIUM_strict_attribs"); |