summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/service/program_manager_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gpu/command_buffer/service/program_manager_unittest.cc')
-rw-r--r--gpu/command_buffer/service/program_manager_unittest.cc44
1 files changed, 28 insertions, 16 deletions
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index 46ba708..94bce93 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -35,6 +35,10 @@ using ::testing::StrictMock;
namespace gpu {
namespace gles2 {
+namespace {
+void ShaderCacheCb(const std::string& key, const std::string& shader) {}
+} // namespace
+
class ProgramManagerTest : public testing::Test {
public:
ProgramManagerTest() : manager_(NULL) { }
@@ -219,7 +223,7 @@ class ProgramManagerWithShaderTest : public testing::Test {
program_->AttachShader(&shader_manager_, vertex_shader);
program_->AttachShader(&shader_manager_, fragment_shader);
- program_->Link(NULL, NULL, NULL, NULL);
+ program_->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb));
}
void SetupShader(AttribInfo* attribs, size_t num_attribs,
@@ -252,7 +256,7 @@ class ProgramManagerWithShaderTest : public testing::Test {
SetupShader(kAttribs, kNumAttribs, kUniforms, kNumUniforms,
service_id);
}
- program->Link(NULL, NULL, NULL, NULL);
+ 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);
@@ -579,7 +583,7 @@ TEST_F(ProgramManagerWithShaderTest, GLDriverReturnsGLUnderscoreUniform) {
ASSERT_TRUE(program != NULL);
EXPECT_TRUE(program->AttachShader(&shader_manager_, vshader));
EXPECT_TRUE(program->AttachShader(&shader_manager_, fshader));
- program->Link(NULL, NULL, NULL, NULL);
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb));
GLint value = 0;
program->GetProgramiv(GL_ACTIVE_ATTRIBUTES, &value);
EXPECT_EQ(3, value);
@@ -647,7 +651,7 @@ TEST_F(ProgramManagerWithShaderTest, SimilarArrayNames) {
ASSERT_TRUE(program != NULL);
EXPECT_TRUE(program->AttachShader(&shader_manager_, vshader));
EXPECT_TRUE(program->AttachShader(&shader_manager_, fshader));
- program->Link(NULL, NULL, NULL, NULL);
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb));
// Check that we get the correct locations.
EXPECT_EQ(kUniform2FakeLocation,
@@ -736,10 +740,10 @@ TEST_F(ProgramManagerWithShaderTest, GLDriverReturnsWrongTypeInfo) {
kServiceProgramId);
Program* program = manager_.CreateProgram(
kClientProgramId, kServiceProgramId);
- ASSERT_TRUE(program != NULL);
+ ASSERT_TRUE(program!= NULL);
EXPECT_TRUE(program->AttachShader(&shader_manager_, vshader));
EXPECT_TRUE(program->AttachShader(&shader_manager_, fshader));
- program->Link(NULL, NULL, NULL, NULL);
+ 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) {
@@ -1058,7 +1062,7 @@ TEST_F(ProgramManagerWithShaderTest, ClearWithSamplerTypes) {
const size_t kNumUniforms = arraysize(kUniforms);
SetupShader(kAttribs, kNumAttribs, kUniforms, kNumUniforms,
kServiceProgramId);
- program->Link(NULL, NULL, NULL, NULL);
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb));
SetupExpectationsForClearingUniforms(kUniforms, kNumUniforms);
manager_.ClearUniforms(program);
}
@@ -1130,7 +1134,7 @@ TEST_F(ProgramManagerWithShaderTest, BindUniformLocation) {
const size_t kNumUniforms = arraysize(kUniforms);
SetupShader(kAttribs, kNumAttribs, kUniforms, kNumUniforms,
kServiceProgramId);
- program->Link(NULL, NULL, NULL, NULL);
+ program->Link(NULL, NULL, NULL, NULL, base::Bind(&ShaderCacheCb));
EXPECT_EQ(kUniform1DesiredLocation,
program->GetUniformFakeLocation(kUniform1Name));
@@ -1223,7 +1227,8 @@ class ProgramManagerWithCacheTest : public testing::Test {
program->service_id(),
vertex_shader,
fragment_shader,
- &program->bind_attrib_location_map())).Times(1);
+ &program->bind_attrib_location_map(),
+ _)).Times(1);
}
void SetExpectationsForNotCachingProgram() {
@@ -1240,7 +1245,8 @@ class ProgramManagerWithCacheTest : public testing::Test {
program->service_id(),
vertex_shader,
fragment_shader,
- &program->bind_attrib_location_map())).Times(0);
+ &program->bind_attrib_location_map(),
+ _)).Times(0);
}
void SetExpectationsForProgramLoad(ProgramCache::ProgramLoadResult result) {
@@ -1375,7 +1381,8 @@ TEST_F(ProgramManagerWithCacheTest, CacheProgramOnSuccessfulLink) {
SetShadersCompiled();
SetExpectationsForProgramLink();
SetExpectationsForProgramCached();
- EXPECT_TRUE(program_->Link(NULL, NULL, NULL, NULL));
+ EXPECT_TRUE(program_->Link(NULL, NULL, NULL, NULL,
+ base::Bind(&ShaderCacheCb)));
}
TEST_F(ProgramManagerWithCacheTest, CompileShaderOnLinkCacheMiss) {
@@ -1387,7 +1394,8 @@ TEST_F(ProgramManagerWithCacheTest, CompileShaderOnLinkCacheMiss) {
SetExpectationsForSuccessCompile(vertex_shader_);
SetExpectationsForProgramLink();
SetExpectationsForProgramCached();
- EXPECT_TRUE(program_->Link(&shader_manager_, NULL, NULL, info.get()));
+ EXPECT_TRUE(program_->Link(&shader_manager_, NULL, NULL,
+ info.get(), base::Bind(&ShaderCacheCb)));
}
TEST_F(ProgramManagerWithCacheTest, LoadProgramOnProgramCacheHit) {
@@ -1400,7 +1408,8 @@ TEST_F(ProgramManagerWithCacheTest, LoadProgramOnProgramCacheHit) {
SetExpectationsForNotCachingProgram();
SetExpectationsForProgramLoadSuccess();
- EXPECT_TRUE(program_->Link(NULL, NULL, NULL, NULL));
+ EXPECT_TRUE(program_->Link(NULL, NULL, NULL, NULL,
+ base::Bind(&ShaderCacheCb)));
}
TEST_F(ProgramManagerWithCacheTest, CompileAndLinkOnProgramCacheError) {
@@ -1414,7 +1423,8 @@ TEST_F(ProgramManagerWithCacheTest, CompileAndLinkOnProgramCacheError) {
SetExpectationsForProgramCached();
scoped_refptr<FeatureInfo> info(new FeatureInfo());
- EXPECT_TRUE(program_->Link(&shader_manager_, NULL, NULL, info.get()));
+ EXPECT_TRUE(program_->Link(&shader_manager_, NULL, NULL, info.get(),
+ base::Bind(&ShaderCacheCb)));
}
TEST_F(ProgramManagerWithCacheTest, CorrectCompileOnSourceChangeNoCompile) {
@@ -1467,7 +1477,8 @@ TEST_F(ProgramManagerWithCacheTest, CorrectCompileOnSourceChangeNoCompile) {
SetExpectationsForProgramLoadSuccess(kNewProgramServiceId);
scoped_refptr<FeatureInfo> info(new FeatureInfo());
- EXPECT_TRUE(program->Link(&shader_manager_, NULL, NULL, info.get()));
+ EXPECT_TRUE(program->Link(&shader_manager_, NULL, NULL, info.get(),
+ base::Bind(&ShaderCacheCb)));
}
TEST_F(ProgramManagerWithCacheTest, CorrectCompileOnSourceChangeWithCompile) {
@@ -1518,7 +1529,8 @@ TEST_F(ProgramManagerWithCacheTest, CorrectCompileOnSourceChangeWithCompile) {
fragment_shader_);
SetExpectationsForProgramLink(kNewProgramServiceId);
- EXPECT_TRUE(program->Link(&shader_manager_, NULL, NULL, info.get()));
+ EXPECT_TRUE(program->Link(&shader_manager_, NULL, NULL,
+ info.get(), base::Bind(&ShaderCacheCb)));
}
} // namespace gles2
generated by cgit v1.1 at 2025-02-19 11:23:00 +0000