diff --git a/src/client/cl_main.c b/src/client/cl_main.c
index 3e93c1bd8..b3eab6cbc 100644
--- a/src/client/cl_main.c
+++ b/src/client/cl_main.c
@@ -879,9 +879,11 @@ cvar_t	*vid_xpos;			// X coordinate of window position
 cvar_t	*vid_ypos;			// Y coordinate of window position
 cvar_t	*r_noborder;
 
+#ifdef USE_OPENGL_API
 cvar_t *r_allowSoftwareGL;	// don't abort out if the pixelformat claims software
-cvar_t *r_swapInterval;
 cvar_t *r_glDriver;
+#endif
+cvar_t *r_swapInterval;
 cvar_t *r_displayRefresh;
 cvar_t *r_fullscreen;
 cvar_t *r_mode;
@@ -4001,12 +4003,14 @@ static void CL_ToggleImgui_f( void )
 static void CL_InitGLimp_Cvars( void )
 {
 	// shared with GLimp
+#ifdef USE_OPENGL_API
 	r_allowSoftwareGL = Cvar_Get( "r_allowSoftwareGL", "0", CVAR_LATCH );
-	Cvar_SetDescription( r_allowSoftwareGL, "Legacy cvar (ignored). OpenGL renderer removed; Vulkan only." );
+	Cvar_SetDescription( r_allowSoftwareGL, "Allow software OpenGL rendering if hardware acceleration is unavailable." );
+	r_glDriver = Cvar_Get( "r_glDriver", OPENGL_DRIVER_NAME, CVAR_ARCHIVE_ND | CVAR_LATCH );
+	Cvar_SetDescription( r_glDriver, "OpenGL driver library name." );
+#endif
 	r_swapInterval = Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE_ND );
 	Cvar_SetDescription( r_swapInterval, "V-blanks to wait before swapping buffers.\n 0: No V-Sync\n 1: Synced to the monitor's refresh rate." );
-	r_glDriver = Cvar_Get( "r_glDriver", OPENGL_DRIVER_NAME, CVAR_ARCHIVE_ND | CVAR_LATCH );
-	Cvar_SetDescription( r_glDriver, "Legacy cvar (ignored). OpenGL renderer removed; Vulkan only." );
 
 	r_displayRefresh = Cvar_Get( "r_displayRefresh", "0", CVAR_LATCH );
 	Cvar_CheckRange( r_displayRefresh, "0", "500", CV_INTEGER );
diff --git a/src/client/client.h b/src/client/client.h
index 52b13d6db..6ecfb58a9 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -428,9 +428,11 @@ extern	cvar_t	*vid_xpos;
 extern	cvar_t	*vid_ypos;
 extern	cvar_t	*r_noborder;
 
+#ifdef USE_OPENGL_API
 extern	cvar_t	*r_allowSoftwareGL;
-extern	cvar_t	*r_swapInterval;
 extern	cvar_t	*r_glDriver;
+#endif
+extern	cvar_t	*r_swapInterval;
 
 extern	cvar_t	*r_displayRefresh;
 extern	cvar_t	*r_fullscreen;
diff --git a/src/platform/sdl/sdl_glimp.c b/src/platform/sdl/sdl_glimp.c
index 2a79c8aae..dedb87da2 100644
--- a/src/platform/sdl/sdl_glimp.c
+++ b/src/platform/sdl/sdl_glimp.c
@@ -447,8 +447,10 @@ static int GLW_SetMode( int mode, const char *modeFS, qboolean fullscreen, qbool
 		
 			SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
 
+#ifdef USE_OPENGL_API
 			if ( !r_allowSoftwareGL->integer )
 				SDL_GL_SetAttribute( SDL_GL_ACCELERATED_VISUAL, 1 );
+#endif
 		}
 
 		if ( ( SDL_window = SDL_CreateWindow( cl_title, x, y, config->vidWidth, config->vidHeight, flags ) ) == NULL )
