diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 17:21:38 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-25 17:21:38 +0000 |
| commit | b97c908631bf84857264bf9b61433aebed0d0256 (patch) | |
| tree | 0b9b078768db8e47a716dc2d609e72d1ca992d11 /gpu | |
| parent | 5bcd97cb25b1d8a8f9ec9d190ef762607b81721f (diff) | |
| download | chromium_src-b97c908631bf84857264bf9b61433aebed0d0256.zip chromium_src-b97c908631bf84857264bf9b61433aebed0d0256.tar.gz chromium_src-b97c908631bf84857264bf9b61433aebed0d0256.tar.bz2 | |
Revert "Revert 164047 - Make GL calls go through subclassable class."
This reverts commit 25afcfe213ffd88f8e9370d4ff1ee23ecf9ae16c.
BUG=155557
TBR=apatrick@chromium.org
Review URL: https://codereview.chromium.org/11264041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164095 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 e86912e..dcc6745 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_GL_ARB_get_program_binary) { + if (cache && gfx::g_driver_gl.ext.b_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 227a81f..8499ff3 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_GL_ARB_get_program_binary) { + if (gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary) { EXPECT_CALL(*gl_.get(), ProgramParameteri(service_program_id, PROGRAM_BINARY_RETRIEVABLE_HINT, |