diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 06:25:16 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 06:25:16 +0000 |
| commit | 3293960bdf505b7d8249fe17a7ecbf5c81984614 (patch) | |
| tree | 7e2fe859ffacbe53e325dde9b10bc9d5ca735dfd /gpu | |
| parent | 50d87875a336e6f35437bc53f260eb8f50d151c4 (diff) | |
| download | chromium_src-3293960bdf505b7d8249fe17a7ecbf5c81984614.zip chromium_src-3293960bdf505b7d8249fe17a7ecbf5c81984614.tar.gz chromium_src-3293960bdf505b7d8249fe17a7ecbf5c81984614.tar.bz2 | |
Make GL_VENDOR and GL_RENDERER always return 'Chromium'
TEST=unit tests
BUG=127327
Review URL: https://chromiumcodereview.appspot.com/10356062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 6 | ||||
| -rw-r--r-- | gpu/command_buffer/tests/gl_unittests.cc | 15 |
2 files changed, 21 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 4b3c2c3..81719d5 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -6465,6 +6465,12 @@ error::Error GLES2DecoderImpl::HandleGetString( case GL_SHADING_LANGUAGE_VERSION: str = "OpenGL ES GLSL ES 1.0 Chromium"; break; + case GL_RENDERER: + str = "Chromium"; + break; + case GL_VENDOR: + str = "Chromium"; + break; case GL_EXTENSIONS: { // For WebGL contexts, strip out the OES derivatives extension if it has diff --git a/gpu/command_buffer/tests/gl_unittests.cc b/gpu/command_buffer/tests/gl_unittests.cc index 1a01c6a..de5e5d7 100644 --- a/gpu/command_buffer/tests/gl_unittests.cc +++ b/gpu/command_buffer/tests/gl_unittests.cc @@ -62,5 +62,20 @@ TEST_F(GLTest, SimpleShader) { EXPECT_TRUE(GLTestHelper::CheckPixels(0, 0, 1, 1, 0, expected_draw)); } +TEST_F(GLTest, GetString) { + EXPECT_STREQ( + "OpenGL ES 2.0 Chromium", + reinterpret_cast<const char*>(glGetString(GL_VERSION))); + EXPECT_STREQ( + "OpenGL ES GLSL ES 1.0 Chromium", + reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION))); + EXPECT_STREQ( + "Chromium", + reinterpret_cast<const char*>(glGetString(GL_RENDERER))); + EXPECT_STREQ( + "Chromium", + reinterpret_cast<const char*>(glGetString(GL_VENDOR))); +} + } // namespace gpu |