From 2b971710610e4a155cb8425e2599cf1d68331864 Mon Sep 17 00:00:00 2001 From: Sam Cake Date: Sat, 15 Apr 2017 01:06:01 -0700 Subject: [PATCH] Avoiding temp variable reference to appease mac and fixing a warning --- libraries/gl/src/gl/GLShaders.h | 2 +- plugins/openvr/src/OpenVrDisplayPlugin.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/gl/src/gl/GLShaders.h b/libraries/gl/src/gl/GLShaders.h index 26dd089370..a6213fd280 100644 --- a/libraries/gl/src/gl/GLShaders.h +++ b/libraries/gl/src/gl/GLShaders.h @@ -22,7 +22,7 @@ namespace gl { bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const std::string& defines, GLuint &shaderObject, std::string& error); #endif - GLuint compileProgram(const std::vector& glshaders, std::string& error = std::string()); + GLuint compileProgram(const std::vector& glshaders, std::string& error); } diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp index b41cdaf181..585a0d00ef 100644 --- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp +++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp @@ -199,7 +199,7 @@ public: std::string error; ::gl::compileShader(GL_VERTEX_SHADER, vsSource, "", vertexShader, error); ::gl::compileShader(GL_FRAGMENT_SHADER, fsSource, "", fragmentShader, error); - _program = ::gl::compileProgram({ { vertexShader, fragmentShader } }); + _program = ::gl::compileProgram({ { vertexShader, fragmentShader } }, error); glDeleteShader(vertexShader); glDeleteShader(fragmentShader); qDebug() << "Rebuild proigram";