diff --git a/libraries/gl/src/gl/GLShaders.h b/libraries/gl/src/gl/GLShaders.h index 9a0d67af0c..26dd089370 100644 --- a/libraries/gl/src/gl/GLShaders.h +++ b/libraries/gl/src/gl/GLShaders.h @@ -17,9 +17,9 @@ namespace gl { #ifdef SEPARATE_PROGRAM - bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const std::string& defines, GLuint &shaderObject, GLuint &programObject, std::string& error = std::string()); + bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const std::string& defines, GLuint &shaderObject, GLuint &programObject, std::string& error); #else - bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const std::string& defines, GLuint &shaderObject, std::string& error = std::string()); + 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()); diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp index 59d291b9e0..ca3f856efc 100755 --- a/libraries/render/src/render/DrawTask.cpp +++ b/libraries/render/src/render/DrawTask.cpp @@ -165,7 +165,7 @@ void DrawBounds::run(const SceneContextPointer& sceneContext, const RenderContex const Inputs& items) { RenderArgs* args = renderContext->args; - auto numItems = items.size(); + uint32_t numItems = (uint32_t) items.size(); if (numItems == 0) { return; } diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp index 1adfa8d333..b41cdaf181 100644 --- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp +++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp @@ -196,8 +196,9 @@ public: std::string vsSource = HMD_REPROJECTION_VERT; std::string fsSource = HMD_REPROJECTION_FRAG; GLuint vertexShader { 0 }, fragmentShader { 0 }; - ::gl::compileShader(GL_VERTEX_SHADER, vsSource, "", vertexShader); - ::gl::compileShader(GL_FRAGMENT_SHADER, fsSource, "", fragmentShader); + std::string error; + ::gl::compileShader(GL_VERTEX_SHADER, vsSource, "", vertexShader, error); + ::gl::compileShader(GL_FRAGMENT_SHADER, fsSource, "", fragmentShader, error); _program = ::gl::compileProgram({ { vertexShader, fragmentShader } }); glDeleteShader(vertexShader); glDeleteShader(fragmentShader);