This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch upstream/latest in repository colobot.
commit 7acca9feb8c94caeda39d5517853d0776968f750 Author: Tomasz Kapuściński <[email protected]> Date: Mon Jun 1 17:45:51 2015 +0200 Corrected compilation error and unsigned comparison warnings --- src/graphics/opengl/gl21device.cpp | 2 +- src/graphics/opengl/gl21device.h | 4 ++-- src/graphics/opengl/gl33device.cpp | 4 ++-- src/graphics/opengl/gl33device.h | 8 ++++---- src/graphics/opengl/glutil.cpp | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/graphics/opengl/gl21device.cpp b/src/graphics/opengl/gl21device.cpp index 528d781..8449098 100644 --- a/src/graphics/opengl/gl21device.cpp +++ b/src/graphics/opengl/gl21device.cpp @@ -887,7 +887,7 @@ void CGL21Device::UpdateTextureStatus() */ } -inline void CGL21Device::BindVBO(GLint vbo) +inline void CGL21Device::BindVBO(GLuint vbo) { if (m_currentVBO == vbo) return; diff --git a/src/graphics/opengl/gl21device.h b/src/graphics/opengl/gl21device.h index 36d8c7b..2ca150c 100644 --- a/src/graphics/opengl/gl21device.h +++ b/src/graphics/opengl/gl21device.h @@ -153,7 +153,7 @@ private: //! Updates texture status void UpdateTextureStatus(); //! Binds VBO - inline void BindVBO(GLint vbo); + inline void BindVBO(GLuint vbo); private: //! Current config @@ -220,7 +220,7 @@ private: //! Last ID of VBO object unsigned int m_lastVboId; //! Currently bound VBO - GLint m_currentVBO; + GLuint m_currentVBO; // Offscreen buffer //! Framebuffer object diff --git a/src/graphics/opengl/gl33device.cpp b/src/graphics/opengl/gl33device.cpp index bd31808..e323fc7 100644 --- a/src/graphics/opengl/gl33device.cpp +++ b/src/graphics/opengl/gl33device.cpp @@ -1969,7 +1969,7 @@ void CGL33Device::UpdateRenderingMode() glUniform1i(uni_ShadowTextureEnabled, enabled ? 1 : 0); } -inline void CGL33Device::BindVBO(GLint vbo) +inline void CGL33Device::BindVBO(GLuint vbo) { if (m_currentVBO == vbo) return; @@ -1977,7 +1977,7 @@ inline void CGL33Device::BindVBO(GLint vbo) m_currentVBO = vbo; } -inline void CGL33Device::BindVAO(GLint vao) +inline void CGL33Device::BindVAO(GLuint vao) { if (m_currentVAO == vao) return; diff --git a/src/graphics/opengl/gl33device.h b/src/graphics/opengl/gl33device.h index 479b5bb..b1eb621 100644 --- a/src/graphics/opengl/gl33device.h +++ b/src/graphics/opengl/gl33device.h @@ -152,9 +152,9 @@ private: void UpdateRenderingMode(); //! Binds VBO - inline void BindVBO(GLint vbo); + inline void BindVBO(GLuint vbo); //! Binds VAO - inline void BindVAO(GLint vao); + inline void BindVAO(GLuint vao); private: //! Current config @@ -220,9 +220,9 @@ private: //! Last ID of VBO object unsigned int m_lastVboId; //! Currently bound VBO - GLint m_currentVBO; + GLuint m_currentVBO; //! Currently bound VAO - GLint m_currentVAO; + GLuint m_currentVAO; // Offscreen buffer //! Framebuffer object diff --git a/src/graphics/opengl/glutil.cpp b/src/graphics/opengl/glutil.cpp index 2465c5c..119a869 100644 --- a/src/graphics/opengl/glutil.cpp +++ b/src/graphics/opengl/glutil.cpp @@ -171,8 +171,8 @@ GLint LoadShader(GLint type, const char* filename) return 0; } - char source[65536]; - char *sources[] = { source }; + GLchar source[65536]; + GLchar *sources[] = { source }; int length = PHYSFS_read(file, source, 1, 65536); source[length] = '\0'; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
