tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Pass correct sources to programIdentifier

Browse Source
This commit is contained in:
John Firebaugh
2017-07-11 14:11:59 -07:00
parent 902d9442da
commit 550da70cf7
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mbgl/gl/program.hpp
View File

@@ -52,15 +52,13 @@ public:
const char* name,
const char* vertexSource_,
const char* fragmentSource_) {
const std::string vertexSource = shaders::vertexSource(programParameters, vertexSource_);
const std::string fragmentSource = shaders::fragmentSource(programParameters, fragmentSource_);
#if MBGL_HAS_BINARY_PROGRAMS
optional<std::string> cachePath = programParameters.cachePath(name);
if (cachePath && context.supportsProgramBinaries()) {
const std::string vertexSource =
shaders::vertexSource(programParameters, vertexSource_);
const std::string fragmentSource =
shaders::fragmentSource(programParameters, fragmentSource_);
const std::string identifier =
shaders::programIdentifier(vertexSource, fragmentSource_);
const std::string identifier = shaders::programIdentifier(vertexSource, fragmentSource);
try {
if (auto cachedBinaryProgram = util::readFile(*cachePath)) {
@@ -94,11 +92,9 @@ public:
return std::move(result);
}
#endif
(void)name;
return Program {
context, shaders::vertexSource(programParameters, vertexSource_),
shaders::fragmentSource(programParameters, fragmentSource_)
};
return Program { context, vertexSource, fragmentSource };
}
template <class BinaryProgram>