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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12326146: Refactor/Rename a bunch of GPU stuff (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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/program_manager.cc ('k') | gpu/command_buffer/service/query_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/program_manager_unittest.cc
diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc
index 6c852e12b0b432ed1c885f2f16832ce785d1535f..5c9e20fc26ecb1dafd781a4b91aa7d94a7b9f7dc 100644
--- a/gpu/command_buffer/service/program_manager_unittest.cc
+++ b/gpu/command_buffer/service/program_manager_unittest.cc
@@ -62,33 +62,33 @@ TEST_F(ProgramManagerTest, Basic) {
const GLuint kService1Id = 11;
const GLuint kClient2Id = 2;
// Check we can create program.
- manager_.CreateProgramInfo(kClient1Id, kService1Id);
+ manager_.CreateProgram(kClient1Id, kService1Id);
// Check program got created.
- ProgramManager::ProgramInfo* info1 = manager_.GetProgramInfo(kClient1Id);
+ Program* info1 = manager_.GetProgram(kClient1Id);
ASSERT_TRUE(info1 != NULL);
GLuint client_id = 0;
EXPECT_TRUE(manager_.GetClientId(info1->service_id(), &client_id));
EXPECT_EQ(kClient1Id, client_id);
// Check we get nothing for a non-existent program.
- EXPECT_TRUE(manager_.GetProgramInfo(kClient2Id) == NULL);
+ EXPECT_TRUE(manager_.GetProgram(kClient2Id) == NULL);
}
TEST_F(ProgramManagerTest, Destroy) {
const GLuint kClient1Id = 1;
const GLuint kService1Id = 11;
// Check we can create program.
- ProgramManager::ProgramInfo* info0 = manager_.CreateProgramInfo(
+ Program* info0 = manager_.CreateProgram(
kClient1Id, kService1Id);
ASSERT_TRUE(info0 != NULL);
// Check program got created.
- ProgramManager::ProgramInfo* info1 = manager_.GetProgramInfo(kClient1Id);
+ Program* info1 = manager_.GetProgram(kClient1Id);
ASSERT_EQ(info0, info1);
EXPECT_CALL(*gl_, DeleteProgram(kService1Id))
.Times(1)
.RetiresOnSaturation();
manager_.Destroy(true);
// Check the resources were released.
- info1 = manager_.GetProgramInfo(kClient1Id);
+ info1 = manager_.GetProgram(kClient1Id);
ASSERT_TRUE(info1 == NULL);
}
@@ -99,10 +99,10 @@ TEST_F(ProgramManagerTest, DeleteBug) {
const GLuint kService1Id = 11;
const GLuint kService2Id = 12;
// Check we can create program.
- ProgramManager::ProgramInfo::Ref info1(
- manager_.CreateProgramInfo(kClient1Id, kService1Id));
- ProgramManager::ProgramInfo::Ref info2(
- manager_.CreateProgramInfo(kClient2Id, kService2Id));
+ scoped_refptr<Program> info1(
+ manager_.CreateProgram(kClient1Id, kService1Id));
+ scoped_refptr<Program> info2(
+ manager_.CreateProgram(kClient2Id, kService2Id));
// Check program got created.
ASSERT_TRUE(info1);
ASSERT_TRUE(info2);
@@ -117,11 +117,11 @@ TEST_F(ProgramManagerTest, DeleteBug) {
EXPECT_FALSE(manager_.IsOwned(info2));
}
-TEST_F(ProgramManagerTest, ProgramInfo) {
+TEST_F(ProgramManagerTest, Program) {
const GLuint kClient1Id = 1;
const GLuint kService1Id = 11;
// Check we can create program.
- ProgramManager::ProgramInfo* info1 = manager_.CreateProgramInfo(
+ Program* info1 = manager_.CreateProgram(
kClient1Id, kService1Id);
ASSERT_TRUE(info1);
EXPECT_EQ(kService1Id, info1->service_id());
@@ -202,10 +202,10 @@ class ProgramManagerWithShaderTest : public testing::Test {
SetupDefaultShaderExpectations();
- ShaderManager::ShaderInfo* vertex_shader = shader_manager_.CreateShaderInfo(
+ Shader* vertex_shader = shader_manager_.CreateShader(
kVertexShaderClientId, kVertexShaderServiceId, GL_VERTEX_SHADER);
- ShaderManager::ShaderInfo* fragment_shader =
- shader_manager_.CreateShaderInfo(
+ Shader* fragment_shader =
+ shader_manager_.CreateShader(
kFragmentShaderClientId, kFragmentShaderServiceId,
GL_FRAGMENT_SHADER);
ASSERT_TRUE(vertex_shader != NULL);
@@ -213,7 +213,7 @@ class ProgramManagerWithShaderTest : public testing::Test {
vertex_shader->SetStatus(true, NULL, NULL);
fragment_shader->SetStatus(true, NULL, NULL);
- program_info_ = manager_.CreateProgramInfo(
+ program_info_ = manager_.CreateProgram(
kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info_ != NULL);
@@ -245,7 +245,7 @@ class ProgramManagerWithShaderTest : public testing::Test {
}
// Return true if link status matches expected_link_status
- bool LinkAsExpected(ProgramManager::ProgramInfo* program_info,
+ bool LinkAsExpected(Program* program_info,
bool expected_link_status) {
GLuint service_id = program_info->service_id();
if (expected_link_status) {
@@ -264,7 +264,7 @@ class ProgramManagerWithShaderTest : public testing::Test {
scoped_ptr<StrictMock<gfx::MockGLInterface> > gl_;
ProgramManager manager_;
- ProgramManager::ProgramInfo* program_info_;
+ Program* program_info_;
ShaderManager shader_manager_;
};
@@ -359,14 +359,14 @@ const char* ProgramManagerWithShaderTest::kUniform3BadName = "uniform3";
const char* ProgramManagerWithShaderTest::kUniform3GoodName = "uniform3[0]";
TEST_F(ProgramManagerWithShaderTest, GetAttribInfos) {
- const ProgramManager::ProgramInfo* program_info =
- manager_.GetProgramInfo(kClientProgramId);
+ const Program* program_info =
+ manager_.GetProgram(kClientProgramId);
ASSERT_TRUE(program_info != NULL);
- const ProgramManager::ProgramInfo::AttribInfoVector& infos =
+ const Program::AttribInfoVector& infos =
program_info->GetAttribInfos();
ASSERT_EQ(kNumAttribs, infos.size());
for (size_t ii = 0; ii < kNumAttribs; ++ii) {
- const ProgramManager::ProgramInfo::VertexAttribInfo& info = infos[ii];
+ const Program::VertexAttrib& info = infos[ii];
const AttribInfo& expected = kAttribs[ii];
EXPECT_EQ(expected.size, info.size);
EXPECT_EQ(expected.type, info.type);
@@ -378,10 +378,10 @@ TEST_F(ProgramManagerWithShaderTest, GetAttribInfos) {
TEST_F(ProgramManagerWithShaderTest, GetAttribInfo) {
const GLint kValidIndex = 1;
const GLint kInvalidIndex = 1000;
- const ProgramManager::ProgramInfo* program_info =
- manager_.GetProgramInfo(kClientProgramId);
+ const Program* program_info =
+ manager_.GetProgram(kClientProgramId);
ASSERT_TRUE(program_info != NULL);
- const ProgramManager::ProgramInfo::VertexAttribInfo* info =
+ const Program::VertexAttrib* info =
program_info->GetAttribInfo(kValidIndex);
ASSERT_TRUE(info != NULL);
EXPECT_EQ(kAttrib2Size, info->size);
@@ -393,8 +393,8 @@ TEST_F(ProgramManagerWithShaderTest, GetAttribInfo) {
TEST_F(ProgramManagerWithShaderTest, GetAttribLocation) {
const char* kInvalidName = "foo";
- const ProgramManager::ProgramInfo* program_info =
- manager_.GetProgramInfo(kClientProgramId);
+ const Program* program_info =
+ manager_.GetProgram(kClientProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_EQ(kAttrib2Location, program_info->GetAttribLocation(kAttrib2Name));
EXPECT_EQ(-1, program_info->GetAttribLocation(kInvalidName));
@@ -402,10 +402,10 @@ TEST_F(ProgramManagerWithShaderTest, GetAttribLocation) {
TEST_F(ProgramManagerWithShaderTest, GetUniformInfo) {
const GLint kInvalidIndex = 1000;
- const ProgramManager::ProgramInfo* program_info =
- manager_.GetProgramInfo(kClientProgramId);
+ const Program* program_info =
+ manager_.GetProgram(kClientProgramId);
ASSERT_TRUE(program_info != NULL);
- const ProgramManager::ProgramInfo::UniformInfo* info =
+ const Program::UniformInfo* info =
program_info->GetUniformInfo(0);
ASSERT_TRUE(info != NULL);
EXPECT_EQ(kUniform1Size, info->size);
@@ -432,7 +432,7 @@ TEST_F(ProgramManagerWithShaderTest, GetUniformInfo) {
TEST_F(ProgramManagerWithShaderTest, AttachDetachShader) {
static const GLuint kClientProgramId = 124;
static const GLuint kServiceProgramId = 457;
- ProgramManager::ProgramInfo* program_info = manager_.CreateProgramInfo(
+ Program* program_info = manager_.CreateProgram(
kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_FALSE(program_info->CanLink());
@@ -440,11 +440,11 @@ TEST_F(ProgramManagerWithShaderTest, AttachDetachShader) {
const GLuint kFShaderClientId = 2002;
const GLuint kVShaderServiceId = 3001;
const GLuint kFShaderServiceId = 3002;
- ShaderManager::ShaderInfo* vshader = shader_manager_.CreateShaderInfo(
+ Shader* vshader = shader_manager_.CreateShader(
kVShaderClientId, kVShaderServiceId, GL_VERTEX_SHADER);
ASSERT_TRUE(vshader != NULL);
vshader->SetStatus(true, "", NULL);
- ShaderManager::ShaderInfo* fshader = shader_manager_.CreateShaderInfo(
+ Shader* fshader = shader_manager_.CreateShader(
kFShaderClientId, kFShaderServiceId, GL_FRAGMENT_SHADER);
ASSERT_TRUE(fshader != NULL);
fshader->SetStatus(true, "", NULL);
@@ -475,8 +475,8 @@ TEST_F(ProgramManagerWithShaderTest, AttachDetachShader) {
}
TEST_F(ProgramManagerWithShaderTest, GetUniformFakeLocation) {
- const ProgramManager::ProgramInfo* program_info =
- manager_.GetProgramInfo(kClientProgramId);
+ const Program* program_info =
+ manager_.GetProgram(kClientProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_EQ(kUniform1FakeLocation,
program_info->GetUniformFakeLocation(kUniform1Name));
@@ -505,9 +505,9 @@ TEST_F(ProgramManagerWithShaderTest, GetUniformFakeLocation) {
TEST_F(ProgramManagerWithShaderTest, GetUniformInfoByFakeLocation) {
const GLint kInvalidLocation = 1234;
- const ProgramManager::ProgramInfo::UniformInfo* info;
- const ProgramManager::ProgramInfo* program_info =
- manager_.GetProgramInfo(kClientProgramId);
+ const Program::UniformInfo* info;
+ const Program* program_info =
+ manager_.GetProgram(kClientProgramId);
GLint real_location = -1;
GLint array_index = -1;
ASSERT_TRUE(program_info != NULL);
@@ -572,16 +572,16 @@ TEST_F(ProgramManagerWithShaderTest, GLDriverReturnsGLUnderscoreUniform) {
const GLuint kFShaderServiceId = 3002;
SetupShader(
kAttribs, kNumAttribs, kUniforms, kNumUniforms, kServiceProgramId);
- ShaderManager::ShaderInfo* vshader = shader_manager_.CreateShaderInfo(
+ Shader* vshader = shader_manager_.CreateShader(
kVShaderClientId, kVShaderServiceId, GL_VERTEX_SHADER);
ASSERT_TRUE(vshader != NULL);
vshader->SetStatus(true, "", NULL);
- ShaderManager::ShaderInfo* fshader = shader_manager_.CreateShaderInfo(
+ Shader* fshader = shader_manager_.CreateShader(
kFShaderClientId, kFShaderServiceId, GL_FRAGMENT_SHADER);
ASSERT_TRUE(fshader != NULL);
fshader->SetStatus(true, "", NULL);
- ProgramManager::ProgramInfo* program_info =
- manager_.CreateProgramInfo(kClientProgramId, kServiceProgramId);
+ Program* program_info =
+ manager_.CreateProgram(kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_TRUE(program_info->AttachShader(&shader_manager_, vshader));
EXPECT_TRUE(program_info->AttachShader(&shader_manager_, fshader));
@@ -640,16 +640,16 @@ TEST_F(ProgramManagerWithShaderTest, SimilarArrayNames) {
const GLuint kFShaderServiceId = 3002;
SetupShader(
kAttribs, kNumAttribs, kUniforms, kNumUniforms, kServiceProgramId);
- ShaderManager::ShaderInfo* vshader = shader_manager_.CreateShaderInfo(
+ Shader* vshader = shader_manager_.CreateShader(
kVShaderClientId, kVShaderServiceId, GL_VERTEX_SHADER);
ASSERT_TRUE(vshader != NULL);
vshader->SetStatus(true, "", NULL);
- ShaderManager::ShaderInfo* fshader = shader_manager_.CreateShaderInfo(
+ Shader* fshader = shader_manager_.CreateShader(
kFShaderClientId, kFShaderServiceId, GL_FRAGMENT_SHADER);
ASSERT_TRUE(fshader != NULL);
fshader->SetStatus(true, "", NULL);
- ProgramManager::ProgramInfo* program_info =
- manager_.CreateProgramInfo(kClientProgramId, kServiceProgramId);
+ Program* program_info =
+ manager_.CreateProgram(kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_TRUE(program_info->AttachShader(&shader_manager_, vshader));
EXPECT_TRUE(program_info->AttachShader(&shader_manager_, fshader));
@@ -695,11 +695,11 @@ TEST_F(ProgramManagerWithShaderTest, GLDriverReturnsWrongTypeInfo) {
const GLuint kFShaderClientId = 2002;
const GLuint kVShaderServiceId = 3001;
const GLuint kFShaderServiceId = 3002;
- ShaderManager::ShaderInfo* vshader = shader_manager_.CreateShaderInfo(
+ Shader* vshader = shader_manager_.CreateShader(
kVShaderClientId, kVShaderServiceId, GL_VERTEX_SHADER);
ASSERT_TRUE(vshader != NULL);
vshader->SetStatus(true, "", &shader_translator);
- ShaderManager::ShaderInfo* fshader = shader_manager_.CreateShaderInfo(
+ Shader* fshader = shader_manager_.CreateShader(
kFShaderClientId, kFShaderServiceId, GL_FRAGMENT_SHADER);
ASSERT_TRUE(fshader != NULL);
fshader->SetStatus(true, "", &shader_translator);
@@ -740,7 +740,7 @@ TEST_F(ProgramManagerWithShaderTest, GLDriverReturnsWrongTypeInfo) {
static const GLuint kServiceProgramId = 5679;
SetupShader(kAttribs, kNumAttribs, kUniforms, kNumUniforms,
kServiceProgramId);
- ProgramManager::ProgramInfo* program_info = manager_.CreateProgramInfo(
+ Program* program_info = manager_.CreateProgram(
kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_TRUE(program_info->AttachShader(&shader_manager_, vshader));
@@ -749,7 +749,7 @@ TEST_F(ProgramManagerWithShaderTest, GLDriverReturnsWrongTypeInfo) {
// Check that we got the good type, not the bad.
// Check Attribs
for (unsigned index = 0; index < kNumAttribs; ++index) {
- const ProgramManager::ProgramInfo::VertexAttribInfo* attrib_info =
+ const Program::VertexAttrib* attrib_info =
program_info->GetAttribInfo(index);
ASSERT_TRUE(attrib_info != NULL);
ShaderTranslator::VariableMap::const_iterator it = attrib_map.find(
@@ -762,7 +762,7 @@ TEST_F(ProgramManagerWithShaderTest, GLDriverReturnsWrongTypeInfo) {
}
// Check Uniforms
for (unsigned index = 0; index < kNumUniforms; ++index) {
- const ProgramManager::ProgramInfo::UniformInfo* uniform_info =
+ const Program::UniformInfo* uniform_info =
program_info->GetUniformInfo(index);
ASSERT_TRUE(uniform_info != NULL);
ShaderTranslator::VariableMap::const_iterator it = uniform_map.find(
@@ -778,7 +778,7 @@ TEST_F(ProgramManagerWithShaderTest, GLDriverReturnsWrongTypeInfo) {
TEST_F(ProgramManagerWithShaderTest, ProgramInfoUseCount) {
static const GLuint kClientProgramId = 124;
static const GLuint kServiceProgramId = 457;
- ProgramManager::ProgramInfo* program_info = manager_.CreateProgramInfo(
+ Program* program_info = manager_.CreateProgram(
kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_FALSE(program_info->CanLink());
@@ -786,11 +786,11 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoUseCount) {
const GLuint kFShaderClientId = 2002;
const GLuint kVShaderServiceId = 3001;
const GLuint kFShaderServiceId = 3002;
- ShaderManager::ShaderInfo* vshader = shader_manager_.CreateShaderInfo(
+ Shader* vshader = shader_manager_.CreateShader(
kVShaderClientId, kVShaderServiceId, GL_VERTEX_SHADER);
ASSERT_TRUE(vshader != NULL);
vshader->SetStatus(true, "", NULL);
- ShaderManager::ShaderInfo* fshader = shader_manager_.CreateShaderInfo(
+ Shader* fshader = shader_manager_.CreateShader(
kFShaderClientId, kFShaderServiceId, GL_FRAGMENT_SHADER);
ASSERT_TRUE(fshader != NULL);
fshader->SetStatus(true, "", NULL);
@@ -809,8 +809,8 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoUseCount) {
EXPECT_TRUE(program_info->InUse());
manager_.MarkAsDeleted(&shader_manager_, program_info);
EXPECT_TRUE(program_info->IsDeleted());
- ProgramManager::ProgramInfo* info2 =
- manager_.GetProgramInfo(kClientProgramId);
+ Program* info2 =
+ manager_.GetProgram(kClientProgramId);
EXPECT_EQ(program_info, info2);
manager_.UnuseProgram(&shader_manager_, program_info);
EXPECT_TRUE(program_info->InUse());
@@ -819,7 +819,7 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoUseCount) {
.Times(1)
.RetiresOnSaturation();
manager_.UnuseProgram(&shader_manager_, program_info);
- info2 = manager_.GetProgramInfo(kClientProgramId);
+ info2 = manager_.GetProgram(kClientProgramId);
EXPECT_TRUE(info2 == NULL);
EXPECT_FALSE(vshader->InUse());
EXPECT_FALSE(fshader->InUse());
@@ -828,7 +828,7 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoUseCount) {
TEST_F(ProgramManagerWithShaderTest, ProgramInfoUseCount2) {
static const GLuint kClientProgramId = 124;
static const GLuint kServiceProgramId = 457;
- ProgramManager::ProgramInfo* program_info = manager_.CreateProgramInfo(
+ Program* program_info = manager_.CreateProgram(
kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_FALSE(program_info->CanLink());
@@ -836,11 +836,11 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoUseCount2) {
const GLuint kFShaderClientId = 2002;
const GLuint kVShaderServiceId = 3001;
const GLuint kFShaderServiceId = 3002;
- ShaderManager::ShaderInfo* vshader = shader_manager_.CreateShaderInfo(
+ Shader* vshader = shader_manager_.CreateShader(
kVShaderClientId, kVShaderServiceId, GL_VERTEX_SHADER);
ASSERT_TRUE(vshader != NULL);
vshader->SetStatus(true, "", NULL);
- ShaderManager::ShaderInfo* fshader = shader_manager_.CreateShaderInfo(
+ Shader* fshader = shader_manager_.CreateShader(
kFShaderClientId, kFShaderServiceId, GL_FRAGMENT_SHADER);
ASSERT_TRUE(fshader != NULL);
fshader->SetStatus(true, "", NULL);
@@ -861,15 +861,15 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoUseCount2) {
EXPECT_TRUE(program_info->InUse());
manager_.UnuseProgram(&shader_manager_, program_info);
EXPECT_FALSE(program_info->InUse());
- ProgramManager::ProgramInfo* info2 =
- manager_.GetProgramInfo(kClientProgramId);
+ Program* info2 =
+ manager_.GetProgram(kClientProgramId);
EXPECT_EQ(program_info, info2);
// this should delete the program.
EXPECT_CALL(*gl_, DeleteProgram(kServiceProgramId))
.Times(1)
.RetiresOnSaturation();
manager_.MarkAsDeleted(&shader_manager_, program_info);
- info2 = manager_.GetProgramInfo(kClientProgramId);
+ info2 = manager_.GetProgram(kClientProgramId);
EXPECT_TRUE(info2 == NULL);
EXPECT_FALSE(vshader->InUse());
EXPECT_FALSE(fshader->InUse());
@@ -877,10 +877,10 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoUseCount2) {
TEST_F(ProgramManagerWithShaderTest, ProgramInfoGetProgramInfo) {
CommonDecoder::Bucket bucket;
- const ProgramManager::ProgramInfo* program_info =
- manager_.GetProgramInfo(kClientProgramId);
+ const Program* program_info =
+ manager_.GetProgram(kClientProgramId);
ASSERT_TRUE(program_info != NULL);
- program_info->GetProgramInfo(&manager_, &bucket);
+ program_info->GetProgram(&manager_, &bucket);
ProgramInfoHeader* header =
bucket.GetDataAs<ProgramInfoHeader*>(0, sizeof(ProgramInfoHeader));
ASSERT_TRUE(header != NULL);
@@ -953,9 +953,9 @@ TEST_F(ProgramManagerWithShaderTest, BindAttribLocationConflicts) {
EXPECT_CALL(shader_translator, name_map())
.WillRepeatedly(ReturnRef(name_map));
// Check we can create shader.
- ShaderManager::ShaderInfo* vshader = shader_manager_.CreateShaderInfo(
+ Shader* vshader = shader_manager_.CreateShader(
kVShaderClientId, kVShaderServiceId, GL_VERTEX_SHADER);
- ShaderManager::ShaderInfo* fshader = shader_manager_.CreateShaderInfo(
+ Shader* fshader = shader_manager_.CreateShader(
kFShaderClientId, kFShaderServiceId, GL_FRAGMENT_SHADER);
// Check shader got created.
ASSERT_TRUE(vshader != NULL && fshader != NULL);
@@ -964,7 +964,7 @@ TEST_F(ProgramManagerWithShaderTest, BindAttribLocationConflicts) {
// Check attrib infos got copied.
for (ShaderTranslator::VariableMap::const_iterator it = attrib_map.begin();
it != attrib_map.end(); ++it) {
- const ShaderManager::ShaderInfo::VariableInfo* variable_info =
+ const Shader::VariableInfo* variable_info =
vshader->GetAttribInfo(it->first);
ASSERT_TRUE(variable_info != NULL);
EXPECT_EQ(it->second.type, variable_info->type);
@@ -976,8 +976,8 @@ TEST_F(ProgramManagerWithShaderTest, BindAttribLocationConflicts) {
// Set up program
const GLuint kClientProgramId = 6666;
const GLuint kServiceProgramId = 8888;
- ProgramManager::ProgramInfo* program_info =
- manager_.CreateProgramInfo(kClientProgramId, kServiceProgramId);
+ Program* program_info =
+ manager_.CreateProgram(kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_TRUE(program_info->AttachShader(&shader_manager_, vshader));
EXPECT_TRUE(program_info->AttachShader(&shader_manager_, fshader));
@@ -1007,17 +1007,17 @@ TEST_F(ProgramManagerWithShaderTest, ClearWithSamplerTypes) {
const GLuint kFShaderClientId = 2002;
const GLuint kVShaderServiceId = 3001;
const GLuint kFShaderServiceId = 3002;
- ShaderManager::ShaderInfo* vshader = shader_manager_.CreateShaderInfo(
+ Shader* vshader = shader_manager_.CreateShader(
kVShaderClientId, kVShaderServiceId, GL_VERTEX_SHADER);
ASSERT_TRUE(vshader != NULL);
vshader->SetStatus(true, NULL, NULL);
- ShaderManager::ShaderInfo* fshader = shader_manager_.CreateShaderInfo(
+ Shader* fshader = shader_manager_.CreateShader(
kFShaderClientId, kFShaderServiceId, GL_FRAGMENT_SHADER);
ASSERT_TRUE(fshader != NULL);
fshader->SetStatus(true, NULL, NULL);
static const GLuint kClientProgramId = 1234;
static const GLuint kServiceProgramId = 5679;
- ProgramManager::ProgramInfo* program_info = manager_.CreateProgramInfo(
+ Program* program_info = manager_.CreateProgram(
kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_TRUE(program_info->AttachShader(&shader_manager_, vshader));
@@ -1083,17 +1083,17 @@ TEST_F(ProgramManagerWithShaderTest, BindUniformLocation) {
const GLint kUniform2DesiredLocation = -1;
const GLint kUniform3DesiredLocation = 5;
- ShaderManager::ShaderInfo* vshader = shader_manager_.CreateShaderInfo(
+ Shader* vshader = shader_manager_.CreateShader(
kVShaderClientId, kVShaderServiceId, GL_VERTEX_SHADER);
ASSERT_TRUE(vshader != NULL);
vshader->SetStatus(true, NULL, NULL);
- ShaderManager::ShaderInfo* fshader = shader_manager_.CreateShaderInfo(
+ Shader* fshader = shader_manager_.CreateShader(
kFShaderClientId, kFShaderServiceId, GL_FRAGMENT_SHADER);
ASSERT_TRUE(fshader != NULL);
fshader->SetStatus(true, NULL, NULL);
static const GLuint kClientProgramId = 1234;
static const GLuint kServiceProgramId = 5679;
- ProgramManager::ProgramInfo* program_info = manager_.CreateProgramInfo(
+ Program* program_info = manager_.CreateProgram(
kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info != NULL);
EXPECT_TRUE(program_info->AttachShader(&shader_manager_, vshader));
@@ -1175,16 +1175,16 @@ class ProgramManagerWithCacheTest : public testing::Test {
gl_.reset(new StrictMock<gfx::MockGLInterface>());
::gfx::GLInterface::SetGLInterface(gl_.get());
- vertex_shader_ = shader_manager_.CreateShaderInfo(
+ vertex_shader_ = shader_manager_.CreateShader(
kVertexShaderClientId, kVertexShaderServiceId, GL_VERTEX_SHADER);
- fragment_shader_ = shader_manager_.CreateShaderInfo(
+ fragment_shader_ = shader_manager_.CreateShader(
kFragmentShaderClientId, kFragmentShaderServiceId, GL_FRAGMENT_SHADER);
ASSERT_TRUE(vertex_shader_ != NULL);
ASSERT_TRUE(fragment_shader_ != NULL);
vertex_shader_->UpdateSource("lka asjf bjajsdfj");
fragment_shader_->UpdateSource("lka asjf a fasgag 3rdsf3 bjajsdfj");
- program_info_ = manager_.CreateProgramInfo(
+ program_info_ = manager_.CreateProgram(
kClientProgramId, kServiceProgramId);
ASSERT_TRUE(program_info_ != NULL);
@@ -1225,9 +1225,9 @@ class ProgramManagerWithCacheTest : public testing::Test {
}
void SetExpectationsForProgramCached(
- ProgramManager::ProgramInfo* program_info,
- ShaderManager::ShaderInfo* vertex_shader,
- ShaderManager::ShaderInfo* fragment_shader) {
+ Program* program_info,
+ Shader* vertex_shader,
+ Shader* fragment_shader) {
EXPECT_CALL(*cache_.get(), SaveLinkedProgram(
program_info->service_id(),
vertex_shader,
@@ -1242,9 +1242,9 @@ class ProgramManagerWithCacheTest : public testing::Test {
}
void SetExpectationsForNotCachingProgram(
- ProgramManager::ProgramInfo* program_info,
- ShaderManager::ShaderInfo* vertex_shader,
- ShaderManager::ShaderInfo* fragment_shader) {
+ Program* program_info,
+ Shader* vertex_shader,
+ Shader* fragment_shader) {
EXPECT_CALL(*cache_.get(), SaveLinkedProgram(
program_info->service_id(),
vertex_shader,
@@ -1262,9 +1262,9 @@ class ProgramManagerWithCacheTest : public testing::Test {
void SetExpectationsForProgramLoad(
GLuint service_program_id,
- ProgramManager::ProgramInfo* program_info,
- ShaderManager::ShaderInfo* vertex_shader,
- ShaderManager::ShaderInfo* fragment_shader,
+ Program* program_info,
+ Shader* vertex_shader,
+ Shader* fragment_shader,
ProgramCache::ProgramLoadResult result) {
EXPECT_CALL(*cache_.get(),
LoadLinkedProgram(service_program_id,
@@ -1302,7 +1302,7 @@ class ProgramManagerWithCacheTest : public testing::Test {
}
void SetExpectationsForSuccessCompile(
- const ShaderManager::ShaderInfo* shader) {
+ const Shader* shader) {
const GLuint shader_id = shader->service_id();
const char* src = shader->source()->c_str();
EXPECT_CALL(*gl_.get(),
@@ -1312,7 +1312,7 @@ class ProgramManagerWithCacheTest : public testing::Test {
.WillOnce(SetArgumentPointee<2>(GL_TRUE));
}
- void SetExpectationsForNoCompile(const ShaderManager::ShaderInfo* shader) {
+ void SetExpectationsForNoCompile(const Shader* shader) {
const GLuint shader_id = shader->service_id();
const char* src = shader->source()->c_str();
EXPECT_CALL(*gl_.get(),
@@ -1322,7 +1322,7 @@ class ProgramManagerWithCacheTest : public testing::Test {
.Times(0);
}
- void SetExpectationsForErrorCompile(const ShaderManager::ShaderInfo* shader) {
+ void SetExpectationsForErrorCompile(const Shader* shader) {
const GLuint shader_id = shader->service_id();
const char* src = shader->source()->c_str();
EXPECT_CALL(*gl_.get(),
@@ -1341,9 +1341,9 @@ class ProgramManagerWithCacheTest : public testing::Test {
scoped_ptr<MockProgramCache> cache_;
ProgramManager manager_;
- ShaderManager::ShaderInfo* vertex_shader_;
- ShaderManager::ShaderInfo* fragment_shader_;
- ProgramManager::ProgramInfo* program_info_;
+ Shader* vertex_shader_;
+ Shader* fragment_shader_;
+ Program* program_info_;
ShaderManager shader_manager_;
};
@@ -1359,7 +1359,7 @@ const GLuint ProgramManagerWithCacheTest::kFragmentShaderServiceId;
TEST_F(ProgramManagerWithCacheTest, CacheSuccessAfterShaderCompile) {
SetExpectationsForSuccessCompile(vertex_shader_);
- FeatureInfo::Ref info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> info(new FeatureInfo());
manager_.DoCompileShader(vertex_shader_, NULL, info.get());
EXPECT_EQ(ProgramCache::COMPILATION_SUCCEEDED,
cache_->GetShaderCompilationStatus(*vertex_shader_->source()));
@@ -1367,7 +1367,7 @@ TEST_F(ProgramManagerWithCacheTest, CacheSuccessAfterShaderCompile) {
TEST_F(ProgramManagerWithCacheTest, CacheUnknownAfterShaderError) {
SetExpectationsForErrorCompile(vertex_shader_);
- FeatureInfo::Ref info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> info(new FeatureInfo());
manager_.DoCompileShader(vertex_shader_, NULL, info.get());
EXPECT_EQ(ProgramCache::COMPILATION_UNKNOWN,
cache_->GetShaderCompilationStatus(*vertex_shader_->source()));
@@ -1376,7 +1376,7 @@ TEST_F(ProgramManagerWithCacheTest, CacheUnknownAfterShaderError) {
TEST_F(ProgramManagerWithCacheTest, NoCompileWhenShaderCached) {
cache_->ShaderCompilationSucceeded(vertex_shader_->source()->c_str());
SetExpectationsForNoCompile(vertex_shader_);
- FeatureInfo::Ref info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> info(new FeatureInfo());
manager_.DoCompileShader(vertex_shader_, NULL, info.get());
}
@@ -1391,7 +1391,7 @@ TEST_F(ProgramManagerWithCacheTest, CompileShaderOnLinkCacheMiss) {
SetShadersCompiled();
vertex_shader_->FlagSourceAsCompiled(false);
- FeatureInfo::Ref info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> info(new FeatureInfo());
SetExpectationsForSuccessCompile(vertex_shader_);
SetExpectationsForProgramLink();
@@ -1422,7 +1422,7 @@ TEST_F(ProgramManagerWithCacheTest, CompileAndLinkOnProgramCacheError) {
SetExpectationsForProgramLink();
SetExpectationsForProgramCached();
- FeatureInfo::Ref info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> info(new FeatureInfo());
EXPECT_TRUE(program_info_->Link(&shader_manager_, NULL, NULL, info.get()));
}
@@ -1435,15 +1435,15 @@ TEST_F(ProgramManagerWithCacheTest, CorrectCompileOnSourceChangeNoCompile) {
const GLuint kNewProgramClientId = 5;
const GLuint kNewProgramServiceId = 50;
- ShaderManager::ShaderInfo* new_vertex_shader =
- shader_manager_.CreateShaderInfo(kNewShaderClientId,
+ Shader* new_vertex_shader =
+ shader_manager_.CreateShader(kNewShaderClientId,
kNewShaderServiceId,
GL_VERTEX_SHADER);
const std::string original_source = *vertex_shader_->source();
new_vertex_shader->UpdateSource(original_source.c_str());
- ProgramManager::ProgramInfo* program_info = manager_.CreateProgramInfo(
+ Program* program_info = manager_.CreateProgram(
kNewProgramClientId, kNewProgramServiceId);
ASSERT_TRUE(program_info != NULL);
program_info->AttachShader(&shader_manager_, new_vertex_shader);
@@ -1452,16 +1452,16 @@ TEST_F(ProgramManagerWithCacheTest, CorrectCompileOnSourceChangeNoCompile) {
SetExpectationsForNoCompile(new_vertex_shader);
manager_.DoCompileShader(new_vertex_shader, NULL, NULL);
- EXPECT_EQ(ShaderManager::ShaderInfo::PENDING_DEFERRED_COMPILE,
+ EXPECT_EQ(Shader::PENDING_DEFERRED_COMPILE,
new_vertex_shader->compilation_status());
new_vertex_shader->UpdateSource("different!");
EXPECT_EQ(original_source,
*new_vertex_shader->deferred_compilation_source());
- EXPECT_EQ(ShaderManager::ShaderInfo::PENDING_DEFERRED_COMPILE,
+ EXPECT_EQ(Shader::PENDING_DEFERRED_COMPILE,
new_vertex_shader->compilation_status());
- EXPECT_EQ(ShaderManager::ShaderInfo::PENDING_DEFERRED_COMPILE,
+ EXPECT_EQ(Shader::PENDING_DEFERRED_COMPILE,
fragment_shader_->compilation_status());
SetExpectationsForNoCompile(fragment_shader_);
@@ -1475,7 +1475,7 @@ TEST_F(ProgramManagerWithCacheTest, CorrectCompileOnSourceChangeNoCompile) {
ProgramCache::PROGRAM_LOAD_SUCCESS);
SetExpectationsForProgramLoadSuccess(kNewProgramServiceId);
- FeatureInfo::Ref info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> info(new FeatureInfo());
EXPECT_TRUE(program_info->Link(&shader_manager_, NULL, NULL, info.get()));
}
@@ -1488,14 +1488,14 @@ TEST_F(ProgramManagerWithCacheTest, CorrectCompileOnSourceChangeWithCompile) {
const GLuint kNewProgramClientId = 5;
const GLuint kNewProgramServiceId = 50;
- ShaderManager::ShaderInfo* new_vertex_shader =
- shader_manager_.CreateShaderInfo(kNewShaderClientId,
+ Shader* new_vertex_shader =
+ shader_manager_.CreateShader(kNewShaderClientId,
kNewShaderServiceId,
GL_VERTEX_SHADER);
new_vertex_shader->UpdateSource(vertex_shader_->source()->c_str());
- ProgramManager::ProgramInfo* program_info = manager_.CreateProgramInfo(
+ Program* program_info = manager_.CreateProgram(
kNewProgramClientId, kNewProgramServiceId);
ASSERT_TRUE(program_info != NULL);
program_info->AttachShader(&shader_manager_, new_vertex_shader);
@@ -1509,14 +1509,14 @@ TEST_F(ProgramManagerWithCacheTest, CorrectCompileOnSourceChangeWithCompile) {
new_vertex_shader->UpdateSource(differentSource.c_str());
SetExpectationsForSuccessCompile(new_vertex_shader);
- FeatureInfo::Ref info(new FeatureInfo());
+ scoped_refptr<FeatureInfo> info(new FeatureInfo());
manager_.DoCompileShader(new_vertex_shader, NULL, info.get());
EXPECT_EQ(differentSource,
*new_vertex_shader->deferred_compilation_source());
- EXPECT_EQ(ShaderManager::ShaderInfo::COMPILED,
+ EXPECT_EQ(Shader::COMPILED,
new_vertex_shader->compilation_status());
- EXPECT_EQ(ShaderManager::ShaderInfo::PENDING_DEFERRED_COMPILE,
+ EXPECT_EQ(Shader::PENDING_DEFERRED_COMPILE,
fragment_shader_->compilation_status());
// so we don't recompile because we were pending originally
« no previous file with comments | « gpu/command_buffer/service/program_manager.cc ('k') | gpu/command_buffer/service/query_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698