diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 18:15:39 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-21 18:15:39 +0000 |
| commit | 380aba8992ae92cd78486b0672ef748912032cf5 (patch) | |
| tree | 7bcf50b03a86cb63ece414c707811773081c4150 /gpu | |
| parent | a51cff0800e9dc0d956129cf5f7c9e9668075188 (diff) | |
| download | chromium_src-380aba8992ae92cd78486b0672ef748912032cf5.zip chromium_src-380aba8992ae92cd78486b0672ef748912032cf5.tar.gz chromium_src-380aba8992ae92cd78486b0672ef748912032cf5.tar.bz2 | |
Fixes issues where WGC3D based on OSMesa GL implementation isn't allowing OES extensions that are supported.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/7980034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 4936e7a..1e1a86c 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -232,8 +232,7 @@ void FeatureInfo::AddFeatures(const char* desired_features) { } if (ext.Desire("GL_OES_rgb8_rgba8")) { - if (ext.Have("GL_OES_rgb8_rgba8") || - gfx::GetGLImplementation() == gfx::kGLImplementationDesktopGL) { + if (ext.Have("GL_OES_rgb8_rgba8") || gfx::HasDesktopGLFeatures()) { AddExtensionString("GL_OES_rgb8_rgba8"); validators_.render_buffer_format.AddValue(GL_RGB8_OES); validators_.render_buffer_format.AddValue(GL_RGBA8_OES); @@ -316,14 +315,13 @@ void FeatureInfo::AddFeatures(const char* desired_features) { } if (ext.HaveAndDesire("GL_OES_depth24") || - (gfx::GetGLImplementation() == gfx::kGLImplementationDesktopGL && - ext.Desire("GL_OES_depth24"))) { + (gfx::HasDesktopGLFeatures() && ext.Desire("GL_OES_depth24"))) { AddExtensionString("GL_OES_depth24"); validators_.render_buffer_format.AddValue(GL_DEPTH_COMPONENT24); } if (ext.HaveAndDesire("GL_OES_standard_derivatives") || - (gfx::GetGLImplementation() == gfx::kGLImplementationDesktopGL && + (gfx::HasDesktopGLFeatures() && ext.Desire("GL_OES_standard_derivatives"))) { AddExtensionString("GL_OES_standard_derivatives"); feature_flags_.oes_standard_derivatives = true; |