diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 12:13:08 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 12:13:08 +0000 |
| commit | 25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c (patch) | |
| tree | 231cbf5a41324ba641db9c7af4913bf416c897e2 /gpu | |
| parent | 7d0cce0355811619fb78e00a1aaf0d04b103c98a (diff) | |
| download | chromium_src-25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.zip chromium_src-25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.tar.gz chromium_src-25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.tar.bz2 | |
Revert 164047 - Make GL calls go through subclassable class.
Sheriff reverting as this CL added four static initializers.
BUG=155557
Review URL: https://chromiumcodereview.appspot.com/11266023
TBR=gman@chromium.org
Review URL: https://codereview.chromium.org/11270035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/program_manager.cc | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/service/program_manager_unittest.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc index dcc6745..e86912e 100644 --- a/gpu/command_buffer/service/program_manager.cc +++ b/gpu/command_buffer/service/program_manager.cc @@ -531,7 +531,7 @@ bool ProgramManager::ProgramInfo::Link(ShaderManager* manager, if (link) { before_time = TimeTicks::HighResNow(); - if (cache && gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary) { + if (cache && gfx::g_GL_ARB_get_program_binary) { glProgramParameteri(service_id(), PROGRAM_BINARY_RETRIEVABLE_HINT, GL_TRUE); diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc index 8499ff3..227a81f 100644 --- a/gpu/command_buffer/service/program_manager_unittest.cc +++ b/gpu/command_buffer/service/program_manager_unittest.cc @@ -1287,7 +1287,7 @@ class ProgramManagerWithCacheTest : public testing::Test { void SetExpectationsForProgramLink(GLuint service_program_id) { TestHelper::SetupShader(gl_.get(), NULL, 0, NULL, 0, service_program_id); - if (gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary) { + if (gfx::g_GL_ARB_get_program_binary) { EXPECT_CALL(*gl_.get(), ProgramParameteri(service_program_id, PROGRAM_BINARY_RETRIEVABLE_HINT, |