mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-17 10:21:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'macos-gldebug-hotfix' into 'master'

Browse Source 
Disable OpenGL Debug stuff when SDL doesn't provide the necessary definitions

See merge request OpenMW/openmw!304
This commit is contained in:
AnyOldName3 2020-09-21 01:45:16 +00:00
commit bb2f89b497
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/debug/gldebug.cpp
View File

@ -40,6 +40,7 @@ either expressed or implied, of the FreeBSD Project.
void debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam) void debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam)
{ {
#ifdef GL_DEBUG_OUTPUT
std::string srcStr; std::string srcStr;
switch (source) switch (source)
{ {
@ -96,10 +97,12 @@ void debugCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsiz
} }
Log(logSeverity) << "OpenGL " << typeStr << " [" << srcStr << "]: " << message; Log(logSeverity) << "OpenGL " << typeStr << " [" << srcStr << "]: " << message;
#endif
} }
void enableGLDebugExtension(unsigned int contextID) void enableGLDebugExtension(unsigned int contextID)
{ {
#ifdef GL_DEBUG_OUTPUT
typedef void (GL_APIENTRY *DEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam); typedef void (GL_APIENTRY *DEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *message, const void *userParam);
typedef void (GL_APIENTRY *GLDebugMessageControlFunction)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); typedef void (GL_APIENTRY *GLDebugMessageControlFunction)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
typedef void (GL_APIENTRY *GLDebugMessageCallbackFunction)(DEBUGPROC, const void* userParam); typedef void (GL_APIENTRY *GLDebugMessageCallbackFunction)(DEBUGPROC, const void* userParam);
@ -132,6 +135,7 @@ void enableGLDebugExtension(unsigned int contextID)
Log(Debug::Info) << "OpenGL debug callback attached."; Log(Debug::Info) << "OpenGL debug callback attached.";
} }
else else
#endif
Log(Debug::Error) << "Unable to attach OpenGL debug callback."; Log(Debug::Error) << "Unable to attach OpenGL debug callback.";
} }