Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(158)

Unified Diff: gpu/command_buffer/service/test_helper.cc

Issue 14844004: gpu: Refactor to support cross-channel shared textures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix accidentally reverted behavior Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/test_helper.h ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/test_helper.cc
diff --git a/gpu/command_buffer/service/test_helper.cc b/gpu/command_buffer/service/test_helper.cc
index 5b3f57cadbbd418836ae7877cb7e9166c16b778e..a229c687c3ba046c475b7575dd8396101ad553ad 100644
--- a/gpu/command_buffer/service/test_helper.cc
+++ b/gpu/command_buffer/service/test_helper.cc
@@ -523,11 +523,12 @@ void TestHelper::DoBufferData(
void TestHelper::SetTexParameterWithExpectations(
::gfx::MockGLInterface* gl, MockErrorState* error_state,
- TextureManager* manager, Texture* texture,
+ TextureManager* manager, TextureRef* texture_ref,
GLenum pname, GLint value, GLenum error) {
if (error == GL_NO_ERROR) {
if (pname != GL_TEXTURE_POOL_CHROMIUM) {
- EXPECT_CALL(*gl, TexParameteri(texture->target(), pname, value))
+ EXPECT_CALL(*gl, TexParameteri(texture_ref->texture()->target(),
+ pname, value))
.Times(1)
.RetiresOnSaturation();
}
@@ -540,7 +541,7 @@ void TestHelper::SetTexParameterWithExpectations(
.Times(1)
.RetiresOnSaturation();
}
- manager->SetParameter("", error_state, texture, pname, value);
+ manager->SetParameter("", error_state, texture_ref, pname, value);
}
ScopedGLImplementationSetter::ScopedGLImplementationSetter(
« no previous file with comments | « gpu/command_buffer/service/test_helper.h ('k') | gpu/command_buffer/service/texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698