| Index: gpu/command_buffer/service/feature_info.cc
|
| ===================================================================
|
| --- gpu/command_buffer/service/feature_info.cc (revision 102100)
|
| +++ gpu/command_buffer/service/feature_info.cc (working copy)
|
| @@ -232,8 +232,7 @@
|
| }
|
|
|
| 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 @@
|
| }
|
|
|
| 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;
|
|
|