summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 11:21:15 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 11:21:15 +0000
commitb9e5528626e8e942c994cfce5ce7f94a894b5151 (patch)
treed0cdf1e69e9f548b4ccd6165d191f1d295eb6039 /gpu
parent3390faaa8412d9f1382c2d06f9e332a674cf908c (diff)
downloadchromium_src-b9e5528626e8e942c994cfce5ce7f94a894b5151.zip
chromium_src-b9e5528626e8e942c994cfce5ce7f94a894b5151.tar.gz
chromium_src-b9e5528626e8e942c994cfce5ce7f94a894b5151.tar.bz2
Make GL calls go through subclassable class.
This is a step to virtualizing GL BUG=155557 Review URL: https://chromiumcodereview.appspot.com/11266023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/program_manager.cc2
-rw-r--r--gpu/command_buffer/service/program_manager_unittest.cc2
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,