[rend2] Better debugging

Added debug group annotations and better shader names for captures with debug software like renderdoc.

Author: SomaZ

code/rd-rend2/CMakeLists.txt

@@ -32,6 +32,7 @@ set(SPRend2Files
 	"${SharedDir}/rd-rend2/tr_cache.h"
 	"${SharedDir}/rd-rend2/tr_cmds.cpp"
 	"${SharedDir}/rd-rend2/tr_curve.cpp"
+	"${SharedDir}/rd-rend2/tr_debug.cpp"
 	"${SharedDir}/rd-rend2/tr_decals.cpp"
 	"${SPDir}/rd-rend2/tr_draw.cpp"
 	"${SharedDir}/rd-rend2/tr_extensions.cpp"

codemp/rd-rend2/CMakeLists.txt

@@ -32,6 +32,7 @@ set(MPRend2Files
 	"${SharedDir}/rd-rend2/tr_cache.h"
 	"${SharedDir}/rd-rend2/tr_cmds.cpp"
 	"${SharedDir}/rd-rend2/tr_curve.cpp"
+	"${SharedDir}/rd-rend2/tr_debug.cpp"
 	"${SharedDir}/rd-rend2/tr_decals.cpp"
 	"${SharedDir}/rd-rend2/tr_extensions.cpp"
 	"${SharedDir}/rd-rend2/tr_extramath.cpp"

shared/rd-rend2/tr_backend.cpp

@@ -1489,10 +1489,12 @@ static void RB_RenderDrawSurfList( drawSurf_t *drawSurfs, int numDrawSurfs )
 
 	if ( backEnd.depthFill )
 	{
+		R_PushDebugGroup(AL_STAGE, "Depthpass");
 		RB_SubmitDrawSurfsForDepthFill(drawSurfs, numDrawSurfs, originalTime);
 	}
 	else
 	{
+		R_PushDebugGroup(AL_STAGE, "Mainpass");
 		RB_SubmitDrawSurfs(drawSurfs, numDrawSurfs, originalTime);
 
 		// TODO: Find a better place to add the fog cap surface

shared/rd-rend2/tr_debug.cpp

@@ -0,0 +1,33 @@
+/*
+===========================================================================
+Copyright (C) 2016, OpenJK contributors
+
+This file is part of the OpenJK source code.
+
+OpenJK is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 2 as
+published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, see <http://www.gnu.org/licenses/>.
+===========================================================================
+*/
+#include "tr_local.h"
+
+void R_PushDebugGroup(annotationLayer_t layer, const char* name)
+{
+	static GLuint currentLayer = (GLuint)AL_NONE;
+	assert(layer - currentLayer =< 1);
+	while (layer <= currentLayer)
+	{
+		qglPopDebugGroupKHR();
+		currentLayer--;
+	}
+	currentLayer = (GLuint)layer;
+	qglPushDebugGroupKHR(GL_DEBUG_SOURCE_APPLICATION, currentLayer - 1, -1, name);
+}