@@ -692,7 +694,9 @@ void GLimp_Init( glconfig_t *config )
 	in_nograb = Cvar_Get( "in_nograb", "0", 0 );
 	Cvar_SetDescription( in_nograb, "Do not capture mouse in game, may be useful during online streaming." );
 
+#ifdef USE_OPENGL_API
 	r_allowSoftwareGL = Cvar_Get( "r_allowSoftwareGL", "0", CVAR_LATCH );
+#endif
 
 	r_swapInterval = Cvar_Get( "r_swapInterval", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	r_stereoEnabled = Cvar_Get( "r_stereoEnabled", "0", CVAR_ARCHIVE | CVAR_LATCH );
diff --git a/src/renderers/vulkan/tr_animation.c b/src/renderers/vulkan/tr_animation.c
index 74aa8a49b..864d915aa 100644
--- a/src/renderers/vulkan/tr_animation.c
+++ b/src/renderers/vulkan/tr_animation.c
@@ -411,9 +411,6 @@ void RB_MDRSurfaceAnim( mdrSurface_t *surface )
 			tempVert[1] += w->boneWeight * ( DotProduct( bone->matrix[1], w->offset ) + bone->matrix[1][3] );
 			tempVert[2] += w->boneWeight * ( DotProduct( bone->matrix[2], w->offset ) + bone->matrix[2][3] );
 			
-#ifdef USE_TESS_NEEDS_NORMAL
-			if ( tess.needsNormal )
-#endif
 			{
 				tempNormal[0] += w->boneWeight * DotProduct( bone->matrix[0], v->normal );
 				tempNormal[1] += w->boneWeight * DotProduct( bone->matrix[1], v->normal );
@@ -425,9 +422,6 @@ void RB_MDRSurfaceAnim( mdrSurface_t *surface )
 		tess.xyz[baseVertex + j][1] = tempVert[1];
 		tess.xyz[baseVertex + j][2] = tempVert[2];
 
-#ifdef USE_TESS_NEEDS_NORMAL
-		if ( tess.needsNormal )
-#endif
 		{
 			tess.normal[baseVertex + j][0] = tempNormal[0];
 			tess.normal[baseVertex + j][1] = tempNormal[1];
diff --git a/src/renderers/vulkan/tr_local.h b/src/renderers/vulkan/tr_local.h
index 8d41478a6..f57176449 100644
--- a/src/renderers/vulkan/tr_local.h
+++ b/src/renderers/vulkan/tr_local.h
@@ -42,13 +42,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #define MAX_TEXTURE_SIZE	32768
 
-#ifdef USE_VBO
-#define USE_VBO_GRID		/* put SF_GRID to VBO */
-#endif
-
-//#define USE_TESS_NEEDS_NORMAL
-//#define USE_TESS_NEEDS_ST2
-
 #define SH_COEFF_COUNT 9
 
 #include "../../qcommon/q_shared.h"
@@ -2047,9 +2040,7 @@ image_t *vk_create_pbr_albedo_srgb( const char *albedoMapName, imgFlags_t flags
 //
 // tr_surface.c
 //
-#ifdef USE_VBO_GRID
-void		RB_SurfaceGridEstimate( srfGridMesh_t *cv, int *numVertexes, int *numIndexes ); 
-#endif
+void		RB_SurfaceGridEstimate( srfGridMesh_t *cv, int *numVertexes, int *numIndexes );
 
 /*
 ====================================================================
@@ -2114,14 +2105,6 @@ typedef struct shaderCommands_s
 #endif
 #endif
 
-	// info extracted from current shader
-#ifdef USE_TESS_NEEDS_NORMAL
-	int			needsNormal;
-#endif
-#ifdef USE_TESS_NEEDS_ST2
-	int			needsST2;
-#endif
-
 	int			numPasses;
 	shaderStage_t **xstages;
 
diff --git a/src/renderers/vulkan/tr_main.c b/src/renderers/vulkan/tr_main.c
index 5f1eef047..9909ca406 100644
--- a/src/renderers/vulkan/tr_main.c
+++ b/src/renderers/vulkan/tr_main.c
@@ -1078,9 +1078,6 @@ static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, qboolean *isMirror
 	RB_BeginSurface( shader, fogNum );
 #ifdef USE_VBO
 	tess.allowVBO = qfalse;
-#endif
-#ifdef USE_TESS_NEEDS_NORMAL
-	tess.needsNormal = qtrue;
 #endif
 	rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );
 
diff --git a/src/renderers/vulkan/tr_shade.c b/src/renderers/vulkan/tr_shade.c
index c05d28240..555634705 100644
--- a/src/renderers/vulkan/tr_shade.c
+++ b/src/renderers/vulkan/tr_shade.c
@@ -390,17 +390,6 @@ void RB_BeginSurface( shader_t *shader, int fogNum ) {
 		tess.dlightUpdateParams = qtrue;
 	}
 
-#ifdef USE_TESS_NEEDS_NORMAL
-	tess.needsNormal = state->needsNormal || tess.dlightPass || r_shownormals->integer ||
-		( backEnd.currentEntity == &tr.worldEntity &&
-		( ( r_shDebugView && r_shDebugView->integer ) ||
-		( r_shWorldLighting && r_shWorldLighting->integer && r_shLighting && r_shLighting->integer ) ) );
-#endif
-
-#ifdef USE_TESS_NEEDS_ST2
-	tess.needsST2 = state->needsST2;
-#endif
-
 	tess.numIndexes = 0;
 	tess.numVertexes = 0;
 	tess.sdfUiEdge = -1.0f;
diff --git a/src/renderers/vulkan/tr_surface.c b/src/renderers/vulkan/tr_surface.c
index 18a8aacab..d38a6d9ea 100644
--- a/src/renderers/vulkan/tr_surface.c
+++ b/src/renderers/vulkan/tr_surface.c
@@ -405,9 +405,6 @@ static void RB_SurfaceTriangles( const srfTriangles_t *srf ) {
 		xyz[1] = dv->xyz[1];
 		xyz[2] = dv->xyz[2];
 
-#ifdef USE_TESS_NEEDS_NORMAL
-		if ( tess.needsNormal )
-#endif
 		{
 			normal[0] = dv->normal[0];
 			normal[1] = dv->normal[1];
@@ -433,9 +430,6 @@ static void RB_SurfaceTriangles( const srfTriangles_t *srf ) {
 		texCoords0[0] = dv->st[0];
 		texCoords0[1] = dv->st[1];
 
-#ifdef USE_TESS_NEEDS_ST2
-		if ( tess.needsST2 )
-#endif
 		{
 			texCoords1[0] = dv->lightmap[0];
 			texCoords1[1] = dv->lightmap[1];
@@ -988,9 +982,6 @@ static void RB_SurfaceFace( const srfSurfaceFace_t *surf ) {
 
 	numPoints = surf->numPoints;
 
-#ifdef USE_TESS_NEEDS_NORMAL
-	if ( tess.needsNormal )
-#endif
 	{
 		if ( surf->normals ) {
 			// per-vertex normals for non-coplanar faces
@@ -1017,9 +1008,6 @@ static void RB_SurfaceFace( const srfSurfaceFace_t *surf ) {
 #ifdef USE_VK_PBR
 		tess.texCoords[0][ndx][0] = v[6];
 		tess.texCoords[0][ndx][1] = v[7];
-#ifdef USE_TESS_NEEDS_ST2
-		if ( tess.needsST2 )
-#endif
 		{
 			tess.texCoords[1][ndx][0] = v[8];
 			tess.texCoords[1][ndx][1] = v[9];
@@ -1032,9 +1020,6 @@ static void RB_SurfaceFace( const srfSurfaceFace_t *surf ) {
 #else
 		tess.texCoords[0][ndx][0] = v[3];
 		tess.texCoords[0][ndx][1] = v[4];
-#ifdef USE_TESS_NEEDS_ST2
-		if ( tess.needsST2 )
-#endif
 		{
 			tess.texCoords[1][ndx][0] = v[5];
 			tess.texCoords[1][ndx][1] = v[6];
@@ -1083,7 +1068,6 @@ static float LodErrorForVolume( vec3_t local, float radius ) {
 	return r_lodCurveError->value / d;
 }
 
-#ifdef USE_VBO_GRID
 void RB_SurfaceGridEstimate( srfGridMesh_t *cv, int *numVertexes, int *numIndexes )
 {
 	int		lodWidth, lodHeight;
@@ -1147,7 +1131,6 @@ void RB_SurfaceGridEstimate( srfGridMesh_t *cv, int *numVertexes, int *numIndexe
 	tess.numVertexes = 0;
 	tess.numIndexes = 0;
 }
-#endif // USE_VBO_GRID
 
 /*
 =============
@@ -1178,7 +1161,6 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 	int		dlightBits;
 	int		*vDlightBits;
 
-#ifdef USE_VBO_GRID
 	if ( tess.allowVBO && cv->vboItemIndex && !cv->dlightBits ) {
 		// transition to vbo render list
 		if ( tess.vboIndex == 0 ) {
@@ -1196,23 +1178,16 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 	}
 
 	VBO_Flush();
-#else
-#ifdef USE_VBO
-	VBO_Flush();
-#endif
-#endif
 
 	dlightBits = cv->dlightBits;
 	tess.dlightBits |= dlightBits;
 
-#ifdef USE_VBO_GRID
 	tess.surfType = SF_GRID;
 
 	// determine the allowable discrepance
 	if ( cv->vboItemIndex && ( tr.mapLoading || ( tess.dlightPass && tess.shader->isStaticShader ) ) )
 		lodError = r_lodCurveError->value; // fixed quality for VBO
 	else
-#endif // USE_VBO_GRID
 		lodError = LodErrorForVolume( cv->lodOrigin, cv->lodRadius );
 
 	// determine which rows and columns of the subdivision
@@ -1253,13 +1228,11 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 			if ( vrows < 2 || irows < 1 ) {
 				if ( tr.mapLoading ) {
 					// estimate and flush
-#ifdef USE_VBO_GRID
 					if ( cv->vboItemIndex ) {
 						VBO_PushData( cv->vboItemIndex, &tess );
 						tess.numIndexes = 0;
 						tess.numVertexes = 0;
 					} else
-#endif // USE_VBO_GRID
 						ri.Error( ERR_DROP, "Unexpected grid flush during map loading!\n" );
 				} else {
 					RB_EndSurface();
@@ -1300,17 +1273,11 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
 				xyz[2] = dv->xyz[2];
 				texCoords0[0] = dv->st[0];
 				texCoords0[1] = dv->st[1];
-#ifdef USE_TESS_NEEDS_ST2
-				if ( tess.needsST2 )
-#endif
 				{
 					texCoords1[0] = dv->lightmap[0];
 					texCoords1[1] = dv->lightmap[1];
 					texCoords1 += 2;
 				}
-#ifdef USE_TESS_NEEDS_NORMAL
-				if ( tess.needsNormal )
-#endif
 				{
 					normal[0] = dv->normal[0];
 					normal[1] = dv->normal[1];
diff --git a/src/renderers/vulkan/vk_shader_modules.c b/src/renderers/vulkan/vk_shader_modules.c
index a3e423729..85bfcdc5d 100644
--- a/src/renderers/vulkan/vk_shader_modules.c
+++ b/src/renderers/vulkan/vk_shader_modules.c
@@ -37,9 +37,6 @@ static VkShaderModule vk_shader_module_from_spirv( const uint8_t *bytes, int cou
 void vk_create_shader_modules( void )
 {
 	int i, j, k;
-#ifndef USE_VK_PBR
-	int l;
-#endif
 
 	vk.modules.frag.gen0_df = SHADER_MODULE( frag_tx0_df );
 	SET_OBJECT_NAME( vk.modules.frag.gen0_df, "single-texture df fragment module", VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT );
@@ -69,126 +66,7 @@ void vk_create_shader_modules( void )
 		}
 	}
 
-#ifdef USE_VK_PBR
 	vk_bind_generated_shaders();
-#else
-	vk.modules.vert.gen[0][0][0][0] = SHADER_MODULE( vert_tx0 );
-	vk.modules.vert.gen[0][0][0][1] = SHADER_MODULE( vert_tx0_fog );
-	vk.modules.vert.gen[0][0][1][0] = SHADER_MODULE( vert_tx0_env );
-	vk.modules.vert.gen[0][0][1][1] = SHADER_MODULE( vert_tx0_env_fog );
-
-	vk.modules.vert.gen[1][0][0][0] = SHADER_MODULE( vert_tx1 );
-	vk.modules.vert.gen[1][0][0][1] = SHADER_MODULE( vert_tx1_fog );
-	vk.modules.vert.gen[1][0][1][0] = SHADER_MODULE( vert_tx1_env );
-	vk.modules.vert.gen[1][0][1][1] = SHADER_MODULE( vert_tx1_env_fog );
-
-	vk.modules.vert.gen[1][1][0][0] = SHADER_MODULE( vert_tx1_cl );
-	vk.modules.vert.gen[1][1][0][1] = SHADER_MODULE( vert_tx1_cl_fog );
-	vk.modules.vert.gen[1][1][1][0] = SHADER_MODULE( vert_tx1_cl_env );
-	vk.modules.vert.gen[1][1][1][1] = SHADER_MODULE( vert_tx1_cl_env_fog );
-
-	vk.modules.vert.gen[2][0][0][0] = SHADER_MODULE( vert_tx2 );
-	vk.modules.vert.gen[2][0][0][1] = SHADER_MODULE( vert_tx2_fog );
-	vk.modules.vert.gen[2][0][1][0] = SHADER_MODULE( vert_tx2_env );
-	vk.modules.vert.gen[2][0][1][1] = SHADER_MODULE( vert_tx2_env_fog );
-
-	vk.modules.vert.gen[2][1][0][0] = SHADER_MODULE( vert_tx2_cl );
-	vk.modules.vert.gen[2][1][0][1] = SHADER_MODULE( vert_tx2_cl_fog );
-	vk.modules.vert.gen[2][1][1][0] = SHADER_MODULE( vert_tx2_cl_env );
-	vk.modules.vert.gen[2][1][1][1] = SHADER_MODULE( vert_tx2_cl_env_fog );
-
-	for ( i = 0; i < 3; i++ ) {
-		const char *tx[] = { "single", "double", "triple" };
-		const char *cl[] = { "", "+cl" };
-		const char *env[] = { "", "+env" };
-		const char *fog[] = { "", "+fog" };
-		for ( j = 0; j < 2; j++ ) {
-			for ( k = 0; k < 2; k++ ) {
-				for ( l = 0; l < 2; l++ ) {
-					const char *s = va( "%s-texture%s%s%s vertex module", tx[i], cl[j], env[k], fog[l] );
-					SET_OBJECT_NAME( vk.modules.vert.gen[i][j][k][l], s, VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT );
-				}
-			}
-		}
-	}
-
-	vk.modules.vert.ident1[0][0][0] = SHADER_MODULE( vert_tx0_ident1 );
-	vk.modules.vert.ident1[0][0][1] = SHADER_MODULE( vert_tx0_ident1_fog );
-	vk.modules.vert.ident1[0][1][0] = SHADER_MODULE( vert_tx0_ident1_env );
-	vk.modules.vert.ident1[0][1][1] = SHADER_MODULE( vert_tx0_ident1_env_fog );
-	vk.modules.vert.ident1[1][0][0] = SHADER_MODULE( vert_tx1_ident1 );
-	vk.modules.vert.ident1[1][0][1] = SHADER_MODULE( vert_tx1_ident1_fog );
-	vk.modules.vert.ident1[1][1][0] = SHADER_MODULE( vert_tx1_ident1_env );
-	vk.modules.vert.ident1[1][1][1] = SHADER_MODULE( vert_tx1_ident1_env_fog );
-	for ( i = 0; i < 2; i++ ) {
-		const char *tx[] = { "single", "double" };
-		const char *env[] = { "", "+env" };
-		const char *fog[] = { "", "+fog" };
-		for ( j = 0; j < 2; j++ ) {
-			for ( k = 0; k < 2; k++ ) {
-				const char *s = va( "%s-texture identity%s%s vertex module", tx[i], env[j], fog[k] );
-				SET_OBJECT_NAME( vk.modules.vert.ident1[i][j][k], s, VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT );
-			}
-		}
-	}
-
-	vk.modules.frag.ident1[0][0] = SHADER_MODULE( frag_tx0_ident1 );
-	vk.modules.frag.ident1[0][1] = SHADER_MODULE( frag_tx0_ident1_fog );
-	vk.modules.frag.ident1[1][0] = SHADER_MODULE( frag_tx1_ident1 );
-	vk.modules.frag.ident1[1][1] = SHADER_MODULE( frag_tx1_ident1_fog );
-	for ( i = 0; i < 2; i++ ) {
-		const char *tx[] = { "single", "double" };
-		const char *fog[] = { "", "+fog" };
-		for ( j = 0; j < 2; j++ ) {
-			const char *s = va( "%s-texture identity%s fragment module", tx[i], fog[j] );
-			SET_OBJECT_NAME( vk.modules.frag.ident1[i][j], s, VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT );
-		}
-	}
-
-	vk.modules.vert.fixed[0][0][0] = SHADER_MODULE( vert_tx0_fixed );
-	vk.modules.vert.fixed[0][0][1] = SHADER_MODULE( vert_tx0_fixed_fog );
-	vk.modules.vert.fixed[0][1][0] = SHADER_MODULE( vert_tx0_fixed_env );
-	vk.modules.vert.fixed[0][1][1] = SHADER_MODULE( vert_tx0_fixed_env_fog );
-	vk.modules.vert.fixed[1][0][0] = SHADER_MODULE( vert_tx1_fixed );
-	vk.modules.vert.fixed[1][0][1] = SHADER_MODULE( vert_tx1_fixed_fog );
-	vk.modules.vert.fixed[1][1][0] = SHADER_MODULE( vert_tx1_fixed_env );
-	vk.modules.vert.fixed[1][1][1] = SHADER_MODULE( vert_tx1_fixed_env_fog );
-	for ( i = 0; i < 2; i++ ) {
-		const char *tx[] = { "single", "double" };
-		const char *env[] = { "", "+env" };
-		const char *fog[] = { "", "+fog" };
-		for ( j = 0; j < 2; j++ ) {
-			for ( k = 0; k < 2; k++ ) {
-				const char *s = va( "%s-texture fixed-color%s%s vertex module", tx[i], env[j], fog[k] );
-				SET_OBJECT_NAME( vk.modules.vert.fixed[i][j][k], s, VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT );
-			}
-		}
-	}
-
-	vk.modules.frag.fixed[0][0] = SHADER_MODULE( frag_tx0_fixed );
-	vk.modules.frag.fixed[0][1] = SHADER_MODULE( frag_tx0_fixed_fog );
-	vk.modules.frag.fixed[1][0] = SHADER_MODULE( frag_tx1_fixed );
-	vk.modules.frag.fixed[1][1] = SHADER_MODULE( frag_tx1_fixed_fog );
-	for ( i = 0; i < 2; i++ ) {
-		const char *tx[] = { "single", "double" };
-		const char *fog[] = { "", "+fog" };
-		for ( j = 0; j < 2; j++ ) {
-			const char *s = va( "%s-texture fixed-color%s fragment module", tx[i], fog[j] );
-			SET_OBJECT_NAME( vk.modules.frag.fixed[i][j], s, VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT );
-		}
-	}
-
-	vk.modules.frag.ent[0][0] = SHADER_MODULE( frag_tx0_ent );
-	vk.modules.frag.ent[0][1] = SHADER_MODULE( frag_tx0_ent_fog );
-	for ( i = 0; i < 1; i++ ) {
-		const char *tx[] = { "single" /*, "double" */};
-		const char *fog[] = { "", "+fog" };
-		for ( j = 0; j < 2; j++ ) {
-			const char *s = va( "%s-texture entity-color%s fragment module", tx[i], fog[j] );
-			SET_OBJECT_NAME( vk.modules.frag.ent[i][j], s, VK_DEBUG_REPORT_OBJECT_TYPE_SHADER_MODULE_EXT );
-		}
-	}
-#endif
 
 	vk.modules.vert.light[0] = SHADER_MODULE( vert_light );
 	vk.modules.vert.light[1] = SHADER_MODULE( vert_light_fog );
diff --git a/src/renderers/vulkan/vk_vbo.c b/src/renderers/vulkan/vk_vbo.c
index 021b58639..b0704d31e 100644
--- a/src/renderers/vulkan/vk_vbo.c
+++ b/src/renderers/vulkan/vk_vbo.c
@@ -594,9 +594,7 @@ void R_BuildWorldVBO( msurface_t *surf, int surfCount )
 	msurface_t **surfList;
 	srfSurfaceFace_t *face;
 	srfTriangles_t *tris;
-#ifdef USE_VBO_GRID
 	srfGridMesh_t *grid;
-#endif
 	msurface_t *sf;
 	int ibo_size;
 	int vbo_size;
@@ -650,7 +648,6 @@ void R_BuildWorldVBO( msurface_t *surf, int surfCount )
 			sf->shader->numIndexes += tris->numIndexes;
 			continue;
 		}
-#ifdef USE_VBO_GRID
 		grid = (srfGridMesh_t *) sf->data;
 		if ( grid->surfaceType == SF_GRID && isStaticShader( sf->shader ) ) {
 			grid->vboItemIndex = ++numStaticSurfaces;
@@ -667,7 +664,6 @@ void R_BuildWorldVBO( msurface_t *surf, int surfCount )
 			sf->shader->numIndexes += grid->vboExpectIndices;
 			continue;
 		}
-#endif // USE_VBO_GRID
 	}
 	if ( numStaticSurfaces == 0 ) {
 		ri.Printf( PRINT_ALL, "...no static surfaces for VBO\n" );
@@ -721,13 +717,11 @@ void R_BuildWorldVBO( msurface_t *surf, int surfCount )
 			surfList[ n++ ] = sf;
 			continue;
 		}
