diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 22:50:11 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 22:50:11 +0000 |
| commit | 35387b3b018c7190e2227064d974c361cd5d0611 (patch) | |
| tree | 0637b0799fec64b78061ef7e95f044194eff8646 /gpu | |
| parent | ce2faa3598b7339048506a195af7bef10c868616 (diff) | |
| download | chromium_src-35387b3b018c7190e2227064d974c361cd5d0611.zip chromium_src-35387b3b018c7190e2227064d974c361cd5d0611.tar.gz chromium_src-35387b3b018c7190e2227064d974c361cd5d0611.tar.bz2 | |
Remove chromium extensions obsoleted by gpu::Capabilities
Remove these extensions that do not guard any new gl functions:
GL_CHROMIUM_front_buffer_cached
GL_CHROMIUM_fast_NPOT_MO8_textures
BUG=285390
NOTRY=true
Review URL: https://codereview.chromium.org/112343010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/GLES2/gl2extchromium.h | 5 | ||||
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 3 | ||||
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 8 |
3 files changed, 1 insertions, 15 deletions
diff --git a/gpu/GLES2/gl2extchromium.h b/gpu/GLES2/gl2extchromium.h index 1b266e5..11db4b7 100644 --- a/gpu/GLES2/gl2extchromium.h +++ b/gpu/GLES2/gl2extchromium.h @@ -607,11 +607,6 @@ typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUMPROC) ( GLuint program, GLsizei bufsize, GLsizei* size, void* info); #endif /* GL_CHROMIUM_get_multiple */ -/* GL_CHROMIUM_front_buffer_cached */ -#ifndef GL_CHROMIUM_front_buffer_cached -#define GL_CHROMIUM_front_buffer_cached 1 -#endif /* GL_CHROMIUM_front_buffer_cached */ - /* GL_CHROMIUM_sync_point */ #ifndef GL_CHROMIUM_sync_point #define GL_CHROMIUM_sync_point 1 diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 32f48d33..cacc826 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -248,9 +248,6 @@ void FeatureInfo::InitializeFeatures() { AddExtensionString("GL_CHROMIUM_texture_mailbox"); AddExtensionString("GL_EXT_debug_marker"); - if (workarounds_.enable_chromium_fast_npot_mo8_textures) - AddExtensionString("GL_CHROMIUM_fast_NPOT_MO8_textures"); - feature_flags_.chromium_stream_texture = true; // OES_vertex_array_object is emulated if not present natively, diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index d76fec6..231ea24 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -2575,13 +2575,7 @@ Capabilities GLES2DecoderImpl::GetCapabilities() { caps.iosurface = true; #endif - // TODO(boliu): Expose this directly from GLSurface. - std::vector<std::string> extension_list; - base::SplitString(surface_->GetExtensions(), ' ', &extension_list); - std::set<std::string> extension_set(extension_list.begin(), - extension_list.end()); - caps.post_sub_buffer = - extension_set.count("GL_CHROMIUM_post_sub_buffer") > 0; + caps.post_sub_buffer = surface_->HasExtension("GL_CHROMIUM_post_sub_buffer"); return caps; } |