gpu/command_buffer/service/program_manager_unittest.cc - Issue 2852923004: Remove NameMap from shader translator and shader/program managers

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

Issue 2852923004: Remove NameMap from shader translator and shader/program managers (Closed)

Patch Set: split CL Created 3 years, 8 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

« gpu/command_buffer/service/program_manager.cc ('K') | « gpu/command_buffer/service/program_manager.cc ('k') | gpu/command_buffer/service/shader_manager.h » ('j') | gpu/command_buffer/service/shader_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 6bb1ca244d1e797ccbccd825c9a9df418d5cacbd..7d6cdacf8dd71c3ec85d90e614fae10171f2cc8c 100644

--- a/gpu/command_buffer/service/program_manager_unittest.cc

+++ b/gpu/command_buffer/service/program_manager_unittest.cc

@@ -427,11 +427,11 @@ class ProgramManagerWithShaderTest : public ProgramManagerTestBase {

TestHelper::SetShaderStates(gl_.get(), vshader, true, nullptr, nullptr,

shader_version, &vertex_attrib_map,

&vertex_uniform_map, &vertex_varying_map,

- nullptr, &vertex_output_variable_list, nullptr);

+ nullptr, &vertex_output_variable_list);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

shader_version, &frag_attrib_map,

&frag_uniform_map, &frag_varying_map, nullptr,

- &frag_output_variable_list, nullptr);

+ &frag_output_variable_list);

// Set up program

Program* program =

@@ -875,13 +875,13 @@ TEST_F(ProgramManagerWithShaderTest, GLDriverReturnsWrongTypeInfo) {

ASSERT_TRUE(vshader != NULL);

TestHelper::SetShaderStates(gl_.get(), vshader, true, nullptr, nullptr,

nullptr, &attrib_map, &uniform_map, &varying_map,

- nullptr, &output_variable_list, nullptr);

+ nullptr, &output_variable_list);

Shader* fshader = shader_manager_.CreateShader(

kFragmentShaderClientId, kFragmentShaderServiceId, GL_FRAGMENT_SHADER);

ASSERT_TRUE(fshader != NULL);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, &attrib_map, &uniform_map, &varying_map,

- nullptr, &output_variable_list, nullptr);

+ nullptr, &output_variable_list);

static ProgramManagerWithShaderTest::AttribInfo kAttribs[] = {

{ kAttrib1Name, kAttrib1Size, kAttrib1Type, kAttrib1Location, },

{ kAttrib2Name, kAttrib2Size, kAttrib2BadType, kAttrib2Location, },

@@ -1546,7 +1546,7 @@ TEST_F(ProgramManagerWithShaderTest, BindAttribLocationConflicts) {

// Set Status

TestHelper::SetShaderStates(gl_.get(), vshader, true, nullptr, nullptr,

nullptr, &attrib_map, nullptr, nullptr, nullptr,

- nullptr, nullptr);

+ nullptr);

// Check attrib infos got copied.

for (AttributeMap::const_iterator it = attrib_map.begin();

it != attrib_map.end(); ++it) {

@@ -1561,7 +1561,7 @@ TEST_F(ProgramManagerWithShaderTest, BindAttribLocationConflicts) {

}

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, &attrib_map, nullptr, nullptr, nullptr,

- nullptr, nullptr);

+ nullptr);

// Set up program

Program* program =

manager_->CreateProgram(kClientProgramId, kServiceProgramId);

@@ -1629,10 +1629,10 @@ TEST_F(ProgramManagerWithShaderTest, UniformsPrecisionMismatch) {

// Set Status

TestHelper::SetShaderStates(gl_.get(), vshader, true, nullptr, nullptr,

nullptr, nullptr, &vertex_uniform_map, nullptr,

- nullptr, nullptr, nullptr);

+ nullptr, nullptr);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, nullptr, &frag_uniform_map, nullptr,

- nullptr, nullptr, nullptr);

+ nullptr, nullptr);

// Set up program

Program* program =

manager_->CreateProgram(kClientProgramId, kServiceProgramId);

@@ -1751,7 +1751,7 @@ TEST_F(ProgramManagerWithShaderTest, FragmentOutputTypes) {

kVertexShaderClientId, kVertexShaderServiceId, GL_VERTEX_SHADER);

