summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-02-18 20:31:46 +0100
committeraap <aap@papnet.eu>2021-02-18 20:31:46 +0100
commit6245a17e168822300d7bb1f5a308305872dff2bc (patch)
tree0e543b6414dd8802e8a8ae9774c90d6ba626c8e0
parentCMake: MSS / mpg123 compilation fixes (diff)
downloadre3-6245a17e168822300d7bb1f5a308305872dff2bc.tar
re3-6245a17e168822300d7bb1f5a308305872dff2bc.tar.gz
re3-6245a17e168822300d7bb1f5a308305872dff2bc.tar.bz2
re3-6245a17e168822300d7bb1f5a308305872dff2bc.tar.lz
re3-6245a17e168822300d7bb1f5a308305872dff2bc.tar.xz
re3-6245a17e168822300d7bb1f5a308305872dff2bc.tar.zst
re3-6245a17e168822300d7bb1f5a308305872dff2bc.zip
-rw-r--r--src/rw/RwHelper.cpp6
m---------vendor/librw0
2 files changed, 4 insertions, 2 deletions
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index e98b58f6..76749cb1 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -118,7 +118,8 @@ void
PushRendergroup(const char *name)
{
#if defined(RW_OPENGL)
- glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, name);
+ if(GLAD_GL_KHR_debug)
+ glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, name);
#elif defined(RW_D3D9)
static WCHAR tmp[256];
MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, name, -1, tmp, sizeof(tmp));
@@ -130,7 +131,8 @@ void
PopRendergroup(void)
{
#if defined(RW_OPENGL)
- glPopDebugGroup();
+ if(GLAD_GL_KHR_debug)
+ glPopDebugGroup();
#elif defined(RW_D3D9)
D3DPERF_EndEvent();
#endif
diff --git a/vendor/librw b/vendor/librw
-Subproject 65c619b3e7dcec6f5dbd05d3203b530d667ba90
+Subproject cc550ff69c06ec03aae9ac7ac1f634703800660