Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIxing th ecompilation issue on mac, ready to ship

Browse source
This commit is contained in:
samcake 2015-07-13 19:17:09 -07:00
parent f08c608195
commit 99ae0326ad
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/gpu/src/gpu/StandardShaderLib.cpp
View file

@ -29,12 +29,12 @@ StandardShaderLib::ProgramMap StandardShaderLib::_programs;
ShaderPointer StandardShaderLib::getProgram(GetShader getVS, GetShader getPS) {
auto& programIt = _programs.find(std::pair<GetShader, GetShader>(getVS, getPS));
auto programIt = _programs.find(std::pair<GetShader, GetShader>(getVS, getPS));
if (programIt != _programs.end()) {
return (*programIt).second;
} else {
auto vs = getVS();
auto ps = getPS();
auto vs = (getVS)();
auto ps = (getPS)();
auto program = gpu::ShaderPointer(gpu::Shader::createProgram(vs, ps));
if (program) {
// Program created, let's try to make it

2
libraries/gpu/src/gpu/StandardShaderLib.h
View file

@ -38,7 +38,7 @@ public:
static ShaderPointer getDrawColoredTexturePS();
// The shader program combining the shaders available above, so they are unique
typedef ShaderPointer (*StandardShaderLib::GetShader) ();
typedef ShaderPointer (*GetShader) ();
static ShaderPointer getProgram(GetShader vs, GetShader ps);
protected: