From 1856f5d5e47d72742a12153f4e85ee0db00c11a0 Mon Sep 17 00:00:00 2001 From: marcheu Date: Fri, 3 Apr 2015 18:42:53 -0700 Subject: Revert of Use the desktop GL core profile on Linux when ES3 support is requested. (patchset #3 id:40001 of https://codereview.chromium.org/1052153002/) Reason for revert: This causes Chrome rendering to break on some Chrome OS devices, see crbug.com/473891 for details Original issue's description: > Use the desktop GL core profile on Linux when ES3 support is requested. > > Request an OpenGL 4.2 context (the minimum version Chromium's WebGL > 2.0 prototype currently requires) on Linux when > --enable-unsafe-es3-apis is specified on the command line. > > Clean up the shader translator's selection of the GLSL output format. > > BUG=471960 > > Committed: https://crrev.com/0b17446f9591af9377d18c9ccfe50471651d6bc7 > Cr-Commit-Position: refs/heads/master@{#323658} TBR=piman@chromium.org,kbr@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=471960 Review URL: https://codereview.chromium.org/1054883004 Cr-Commit-Position: refs/heads/master@{#323866} --- gpu/config/gpu_info_collector.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gpu/config/gpu_info_collector.cc') diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc index e9d60b1..521f2cd 100644 --- a/gpu/config/gpu_info_collector.cc +++ b/gpu/config/gpu_info_collector.cc @@ -98,7 +98,7 @@ CollectInfoResult CollectGraphicsInfoGL(GPUInfo* gpu_info) { gpu_info->gl_renderer = GetGLString(GL_RENDERER); gpu_info->gl_vendor = GetGLString(GL_VENDOR); - gpu_info->gl_extensions = context->GetExtensions(); + gpu_info->gl_extensions = GetGLString(GL_EXTENSIONS); gpu_info->gl_version = GetGLString(GL_VERSION); std::string glsl_version_string = GetGLString(GL_SHADING_LANGUAGE_VERSION); -- cgit v1.1