From 11bc8ea6022e430a47ba1040925dde50091d75c4 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Thu, 18 Feb 2021 20:31:53 +0100
Subject: [PATCH] update librw; render groups only if extension supported
---
src/rw/RwHelper.cpp | 6 ++++--
vendor/librw | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 35617808..11fde99d 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -107,7 +107,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));
@@ -119,7 +120,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
index 65c619b3..cc550ff6 160000
--- a/vendor/librw
+++ b/vendor/librw
@@ -1 +1 @@
-Subproject commit 65c619b3e7dcec6f5dbd05d3203b530d667ba90f
+Subproject commit cc550ff69c06ec03aae9ac7ac1f634703800660f