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 f63f340d74e0ec8ad603bbff94ac4f8ea1b9e298..fd3ff787bffad0726e5c45f076af36d9e95f3b53 100644 |
--- a/gpu/command_buffer/service/test_helper.cc |
+++ b/gpu/command_buffer/service/test_helper.cc |
@@ -292,6 +292,16 @@ void TestHelper::SetupContextGroupInitExpectations( |
.WillOnce(SetArgumentPointee<1>(kMaxSamples)) |
.RetiresOnSaturation(); |
} |
+ |
+ if (gl_info.IsAtLeastGL(3, 3) || |
+ (gl_info.IsAtLeastGL(3, 2) && |
+ strstr(extensions, "GL_ARB_blend_func_extended")) || |
+ (gl_info.is_es && strstr(extensions, "GL_EXT_blend_func_extended"))) { |
+ EXPECT_CALL(*gl, GetIntegerv(GL_MAX_DUAL_SOURCE_DRAW_BUFFERS_EXT, _)) |
+ .WillOnce(SetArgumentPointee<1>(8)) |
+ .RetiresOnSaturation(); |
+ } |
+ |
EXPECT_CALL(*gl, GetIntegerv(GL_MAX_VERTEX_ATTRIBS, _)) |
.WillOnce(SetArgumentPointee<1>(kNumVertexAttribs)) |
.RetiresOnSaturation(); |
@@ -848,15 +858,17 @@ void TestHelper::SetTexParameteriWithExpectations( |
// static |
void TestHelper::SetShaderStates( |
- ::gfx::MockGLInterface* gl, Shader* shader, |
- bool expected_valid, |
- const std::string* const expected_log_info, |
- const std::string* const expected_translated_source, |
- const int* const expected_shader_version, |
- const AttributeMap* const expected_attrib_map, |
- const UniformMap* const expected_uniform_map, |
- const VaryingMap* const expected_varying_map, |
- const NameMap* const expected_name_map) { |
+ ::gfx::MockGLInterface* gl, |
+ Shader* shader, |
+ bool expected_valid, |
+ const std::string* const expected_log_info, |
+ const std::string* const expected_translated_source, |
+ const int* const expected_shader_version, |
+ const AttributeMap* const expected_attrib_map, |
+ const UniformMap* const expected_uniform_map, |
+ const VaryingMap* const expected_varying_map, |
+ const AttributeList* const expected_output_variable_list, |
+ const NameMap* const expected_name_map) { |
const std::string empty_log_info; |
const std::string* log_info = (expected_log_info && !expected_valid) ? |
expected_log_info : &empty_log_info; |
@@ -876,6 +888,11 @@ void TestHelper::SetShaderStates( |
const VaryingMap empty_varying_map; |
const VaryingMap* varying_map = (expected_varying_map && expected_valid) ? |
expected_varying_map : &empty_varying_map; |
+ const AttributeList empty_output_variable_list; |
+ const AttributeList* output_variable_list = |
+ (expected_output_variable_list && expected_valid) |
+ ? expected_output_variable_list |
+ : &empty_output_variable_list; |
const NameMap empty_name_map; |
const NameMap* name_map = (expected_name_map && expected_valid) ? |
expected_name_map : &empty_name_map; |
@@ -883,12 +900,13 @@ void TestHelper::SetShaderStates( |
MockShaderTranslator* mock_translator = new MockShaderTranslator; |
scoped_refptr<ShaderTranslatorInterface> translator(mock_translator); |
EXPECT_CALL(*mock_translator, Translate(_, |
- NotNull(), // log_info |
- NotNull(), // translated_source |
- NotNull(), // shader_version |
- NotNull(), // attrib_map |
- NotNull(), // uniform_map |
- NotNull(), // varying_map |
+ NotNull(), // log_info |
+ NotNull(), // translated_source |
+ NotNull(), // shader_version |
+ NotNull(), // attrib_map |
+ NotNull(), // uniform_map |
+ NotNull(), // varying_map |
+ NotNull(), // output_variable_list |
NotNull())) // name_map |
.WillOnce(DoAll(SetArgumentPointee<1>(*log_info), |
SetArgumentPointee<2>(*translated_source), |
@@ -896,8 +914,8 @@ void TestHelper::SetShaderStates( |
SetArgumentPointee<4>(*attrib_map), |
SetArgumentPointee<5>(*uniform_map), |
SetArgumentPointee<6>(*varying_map), |
- SetArgumentPointee<7>(*name_map), |
- Return(expected_valid))) |
+ SetArgumentPointee<7>(*output_variable_list), |
+ SetArgumentPointee<8>(*name_map), Return(expected_valid))) |
.RetiresOnSaturation(); |
if (expected_valid) { |
EXPECT_CALL(*gl, ShaderSource(shader->service_id(), 1, _, NULL)) |
@@ -919,7 +937,8 @@ void TestHelper::SetShaderStates( |
// static |
void TestHelper::SetShaderStates( |
::gfx::MockGLInterface* gl, Shader* shader, bool valid) { |
- SetShaderStates(gl, shader, valid, NULL, NULL, NULL, NULL, NULL, NULL, NULL); |
+ SetShaderStates(gl, shader, valid, nullptr, nullptr, nullptr, nullptr, |
+ nullptr, nullptr, nullptr, nullptr); |
} |
// static |