-#ifdef USE_VBO_GRID
 		grid = (srfGridMesh_t *) sf->data;
 		if ( grid->surfaceType == SF_GRID && grid->vboItemIndex ) {
 			surfList[ n++ ] = sf;
 			continue;
 		}
-#endif // USE_VBO_GRID
 	}
 
 	if ( n != numStaticSurfaces ) {
@@ -748,41 +742,29 @@ void R_BuildWorldVBO( msurface_t *surf, int surfCount )
 		sf = surfList[ i ];
 		face = (srfSurfaceFace_t *) sf->data;
 		tris = (srfTriangles_t *) sf->data;
-#ifdef USE_VBO_GRID
 		grid = (srfGridMesh_t *) sf->data;
-#endif
 		if ( face->surfaceType == SF_FACE )
 			face->vboItemIndex = i + 1;
 		else if (tris->surfaceType == SF_TRIANGLES) {
 			tris->vboItemIndex = i + 1;
-#ifdef USE_VBO_GRID
 		} else if (grid->surfaceType == SF_GRID) {
 			grid->vboItemIndex = i + 1;
-#endif
 		} else {
 			ri.Error( ERR_DROP, "Unexpected surface type" );
 		}
 		initItem( vbo->items + i + 1 );
 		RB_BeginSurface( sf->shader, 0 );
 		tess.allowVBO = qfalse; // block execution of VBO path as we need to tesselate geometry
-#ifdef USE_TESS_NEEDS_NORMAL
-		tess.needsNormal = qtrue;
-#endif
-#ifdef USE_TESS_NEEDS_ST2
-		tess.needsST2 = qtrue;
-#endif
 		// tesselate
 		rb_surfaceTable[ *sf->data ]( sf->data ); // VBO_PushData() may be called multiple times there
 		// setup colors and texture coordinates
 		VBO_PushData( i + 1, &tess );
-#ifdef USE_VBO_GRID
 		if ( grid->surfaceType == SF_GRID ) {
 			vbo_item_t *vi = vbo->items + i + 1;
 			if ( vi->num_vertexes != grid->vboExpectVertices || vi->num_indexes != grid->vboExpectIndices ) {
 				ri.Error( ERR_DROP, "Unexpected grid vertexes/indexes count" );
 			}
 		}
-#endif // USE_VBO_GRID
 		tess.numIndexes = 0;
 		tess.numVertexes = 0;
 	}