TestHelper::SetShaderStates(gl_.get(), vshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, nullptr, nullptr,

- nullptr, nullptr);

+ nullptr);

Shader* fshader = shader_manager_.CreateShader(

kFragmentShaderClientId, kFragmentShaderServiceId, GL_FRAGMENT_SHADER);

ASSERT_TRUE(vshader && fshader);

@@ -1764,7 +1764,7 @@ TEST_F(ProgramManagerWithShaderTest, FragmentOutputTypes) {

{ // No outputs.

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, nullptr, nullptr,

- nullptr, nullptr);

+ nullptr);

EXPECT_TRUE(LinkAsExpected(program, true));

EXPECT_EQ(0u, program->fragment_output_type_mask());

EXPECT_EQ(0u, program->fragment_output_written_mask());

@@ -1778,7 +1778,7 @@ TEST_F(ProgramManagerWithShaderTest, FragmentOutputTypes) {

fragment_outputs.push_back(var);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, nullptr, nullptr,

- &fragment_outputs, nullptr);

+ &fragment_outputs);

EXPECT_TRUE(LinkAsExpected(program, true));

EXPECT_EQ(0x3u, program->fragment_output_type_mask());

EXPECT_EQ(0x3u, program->fragment_output_written_mask());

@@ -1792,7 +1792,7 @@ TEST_F(ProgramManagerWithShaderTest, FragmentOutputTypes) {

fragment_outputs.push_back(var);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, nullptr, nullptr,

- &fragment_outputs, nullptr);

+ &fragment_outputs);

EXPECT_TRUE(LinkAsExpected(program, true));

EXPECT_EQ(0xFFFFu, program->fragment_output_type_mask());

EXPECT_EQ(0xFFFFu, program->fragment_output_written_mask());

@@ -1810,7 +1810,7 @@ TEST_F(ProgramManagerWithShaderTest, FragmentOutputTypes) {

fragment_outputs.push_back(var);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, nullptr, nullptr,

- &fragment_outputs, nullptr);

+ &fragment_outputs);

EXPECT_TRUE(LinkAsExpected(program, true));

EXPECT_EQ(0x3u, program->fragment_output_type_mask());

EXPECT_EQ(0x3u, program->fragment_output_written_mask());

@@ -1824,7 +1824,7 @@ TEST_F(ProgramManagerWithShaderTest, FragmentOutputTypes) {

fragment_outputs.push_back(var);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, nullptr, nullptr,

- &fragment_outputs, nullptr);

+ &fragment_outputs);

EXPECT_TRUE(LinkAsExpected(program, true));

EXPECT_EQ(0x2u, program->fragment_output_type_mask());

EXPECT_EQ(0x3u, program->fragment_output_written_mask());

@@ -1838,7 +1838,7 @@ TEST_F(ProgramManagerWithShaderTest, FragmentOutputTypes) {

fragment_outputs.push_back(var);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, nullptr, nullptr,

- &fragment_outputs, nullptr);

+ &fragment_outputs);

EXPECT_TRUE(LinkAsExpected(program, true));

EXPECT_EQ(0x2u, program->fragment_output_type_mask());

EXPECT_EQ(0x3u, program->fragment_output_written_mask());

@@ -1856,7 +1856,7 @@ TEST_F(ProgramManagerWithShaderTest, FragmentOutputTypes) {

fragment_outputs.push_back(var);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, nullptr, nullptr,

- &fragment_outputs, nullptr);

+ &fragment_outputs);

EXPECT_TRUE(LinkAsExpected(program, true));

EXPECT_EQ(0xF1u, program->fragment_output_type_mask());

EXPECT_EQ(0xF3u, program->fragment_output_written_mask());

@@ -2360,10 +2360,10 @@ TEST_P(ProgramManagerWithPathRenderingTest, BindFragmentInputLocation) {

kFragmentInput3StaticUse, kFragmentInput3Name);

TestHelper::SetShaderStates(gl_.get(), vshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, &varying_map, nullptr,

- nullptr, nullptr);

+ nullptr);

TestHelper::SetShaderStates(gl_.get(), fshader, true, nullptr, nullptr,

nullptr, nullptr, nullptr, &varying_map, nullptr,

- nullptr, nullptr);

+ nullptr);

Program* program =

manager_->CreateProgram(kClientProgramId, kServiceProgramId);

ASSERT_TRUE(program != NULL);