Commit 43bb5bd1 by John Kessenich

Fix #1536: use string instead of TString for uniform-location override.

parent fa61e4c0
// This header is generated by the make-revision script.
#define GLSLANG_PATCH_LEVEL 2904
#define GLSLANG_PATCH_LEVEL 2933
......@@ -664,7 +664,8 @@ public:
const std::string& getSourceFile() const { return sourceFile; }
void addSourceText(const char* text) { sourceText = sourceText + text; }
const std::string& getSourceText() const { return sourceText; }
void addProcesses(const std::vector<std::string>& p) {
void addProcesses(const std::vector<std::string>& p)
{
for (int i = 0; i < (int)p.size(); ++i)
processes.addProcess(p[i]);
}
......@@ -672,13 +673,15 @@ public:
void addProcessArgument(const std::string& arg) { processes.addArgument(arg); }
const std::vector<std::string>& getProcesses() const { return processes.getProcesses(); }
void addUniformLocationOverride(const TString& name, int location)
void addUniformLocationOverride(const char* nameStr, int location)
{
std::string name = nameStr;
uniformLocationOverrides[name] = location;
}
int getUniformLocationOverride(const TString& name) const
int getUniformLocationOverride(const char* nameStr) const
{
std::string name = nameStr;
auto pos = uniformLocationOverrides.find(name);
if (pos == uniformLocationOverrides.end())
return -1;
......@@ -814,7 +817,7 @@ protected:
bool needToLegalize;
bool binaryDoubleOutput;
std::unordered_map<TString, int> uniformLocationOverrides;
std::unordered_map<std::string, int> uniformLocationOverrides;
int uniformLocationBase;
private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment