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

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

Issue 23534007: Apply varying packing rule. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: final Created 7 years, 3 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
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 fa42deb8d58d9685bbed3462637ba8417ca297ad..6dd6ca262ee866366003e8f7a3834250f6a06108 100644
--- a/gpu/command_buffer/service/program_manager.cc
+++ b/gpu/command_buffer/service/program_manager.cc
@@ -118,6 +118,20 @@ bool GetUniformNameSansElement(
return true;
}
+bool IsBuiltInVarying(const std::string& name) {
+ // Built-in variables.
+ const char* kBuiltInVaryings[] = {
+ "gl_FragCoord",
+ "gl_FrontFacing",
+ "gl_PointCoord"
+ };
+ for (size_t ii = 0; ii < arraysize(kBuiltInVaryings); ++ii) {
+ if (name == kBuiltInVaryings[ii])
+ return true;
+ }
+ return false;
+}
+
} // anonymous namespace.
Program::UniformInfo::UniformInfo()
@@ -544,6 +558,10 @@ bool Program::Link(ShaderManager* manager,
"declared in vertex shader");
return false;
}
+ if (!CheckVaryingsPacking()) {
+ set_log_info("Varyings over maximum register limit");
+ return false;
+ }
TimeTicks before_time = TimeTicks::HighResNow();
bool link = true;
@@ -1034,21 +1052,8 @@ bool Program::DetectVaryingsMismatch() const {
for (ShaderTranslator::VariableMap::const_iterator iter =
fragment_varyings->begin();
iter != fragment_varyings->end(); ++iter) {
- // Built-in variables.
- const char* kBuiltInVaryings[] = {
- "gl_FragCoord",
- "gl_FrontFacing",
- "gl_PointCoord"
- };
const std::string& name = iter->first;
- bool is_built_in = false;
- for (size_t ii = 0; ii < arraysize(kBuiltInVaryings); ++ii) {
- if (name == kBuiltInVaryings[ii]) {
- is_built_in = true;
- break;
- }
- }
- if (is_built_in)
+ if (IsBuiltInVarying(name))
continue;
ShaderTranslator::VariableMap::const_iterator hit =
@@ -1067,6 +1072,55 @@ bool Program::DetectVaryingsMismatch() const {
return false;
}
+bool Program::CheckVaryingsPacking() const {
+ DCHECK(attached_shaders_[0] &&
+ attached_shaders_[0]->shader_type() == GL_VERTEX_SHADER &&
+ attached_shaders_[1] &&
+ attached_shaders_[1]->shader_type() == GL_FRAGMENT_SHADER);
+ const ShaderTranslator::VariableMap* vertex_varyings =
+ &(attached_shaders_[0]->varying_map());
+ const ShaderTranslator::VariableMap* fragment_varyings =
+ &(attached_shaders_[1]->varying_map());
+
+ std::map<std::string, ShVariableInfo> combined_map;
+
+ for (ShaderTranslator::VariableMap::const_iterator iter =
+ fragment_varyings->begin();
+ iter != fragment_varyings->end(); ++iter) {
+ if (!iter->second.static_use)
+ continue;
+ if (!IsBuiltInVarying(iter->first)) {
+ ShaderTranslator::VariableMap::const_iterator vertex_iter =
+ vertex_varyings->find(iter->first);
+ if (vertex_iter == vertex_varyings->end() ||
+ !vertex_iter->second.static_use)
+ continue;
+ }
+
+ ShVariableInfo var;
+ var.type = static_cast<ShDataType>(iter->second.type);
+ var.size = iter->second.size;
+ combined_map[iter->first] = var;
+ }
+
+ if (combined_map.size() == 0)
+ return true;
+ scoped_ptr<ShVariableInfo[]> variables(
+ new ShVariableInfo[combined_map.size()]);
+ size_t index = 0;
+ for (std::map<std::string, ShVariableInfo>::const_iterator iter =
+ combined_map.begin();
+ iter != combined_map.end(); ++iter) {
+ variables[index].type = iter->second.type;
+ variables[index].size = iter->second.size;
+ ++index;
+ }
+ return ShCheckVariablesWithinPackingLimits(
+ static_cast<int>(manager_->max_varying_vectors()),
+ variables.get(),
+ combined_map.size()) == 1;
+}
+
static uint32 ComputeOffset(const void* start, const void* position) {
return static_cast<const uint8*>(position) -
static_cast<const uint8*>(start);
@@ -1164,13 +1218,15 @@ Program::~Program() {
}
-ProgramManager::ProgramManager(ProgramCache* program_cache)
+ProgramManager::ProgramManager(ProgramCache* program_cache,
+ uint32 max_varying_vectors)
: program_count_(0),
have_context_(true),
disable_workarounds_(
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisableGpuDriverBugWorkarounds)),
- program_cache_(program_cache) { }
+ program_cache_(program_cache),
+ max_varying_vectors_(max_varying_vectors) { }
ProgramManager::~ProgramManager() {
DCHECK(programs_.empty());
« no previous file with comments | « gpu/command_buffer/service/program_manager.h ('k') | gpu/command_buffer/service/program_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698