diff --git a/tests/scripts/test_vulkan_regression_source_guards.sh b/tests/scripts/test_vulkan_regression_source_guards.sh
index 0b8d3452f..a95d5b1ce 100755
--- a/tests/scripts/test_vulkan_regression_source_guards.sh
+++ b/tests/scripts/test_vulkan_regression_source_guards.sh
@@ -43,6 +43,9 @@ VK_HEADER="$PROJECT_ROOT/src/renderers/vulkan/vk.h"
 TR_INIT="$PROJECT_ROOT/src/renderers/vulkan/tr_init.c"
 TR_SHADE="$PROJECT_ROOT/src/renderers/vulkan/tr_shade.c"
 VK_FRAME_SUBMIT="$PROJECT_ROOT/src/renderers/vulkan/vk_frame_submit.c"
+VK_SHADER_MODULES="$PROJECT_ROOT/src/renderers/vulkan/vk_shader_modules.c"
+TR_LOCAL="$PROJECT_ROOT/src/renderers/vulkan/tr_local.h"
+CL_MAIN="$PROJECT_ROOT/src/client/cl_main.c"
 COMPILE_SHADERS="$PROJECT_ROOT/scripts/compile_shaders.sh"
 
 assert_file_exists "$VK_INSTANCE"
@@ -54,8 +57,19 @@ assert_file_exists "$VK_HEADER"
 assert_file_exists "$TR_INIT"
 assert_file_exists "$TR_SHADE"
 assert_file_exists "$VK_FRAME_SUBMIT"
