summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/memory_program_cache_unittest.cc
diff options
context:
space:
mode:
authoroetuaho@nvidia.com <oetuaho@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-25 07:26:48 +0000
committeroetuaho@nvidia.com <oetuaho@nvidia.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-25 07:26:48 +0000
commit0018b5f6db27abc346d9ac03990f81d9c87dd781 (patch)
tree2ebf2f0fcd3555e0168573f522878b8e4d5e5a37 /gpu/command_buffer/service/memory_program_cache_unittest.cc
parent4177937ad5704b340671d7d2fb494e1ec7448410 (diff)
downloadchromium_src-0018b5f6db27abc346d9ac03990f81d9c87dd781.zip
chromium_src-0018b5f6db27abc346d9ac03990f81d9c87dd781.tar.gz
chromium_src-0018b5f6db27abc346d9ac03990f81d9c87dd781.tar.bz2
Encapsulate functionality of the mock GL interface to MockGLInterface
Previously, the mock GL interface was split into two classes, GLInterface and MockGLInterface, and related functionality existed also outside these classes. Grouping the functionality under MockGLInterface and removing the ability to read the static GLInterface* from outside makes this part of the code more self-contained and easier to understand. The comment explaining the role of MockGLInterface is also fixed: the interface is not the desktop GL interface, but rather an union of different GL interfaces. Also clean up unused autogenerated egl/glx/osmesa/wgl headers. Only the gl interface header is currently being used for mocking. The commit doesn't introduce functional changes, but only refactors existing functionality. BUG=none TEST=gpu_unittests Review URL: https://codereview.chromium.org/132823009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/memory_program_cache_unittest.cc')
-rw-r--r--gpu/command_buffer/service/memory_program_cache_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/memory_program_cache_unittest.cc b/gpu/command_buffer/service/memory_program_cache_unittest.cc
index 6c6b099..6104534 100644
--- a/gpu/command_buffer/service/memory_program_cache_unittest.cc
+++ b/gpu/command_buffer/service/memory_program_cache_unittest.cc
@@ -93,7 +93,7 @@ class MemoryProgramCacheTest : public testing::Test {
protected:
virtual void SetUp() {
gl_.reset(new ::testing::StrictMock<gfx::MockGLInterface>());
- ::gfx::GLInterface::SetGLInterface(gl_.get());
+ ::gfx::MockGLInterface::SetGLInterface(gl_.get());
vertex_shader_ = shader_manager_.CreateShader(kVertexShaderClientId,
kVertexShaderServiceId,
@@ -138,7 +138,7 @@ class MemoryProgramCacheTest : public testing::Test {
}
virtual void TearDown() {
- ::gfx::GLInterface::SetGLInterface(NULL);
+ ::gfx::MockGLInterface::SetGLInterface(NULL);
gl_.reset();
}