diff options
| author | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 16:58:38 +0000 |
|---|---|---|
| committer | zmo@chromium.org <zmo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 16:58:38 +0000 |
| commit | 959e907e7781490c609ca9af7c9429e55debab19 (patch) | |
| tree | 49ae88fff63a828ef11bbe1298ddda2939a8adf3 /gpu | |
| parent | 4e993e158f2f1facba16d3bd87dc56a6b9a4efb2 (diff) | |
| download | chromium_src-959e907e7781490c609ca9af7c9429e55debab19.zip chromium_src-959e907e7781490c609ca9af7c9429e55debab19.tar.gz chromium_src-959e907e7781490c609ca9af7c9429e55debab19.tar.bz2 | |
Expose real VENDOR/RENDERER strings for WEBGL_debug_renderer_info.
Currently we always return "chromium" for both, which is against
the purpose of this extension.
BUG=294922
TEST=manual
R=bajones@chromium.org, kbr@chromium.org
Review URL: https://codereview.chromium.org/24244006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224405 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 016fa4b..63facc9 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -7313,8 +7313,7 @@ error::Error GLES2DecoderImpl::HandleGetString( LOCAL_SET_GL_ERROR_INVALID_ENUM("glGetString", name, "name"); return error::kNoError; } - const char* gl_str = reinterpret_cast<const char*>(glGetString(name)); - const char* str = NULL; + const char* str = reinterpret_cast<const char*>(glGetString(name)); std::string extensions; switch (name) { case GL_VERSION: @@ -7324,10 +7323,11 @@ error::Error GLES2DecoderImpl::HandleGetString( str = "OpenGL ES GLSL ES 1.0 Chromium"; break; case GL_RENDERER: - str = "Chromium"; - break; case GL_VENDOR: - str = "Chromium"; + // Return the unmasked VENDOR/RENDERER string for WebGL contexts. + // They are used by WEBGL_debug_renderer_info. + if (!force_webgl_glsl_validation_) + str = "Chromium"; break; case GL_EXTENSIONS: { @@ -7366,7 +7366,6 @@ error::Error GLES2DecoderImpl::HandleGetString( } break; default: - str = gl_str; break; } Bucket* bucket = CreateBucket(c.bucket_id); |