ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1378 from lioncash/gl 

GLUtil: Change return type from GLuint to GLenum for OpenGL_ReportGLError.
This commit is contained in:
skidau 2014-10-26 13:44:34 +11:00
parent 5f21683343 3509a6d03e
commit 7c58eb344d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoBackends/OGL/GLUtil.cpp
View File

@ -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) if (err != GL_NO_ERROR)
{ {
ERROR_LOG(VIDEO, "%s:%d: (%s) OpenGL error 0x%x\n", 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) 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) if (fbo_status != GL_FRAMEBUFFER_COMPLETE)
{ {
const char *error = "unknown error"; const char *error = "unknown error";

2
Source/Core/VideoBackends/OGL/GLUtil.h
View File

@ -19,7 +19,7 @@ void InitInterface();
GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader); GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader);
// Error reporting - use the convenient macros. // Error reporting - use the convenient macros.
GLuint OpenGL_ReportGLError(const char *function, const char *file, int line); GLenum OpenGL_ReportGLError(const char *function, const char *file, int line);
bool OpenGL_ReportFBOError(const char *function, const char *file, int line); bool OpenGL_ReportFBOError(const char *function, const char *file, int line);
#if defined(_DEBUG) || defined(DEBUGFAST) #if defined(_DEBUG) || defined(DEBUGFAST)