3 files changed, 7 insertions, 0 deletions
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 9d5ee8e6..f27f10fe 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -1001,6 +1001,7 @@ extern bool gbRenderWorld2;
 		DebugMenuAddVarBool8("Debug", "Show Timebars", &gbShowTimebars, nil);
 #endif
 #ifndef FINAL
+		DebugMenuAddVarBool8("Debug", "Use debug render groups", &bDebugRenderGroups, nil);
 		DebugMenuAddVarBool8("Debug", "Print Memory Usage", &gbPrintMemoryUsage, nil);
 #ifdef USE_CUSTOM_ALLOCATOR
 		DebugMenuAddCmd("Debug", "Parse Heap", ParseHeap);
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 76749cb1..ef2d1c0f 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -11,6 +11,7 @@
 #endif
 #ifndef FINAL
 RtCharset *debugCharset;
+bool bDebugRenderGroups;
 #endif
 
 #ifdef PS2_ALPHA_TEST
@@ -117,6 +118,8 @@ SetCullMode(uint32 mode)
 void
 PushRendergroup(const char *name)
 {
+	if(!bDebugRenderGroups)
+		return;
 #if defined(RW_OPENGL)
 	if(GLAD_GL_KHR_debug)
 		glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, name);
@@ -130,6 +133,8 @@ PushRendergroup(const char *name)
 void
 PopRendergroup(void)
 {
+	if(!bDebugRenderGroups)
+		return;
 #if defined(RW_OPENGL)
 	if(GLAD_GL_KHR_debug)
 		glPopDebugGroup();
diff --git a/src/rw/RwHelper.h b/src/rw/RwHelper.h
index 1a5f64b1..0e04aece 100644
--- a/src/rw/RwHelper.h
+++ b/src/rw/RwHelper.h
@@ -1,5 +1,6 @@
 #pragma once
 
+extern bool bDebugRenderGroups;
 extern bool gPS2alphaTest;
 
 void OpenCharsetSafe();