+assert_file_exists "$VK_SHADER_MODULES"
+assert_file_exists "$TR_LOCAL"
+assert_file_exists "$CL_MAIN"
 assert_file_exists "$COMPILE_SHADERS"
 
+# Compile-time rollout flags removed from Vulkan renderer (always-on paths inlined).
+assert_not_matches_regex "$TR_LOCAL" "USE_VBO_GRID|USE_TESS_NEEDS" "stale VBO grid / tess needs compile flags removed"
+assert_not_matches_regex "$VK_SHADER_MODULES" "#ifndef USE_VK_PBR|#else" "non-PBR shader module fallback removed"
+if grep -Fq 'r_allowSoftwareGL = Cvar_Get' "$CL_MAIN" && \
+	! awk '/#ifdef USE_OPENGL_API/{o=1} /#endif/{if(o){o=0; exit 0}} /r_allowSoftwareGL = Cvar_Get/{if(!o) exit 1}' "$CL_MAIN"; then
+	fail "r_allowSoftwareGL must register only under USE_OPENGL_API"
+fi
+
 # Mesh shader extension must stay explicitly gated (support + cvar + extension list capacity).
 assert_contains_literal "$VK_INSTANCE" "const char *device_extension_list[40];" "mesh shader extension-list headroom"
 assert_contains_literal "$VK_INSTANCE" "vk.meshShaderNV = qfalse;" "mesh shader default disabled"