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 9a15f8205150e7d8c9d6087708312ce7077aa2df..896669fca3b294e8ac32d95eecb8d25cd64234c8 100644 |
--- a/gpu/command_buffer/service/program_manager.cc |
+++ b/gpu/command_buffer/service/program_manager.cc |
@@ -1188,6 +1188,8 @@ bool Program::DetectVaryingsMismatch(std::string* conflicting_name) const { |
const VaryingMap* vertex_varyings = &(attached_shaders_[0]->varying_map()); |
const VaryingMap* fragment_varyings = &(attached_shaders_[1]->varying_map()); |
+ int shader_version = attached_shaders_[0]->shader_version(); |
+ |
for (VaryingMap::const_iterator iter = fragment_varyings->begin(); |
iter != fragment_varyings->end(); ++iter) { |
const std::string& name = iter->first; |
@@ -1203,7 +1205,7 @@ bool Program::DetectVaryingsMismatch(std::string* conflicting_name) const { |
continue; |
} |
- if (!hit->second.isSameVaryingAtLinkTime(iter->second)) { |
+ if (!hit->second.isSameVaryingAtLinkTime(iter->second, shader_version)) { |
*conflicting_name = name; |
return true; |
} |