Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 12:12:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoiding temp variable reference to appease mac and fixing a warning

Browse source
This commit is contained in:
Sam Cake 2017-04-15 01:06:01 -07:00
parent 038d01ce04
commit 2b97171061
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gl/src/gl/GLShaders.h
View file

@ -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<GLuint>& glshaders, std::string& error = std::string());
GLuint compileProgram(const std::vector<GLuint>& glshaders, std::string& error);
}

2
plugins/openvr/src/OpenVrDisplayPlugin.cpp
View file

@ -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";