Apply SH_TIMING_RESTRICTIONS to all samplers.
Issue: 332
Review URL: https://codereview.appspot.com/6273044/
git-svn-id: https://angleproject.googlecode.com/svn/trunk@1131 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/compiler/depgraph/DependencyGraph.cpp b/src/compiler/depgraph/DependencyGraph.cpp
index 9b69cc6..ca661d6 100644
--- a/src/compiler/depgraph/DependencyGraph.cpp
+++ b/src/compiler/depgraph/DependencyGraph.cpp
@@ -23,17 +23,6 @@
}
}
-TGraphSymbol* TDependencyGraph::getGlobalSymbolByName(const TString& name) const
-{
- TSymbolNameMap::const_iterator iter = mGlobalSymbolMap.find(name);
- if (iter == mGlobalSymbolMap.end())
- return NULL;
-
- TSymbolNamePair pair = *iter;
- TGraphSymbol* symbol = pair.second;
- return symbol;
-}
-
TGraphArgument* TDependencyGraph::createArgument(TIntermAggregate* intermFunctionCall,
int argumentNumber)
{
@@ -51,7 +40,7 @@
return functionCall;
}
-TGraphSymbol* TDependencyGraph::getOrCreateSymbol(TIntermSymbol* intermSymbol, bool isGlobalSymbol)
+TGraphSymbol* TDependencyGraph::getOrCreateSymbol(TIntermSymbol* intermSymbol)
{
TSymbolIdMap::const_iterator iter = mSymbolIdMap.find(intermSymbol->getId());
@@ -67,12 +56,9 @@
TSymbolIdPair pair(intermSymbol->getId(), symbol);
mSymbolIdMap.insert(pair);
- if (isGlobalSymbol) {
- // We map all symbols in the global scope by name, so traversers of the graph can
- // quickly start searches at global symbols with specific names.
- TSymbolNamePair pair(intermSymbol->getSymbol(), symbol);
- mGlobalSymbolMap.insert(pair);
- }
+ // We save all sampler symbols in a collection, so we can start graph traversals from them quickly.
+ if (IsSampler(intermSymbol->getBasicType()))
+ mSamplerSymbols.push_back(symbol);
}
return symbol;