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

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

Issue 159183002: Revert 250146 "Merge 249460 "Hookup clear_uniforms_before_first_..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1750/src/
Patch Set: Created 6 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 | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698