Index: gpu/command_buffer/service/gles2_cmd_decoder.cc |
=================================================================== |
--- gpu/command_buffer/service/gles2_cmd_decoder.cc (revision 250176) |
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc (working copy) |
@@ -5442,12 +5442,13 @@ |
if (program->Link(shader_manager(), |
vertex_translator, |
fragment_translator, |
+ feature_info_.get(), |
shader_cache_callback_)) { |
if (program == state_.current_program.get()) { |
- if (workarounds().use_current_program_after_successful_link) |
+ if (workarounds().use_current_program_after_successful_link) { |
glUseProgram(program->service_id()); |
- if (workarounds().clear_uniforms_before_first_program_use) |
- program_manager()->ClearUniforms(program); |
+ } |
+ program_manager()->ClearUniforms(program); |
} |
} |
}; |
@@ -5913,8 +5914,6 @@ |
glUseProgram(service_id); |
if (state_.current_program.get()) { |
program_manager()->UseProgram(state_.current_program.get()); |
- if (workarounds().clear_uniforms_before_first_program_use) |
- program_manager()->ClearUniforms(program); |
} |
} |
@@ -6664,11 +6663,7 @@ |
vertex_translator_.get() : fragment_translator_.get(); |
} |
- program_manager()->DoCompileShader( |
- shader, |
- translator, |
- feature_info_->feature_flags().angle_translated_shader_source ? |
- ProgramManager::kANGLE : ProgramManager::kGL); |
+ program_manager()->DoCompileShader(shader, translator, feature_info_.get()); |
}; |
void GLES2DecoderImpl::DoGetShaderiv( |