diff options
| author | 2015-10-10 00:29:41 +0100 | |
|---|---|---|
| committer | 2015-10-17 17:09:07 +0100 | |
| commit | 2e8a7a7a0821b653b4ab7768e51fd818b670dfa3 (patch) | |
| tree | 2aef2d5317eb8fffc4db3b82c2c071203b7160be /externals/glad/src | |
| parent | Merge pull request #1189 from archshift/game-list-toggle-window (diff) | |
| download | yuzu-2e8a7a7a0821b653b4ab7768e51fd818b670dfa3.tar.gz yuzu-2e8a7a7a0821b653b4ab7768e51fd818b670dfa3.tar.xz yuzu-2e8a7a7a0821b653b4ab7768e51fd818b670dfa3.zip | |
Externals: Regenerate GLAD with GL_KHR_debug support.
Diffstat (limited to 'externals/glad/src')
| -rw-r--r-- | externals/glad/src/glad.c | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/externals/glad/src/glad.c b/externals/glad/src/glad.c index 014b54383..6af737acc 100644 --- a/externals/glad/src/glad.c +++ b/externals/glad/src/glad.c | |||
| @@ -595,6 +595,29 @@ PFNGLGETUNIFORMBLOCKINDEXPROC glad_glGetUniformBlockIndex; | |||
| 595 | PFNGLTEXIMAGE2DMULTISAMPLEPROC glad_glTexImage2DMultisample; | 595 | PFNGLTEXIMAGE2DMULTISAMPLEPROC glad_glTexImage2DMultisample; |
| 596 | PFNGLGETACTIVEUNIFORMPROC glad_glGetActiveUniform; | 596 | PFNGLGETACTIVEUNIFORMPROC glad_glGetActiveUniform; |
| 597 | PFNGLFRONTFACEPROC glad_glFrontFace; | 597 | PFNGLFRONTFACEPROC glad_glFrontFace; |
| 598 | int GLAD_GL_KHR_debug; | ||
| 599 | PFNGLDEBUGMESSAGECONTROLPROC glad_glDebugMessageControl; | ||
| 600 | PFNGLDEBUGMESSAGEINSERTPROC glad_glDebugMessageInsert; | ||
| 601 | PFNGLDEBUGMESSAGECALLBACKPROC glad_glDebugMessageCallback; | ||
| 602 | PFNGLGETDEBUGMESSAGELOGPROC glad_glGetDebugMessageLog; | ||
| 603 | PFNGLPUSHDEBUGGROUPPROC glad_glPushDebugGroup; | ||
| 604 | PFNGLPOPDEBUGGROUPPROC glad_glPopDebugGroup; | ||
| 605 | PFNGLOBJECTLABELPROC glad_glObjectLabel; | ||
| 606 | PFNGLGETOBJECTLABELPROC glad_glGetObjectLabel; | ||
| 607 | PFNGLOBJECTPTRLABELPROC glad_glObjectPtrLabel; | ||
| 608 | PFNGLGETOBJECTPTRLABELPROC glad_glGetObjectPtrLabel; | ||
| 609 | PFNGLGETPOINTERVPROC glad_glGetPointerv; | ||
| 610 | PFNGLDEBUGMESSAGECONTROLKHRPROC glad_glDebugMessageControlKHR; | ||
| 611 | PFNGLDEBUGMESSAGEINSERTKHRPROC glad_glDebugMessageInsertKHR; | ||
| 612 | PFNGLDEBUGMESSAGECALLBACKKHRPROC glad_glDebugMessageCallbackKHR; | ||
| 613 | PFNGLGETDEBUGMESSAGELOGKHRPROC glad_glGetDebugMessageLogKHR; | ||
| 614 | PFNGLPUSHDEBUGGROUPKHRPROC glad_glPushDebugGroupKHR; | ||
| 615 | PFNGLPOPDEBUGGROUPKHRPROC glad_glPopDebugGroupKHR; | ||
| 616 | PFNGLOBJECTLABELKHRPROC glad_glObjectLabelKHR; | ||
| 617 | PFNGLGETOBJECTLABELKHRPROC glad_glGetObjectLabelKHR; | ||
| 618 | PFNGLOBJECTPTRLABELKHRPROC glad_glObjectPtrLabelKHR; | ||
| 619 | PFNGLGETOBJECTPTRLABELKHRPROC glad_glGetObjectPtrLabelKHR; | ||
| 620 | PFNGLGETPOINTERVKHRPROC glad_glGetPointervKHR; | ||
| 598 | static void load_GL_VERSION_1_0(GLADloadproc load) { | 621 | static void load_GL_VERSION_1_0(GLADloadproc load) { |
| 599 | if(!GLAD_GL_VERSION_1_0) return; | 622 | if(!GLAD_GL_VERSION_1_0) return; |
| 600 | glad_glCullFace = (PFNGLCULLFACEPROC)load("glCullFace"); | 623 | glad_glCullFace = (PFNGLCULLFACEPROC)load("glCullFace"); |
| @@ -1008,8 +1031,34 @@ static void load_GL_VERSION_3_3(GLADloadproc load) { | |||
| 1008 | glad_glSecondaryColorP3ui = (PFNGLSECONDARYCOLORP3UIPROC)load("glSecondaryColorP3ui"); | 1031 | glad_glSecondaryColorP3ui = (PFNGLSECONDARYCOLORP3UIPROC)load("glSecondaryColorP3ui"); |
| 1009 | glad_glSecondaryColorP3uiv = (PFNGLSECONDARYCOLORP3UIVPROC)load("glSecondaryColorP3uiv"); | 1032 | glad_glSecondaryColorP3uiv = (PFNGLSECONDARYCOLORP3UIVPROC)load("glSecondaryColorP3uiv"); |
| 1010 | } | 1033 | } |
| 1034 | static void load_GL_KHR_debug(GLADloadproc load) { | ||
| 1035 | if(!GLAD_GL_KHR_debug) return; | ||
| 1036 | glad_glDebugMessageControl = (PFNGLDEBUGMESSAGECONTROLPROC)load("glDebugMessageControl"); | ||
| 1037 | glad_glDebugMessageInsert = (PFNGLDEBUGMESSAGEINSERTPROC)load("glDebugMessageInsert"); | ||
| 1038 | glad_glDebugMessageCallback = (PFNGLDEBUGMESSAGECALLBACKPROC)load("glDebugMessageCallback"); | ||
| 1039 | glad_glGetDebugMessageLog = (PFNGLGETDEBUGMESSAGELOGPROC)load("glGetDebugMessageLog"); | ||
| 1040 | glad_glPushDebugGroup = (PFNGLPUSHDEBUGGROUPPROC)load("glPushDebugGroup"); | ||
| 1041 | glad_glPopDebugGroup = (PFNGLPOPDEBUGGROUPPROC)load("glPopDebugGroup"); | ||
| 1042 | glad_glObjectLabel = (PFNGLOBJECTLABELPROC)load("glObjectLabel"); | ||
| 1043 | glad_glGetObjectLabel = (PFNGLGETOBJECTLABELPROC)load("glGetObjectLabel"); | ||
| 1044 | glad_glObjectPtrLabel = (PFNGLOBJECTPTRLABELPROC)load("glObjectPtrLabel"); | ||
| 1045 | glad_glGetObjectPtrLabel = (PFNGLGETOBJECTPTRLABELPROC)load("glGetObjectPtrLabel"); | ||
| 1046 | glad_glGetPointerv = (PFNGLGETPOINTERVPROC)load("glGetPointerv"); | ||
| 1047 | glad_glDebugMessageControlKHR = (PFNGLDEBUGMESSAGECONTROLKHRPROC)load("glDebugMessageControlKHR"); | ||
| 1048 | glad_glDebugMessageInsertKHR = (PFNGLDEBUGMESSAGEINSERTKHRPROC)load("glDebugMessageInsertKHR"); | ||
| 1049 | glad_glDebugMessageCallbackKHR = (PFNGLDEBUGMESSAGECALLBACKKHRPROC)load("glDebugMessageCallbackKHR"); | ||
| 1050 | glad_glGetDebugMessageLogKHR = (PFNGLGETDEBUGMESSAGELOGKHRPROC)load("glGetDebugMessageLogKHR"); | ||
| 1051 | glad_glPushDebugGroupKHR = (PFNGLPUSHDEBUGGROUPKHRPROC)load("glPushDebugGroupKHR"); | ||
| 1052 | glad_glPopDebugGroupKHR = (PFNGLPOPDEBUGGROUPKHRPROC)load("glPopDebugGroupKHR"); | ||
| 1053 | glad_glObjectLabelKHR = (PFNGLOBJECTLABELKHRPROC)load("glObjectLabelKHR"); | ||
| 1054 | glad_glGetObjectLabelKHR = (PFNGLGETOBJECTLABELKHRPROC)load("glGetObjectLabelKHR"); | ||
| 1055 | glad_glObjectPtrLabelKHR = (PFNGLOBJECTPTRLABELKHRPROC)load("glObjectPtrLabelKHR"); | ||
| 1056 | glad_glGetObjectPtrLabelKHR = (PFNGLGETOBJECTPTRLABELKHRPROC)load("glGetObjectPtrLabelKHR"); | ||
| 1057 | glad_glGetPointervKHR = (PFNGLGETPOINTERVKHRPROC)load("glGetPointervKHR"); | ||
| 1058 | } | ||
| 1011 | static void find_extensionsGL(void) { | 1059 | static void find_extensionsGL(void) { |
| 1012 | get_exts(); | 1060 | get_exts(); |
| 1061 | GLAD_GL_KHR_debug = has_ext("GL_KHR_debug"); | ||
| 1013 | } | 1062 | } |
| 1014 | 1063 | ||
| 1015 | static void find_coreGL(void) { | 1064 | static void find_coreGL(void) { |
| @@ -1086,6 +1135,7 @@ int gladLoadGLLoader(GLADloadproc load) { | |||
| 1086 | load_GL_VERSION_3_3(load); | 1135 | load_GL_VERSION_3_3(load); |
| 1087 | 1136 | ||
| 1088 | find_extensionsGL(); | 1137 | find_extensionsGL(); |
| 1138 | load_GL_KHR_debug(load); | ||
| 1089 | return GLVersion.major != 0 || GLVersion.minor != 0; | 1139 | return GLVersion.major != 0 || GLVersion.minor != 0; |
| 1090 | } | 1140 | } |
| 1091 | 1141 | ||
| @@ -1343,6 +1393,7 @@ static void load_GL_ES_VERSION_3_0(GLADloadproc load) { | |||
| 1343 | } | 1393 | } |
| 1344 | static void find_extensionsGLES2(void) { | 1394 | static void find_extensionsGLES2(void) { |
| 1345 | get_exts(); | 1395 | get_exts(); |
| 1396 | GLAD_GL_KHR_debug = has_ext("GL_KHR_debug"); | ||
| 1346 | } | 1397 | } |
| 1347 | 1398 | ||
| 1348 | static void find_coreGLES2(void) { | 1399 | static void find_coreGLES2(void) { |
| @@ -1399,6 +1450,7 @@ int gladLoadGLES2Loader(GLADloadproc load) { | |||
| 1399 | load_GL_ES_VERSION_3_0(load); | 1450 | load_GL_ES_VERSION_3_0(load); |
| 1400 | 1451 | ||
| 1401 | find_extensionsGLES2(); | 1452 | find_extensionsGLES2(); |
| 1453 | load_GL_KHR_debug(load); | ||
| 1402 | return GLVersion.major != 0 || GLVersion.minor != 0; | 1454 | return GLVersion.major != 0 || GLVersion.minor != 0; |
| 1403 | } | 1455 | } |
| 1404 | 1456 | ||