diff options
| author | skidau <skidau@gmail.com> | 2014-10-26 13:44:34 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-26 13:44:34 +1100 |
| commit | 7c58eb344da8694d1d441453bae0d856d3c549d1 (patch) | |
| tree | 836b349847d803373c83084eb218ef23a6358450 /Source/Core/VideoBackends/OGL/GLUtil.cpp | |
| parent | 5f21683343b2d36274f9d5c590944622bf2955b8 (diff) | |
| parent | 3509a6d03e1dd95b2521e096dd24aa481b9e9e01 (diff) | |
Merge pull request #1378 from lioncash/gl
GLUtil: Change return type from GLuint to GLenum for OpenGL_ReportGLError.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/GLUtil.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/GLUtil.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLUtil.cpp b/Source/Core/VideoBackends/OGL/GLUtil.cpp index d2ffdaf803..c90d114426 100644 --- a/Source/Core/VideoBackends/OGL/GLUtil.cpp +++ b/Source/Core/VideoBackends/OGL/GLUtil.cpp @@ -114,9 +114,9 @@ GLuint OpenGL_CompileProgram(const char* vertexShader, const char* fragmentShade } -GLuint OpenGL_ReportGLError(const char *function, const char *file, int line) +GLenum OpenGL_ReportGLError(const char *function, const char *file, int line) { - GLint err = glGetError(); + GLenum err = glGetError(); if (err != GL_NO_ERROR) { ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x\n", @@ -127,7 +127,7 @@ GLuint OpenGL_ReportGLError(const char *function, const char *file, int line) bool OpenGL_ReportFBOError(const char *function, const char *file, int line) { - unsigned int fbo_status = glCheckFramebufferStatus(GL_FRAMEBUFFER); + GLenum fbo_status = glCheckFramebufferStatus(GL_FRAMEBUFFER); if (fbo_status != GL_FRAMEBUFFER_COMPLETE) { const char *error = "unknown error"; |