diff options
| author | marcheu <marcheu@chromium.org> | 2015-04-03 18:42:53 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-04 01:43:21 +0000 |
| commit | 1856f5d5e47d72742a12153f4e85ee0db00c11a0 (patch) | |
| tree | 5eed80f80d333ee055fd31c515bb3639bf8238d3 /gpu/config/gpu_info_collector.cc | |
| parent | 022b19cb4b2f4e7a0f56ad92198b050b76e4415f (diff) | |
| download | chromium_src-1856f5d5e47d72742a12153f4e85ee0db00c11a0.zip chromium_src-1856f5d5e47d72742a12153f4e85ee0db00c11a0.tar.gz chromium_src-1856f5d5e47d72742a12153f4e85ee0db00c11a0.tar.bz2 | |
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}
Diffstat (limited to 'gpu/config/gpu_info_collector.cc')
| -rw-r--r-- | gpu/config/gpu_info_collector.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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); |