From 99ae0326ad754f1d0f9258f57198c418c0676272 Mon Sep 17 00:00:00 2001 From: samcake Date: Mon, 13 Jul 2015 19:17:09 -0700 Subject: [PATCH] FIxing th ecompilation issue on mac, ready to ship --- libraries/gpu/src/gpu/StandardShaderLib.cpp | 6 +++--- libraries/gpu/src/gpu/StandardShaderLib.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/gpu/src/gpu/StandardShaderLib.cpp b/libraries/gpu/src/gpu/StandardShaderLib.cpp index dabeeaf770..1c1cca458a 100755 --- a/libraries/gpu/src/gpu/StandardShaderLib.cpp +++ b/libraries/gpu/src/gpu/StandardShaderLib.cpp @@ -29,12 +29,12 @@ StandardShaderLib::ProgramMap StandardShaderLib::_programs; ShaderPointer StandardShaderLib::getProgram(GetShader getVS, GetShader getPS) { - auto& programIt = _programs.find(std::pair(getVS, getPS)); + auto programIt = _programs.find(std::pair(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 diff --git a/libraries/gpu/src/gpu/StandardShaderLib.h b/libraries/gpu/src/gpu/StandardShaderLib.h index 653c4ab120..d5a3685feb 100755 --- a/libraries/gpu/src/gpu/StandardShaderLib.h +++ b/libraries/gpu/src/gpu/StandardShaderLib.h @@ -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: