Index: gpu/command_buffer/service/program_manager_unittest.cc |
=================================================================== |
--- gpu/command_buffer/service/program_manager_unittest.cc (revision 250177) |
+++ gpu/command_buffer/service/program_manager_unittest.cc (working copy) |
@@ -250,7 +250,7 @@ |
program_->AttachShader(&shader_manager_, vertex_shader); |
program_->AttachShader(&shader_manager_, fragment_shader); |
- program_->Link(NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
+ program_->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
} |
void SetupShader(AttribInfo* attribs, size_t num_attribs, |
@@ -283,7 +283,7 @@ |
SetupShader(kAttribs, kNumAttribs, kUniforms, kNumUniforms, |
service_id); |
} |
- program->Link(NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
GLint link_status; |
program->GetProgramiv(GL_LINK_STATUS, &link_status); |
return (static_cast<bool>(link_status) == expected_link_status); |
@@ -720,7 +720,7 @@ |
ASSERT_TRUE(program != NULL); |
EXPECT_TRUE(program->AttachShader(&shader_manager_, vshader)); |
EXPECT_TRUE(program->AttachShader(&shader_manager_, fshader)); |
- program->Link(NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
GLint value = 0; |
program->GetProgramiv(GL_ACTIVE_ATTRIBUTES, &value); |
EXPECT_EQ(3, value); |
@@ -788,7 +788,7 @@ |
ASSERT_TRUE(program != NULL); |
EXPECT_TRUE(program->AttachShader(&shader_manager_, vshader)); |
EXPECT_TRUE(program->AttachShader(&shader_manager_, fshader)); |
- program->Link(NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
// Check that we get the correct locations. |
EXPECT_EQ(kUniform2FakeLocation, |
@@ -889,7 +889,7 @@ |
ASSERT_TRUE(program!= NULL); |
EXPECT_TRUE(program->AttachShader(&shader_manager_, vshader)); |
EXPECT_TRUE(program->AttachShader(&shader_manager_, fshader)); |
- program->Link(NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
// Check that we got the good type, not the bad. |
// Check Attribs |
for (unsigned index = 0; index < kNumAttribs; ++index) { |
@@ -1440,7 +1440,7 @@ |
const size_t kNumUniforms = arraysize(kUniforms); |
SetupShader(kAttribs, kNumAttribs, kUniforms, kNumUniforms, |
kServiceProgramId); |
- program->Link(NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
SetupExpectationsForClearingUniforms(kUniforms, kNumUniforms); |
manager_.ClearUniforms(program); |
} |
@@ -1512,7 +1512,7 @@ |
const size_t kNumUniforms = arraysize(kUniforms); |
SetupShader(kAttribs, kNumAttribs, kUniforms, kNumUniforms, |
kServiceProgramId); |
- program->Link(NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb)); |
EXPECT_EQ(kUniform1DesiredLocation, |
program->GetUniformFakeLocation(kUniform1Name)); |
@@ -1735,7 +1735,7 @@ |
SetShadersCompiled(); |
SetExpectationsForProgramLink(); |
SetExpectationsForProgramCached(); |
- EXPECT_TRUE(program_->Link(NULL, NULL, NULL, |
+ EXPECT_TRUE(program_->Link(NULL, NULL, NULL, NULL, |
base::Bind(&ShaderCacheCb))); |
} |
@@ -1749,7 +1749,7 @@ |
SetExpectationsForNotCachingProgram(); |
SetExpectationsForProgramLoadSuccess(); |
- EXPECT_TRUE(program_->Link(NULL, NULL, NULL, |
+ EXPECT_TRUE(program_->Link(NULL, NULL, NULL, NULL, |
base::Bind(&ShaderCacheCb))); |
} |