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

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

Issue 500243002: Remove implicit conversions from scoped_refptr to T* in gpu/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert silliness Created 6 years, 4 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/mailbox_manager_unittest.cc ('k') | gpu/command_buffer/service/query_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/program_manager.cc
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc
index aec30f9cf5ebb30ac76b616b20a7de296d21f79c..05335cd41023aada5fac4411b7bb51ff6746c85b 100644
--- a/gpu/command_buffer/service/program_manager.cc
+++ b/gpu/command_buffer/service/program_manager.cc
@@ -1100,9 +1100,9 @@ bool Program::DetectUniformsMismatch(std::string* conflicting_name) const {
}
bool Program::DetectVaryingsMismatch(std::string* conflicting_name) const {
- DCHECK(attached_shaders_[0] &&
+ DCHECK(attached_shaders_[0].get() &&
attached_shaders_[0]->shader_type() == GL_VERTEX_SHADER &&
- attached_shaders_[1] &&
+ attached_shaders_[1].get() &&
attached_shaders_[1]->shader_type() == GL_FRAGMENT_SHADER);
const ShaderTranslator::VariableMap* vertex_varyings =
&(attached_shaders_[0]->varying_map());
@@ -1137,9 +1137,9 @@ bool Program::DetectVaryingsMismatch(std::string* conflicting_name) const {
}
bool Program::DetectGlobalNameConflicts(std::string* conflicting_name) const {
- DCHECK(attached_shaders_[0] &&
+ DCHECK(attached_shaders_[0].get() &&
attached_shaders_[0]->shader_type() == GL_VERTEX_SHADER &&
- attached_shaders_[1] &&
+ attached_shaders_[1].get() &&
attached_shaders_[1]->shader_type() == GL_FRAGMENT_SHADER);
const ShaderTranslator::VariableMap* uniforms[2];
uniforms[0] = &(attached_shaders_[0]->uniform_map());
@@ -1161,9 +1161,9 @@ bool Program::DetectGlobalNameConflicts(std::string* conflicting_name) const {
bool Program::CheckVaryingsPacking(
Program::VaryingsPackingOption option) const {
- DCHECK(attached_shaders_[0] &&
+ DCHECK(attached_shaders_[0].get() &&
attached_shaders_[0]->shader_type() == GL_VERTEX_SHADER &&
- attached_shaders_[1] &&
+ attached_shaders_[1].get() &&
attached_shaders_[1]->shader_type() == GL_FRAGMENT_SHADER);
const ShaderTranslator::VariableMap* vertex_varyings =
&(attached_shaders_[0]->varying_map());
« no previous file with comments | « gpu/command_buffer/service/mailbox_manager_unittest.cc ('k') | gpu/command_buffer/service/query_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698