Vulkan: remove stale compile-time feature flags and dead branches

renderers/vulkan/diagnostics/tr_init_capture.inc

@@ -21,7 +21,6 @@ Return value must be freed with ri.Hunk_FreeTempMemory()
 */
 static byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset, int *padlen, int lineAlign )
 {
-#ifdef USE_VULKAN
 	byte *buffer, *bufstart;
 	int linelen;
 	int	bufAlign;
@@ -46,34 +45,6 @@ static byte *RB_ReadPixels(int x, int y, int width, int height, size_t *offset,
 	*padlen = PAD(linelen, packAlign) - linelen;
 
 	return buffer;
-#else
-	byte *buffer, *bufstart;
-	int padwidth, linelen;
-	int	bufAlign;
-	GLint packAlign;
-
-	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
-
-	linelen = width * 3;
-
-	if ( packAlign < lineAlign )
-		padwidth = PAD(linelen, lineAlign);
-	else
-		padwidth = PAD(linelen, packAlign);
-
-	bufAlign = MAX( packAlign, 16 ); // for SIMD
-
-	// Allocate a few more bytes so that we can choose an alignment we like
-	buffer = ri.Hunk_AllocateTempMemory(padwidth * height + *offset + bufAlign - 1);
-	bufstart = PADP((intptr_t) buffer + *offset, bufAlign);
-
-	qglReadPixels( x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, bufstart );
-
-	*offset = bufstart - buffer;
-	*padlen = PAD(linelen, packAlign) - linelen;
-
-	return buffer;
-#endif
 }
 
 
@@ -521,11 +492,7 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 
 	cmd = (const videoFrameCommand_t *)data;
 
-#ifdef USE_VULKAN
 	packAlign = 1;
-#else
-	qglGetIntegerv(GL_PACK_ALIGNMENT, &packAlign);
-#endif
 
 	linelen = cmd->width * 3;
 
@@ -538,11 +505,7 @@ const void *RB_TakeVideoFrameCmd( const void *data )
 
 	cBuf = PADP(cmd->captureBuffer, packAlign);
 
-#ifdef USE_VULKAN
 	vk_read_pixels(cBuf, cmd->width, cmd->height);
-#else
-	qglReadPixels(0, 0, cmd->width, cmd->height, GL_RGB, GL_UNSIGNED_BYTE, cBuf);
-#endif
 
 	memcount = padwidth * cmd->height;
 

renderers/vulkan/diagnostics/tr_init_diagnostics.inc

@@ -1225,7 +1225,6 @@ static void R_SimRenderDebug_f( void )
 	VK_SimRenderDebugStartupLog();
 }
 
-#ifdef USE_VULKAN
 #include "vk_fp64_points.h"
 
 /*
@@ -1593,4 +1592,3 @@ static void VkVolumetricValidate_f( void )
 
 	ri.Printf( PRINT_WARNING, "vkVolumetricValidate: unknown mode '%s'\n", mode );
 }
-#endif

renderers/vulkan/diagnostics/tr_init_info.inc

@@ -36,7 +36,6 @@ static void GfxInfo( void )
 	const char *fsstrings[] = { "windowed", "fullscreen" };
 	const char *fs;
 	int mode;
-#ifdef USE_VULKAN
 	ri.Printf( PRINT_ALL, "\nVK_VENDOR: %s\n", glConfig.vendor_string );
 	ri.Printf( PRINT_ALL, "VK_RENDERER: %s\n", glConfig.renderer_string );
 	ri.Printf( PRINT_ALL, "VK_VERSION: %s\n", glConfig.version_string );
@@ -46,21 +45,8 @@ static void GfxInfo( void )
 
 	ri.Printf( PRINT_ALL, "\nVK_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
 	ri.Printf( PRINT_ALL, "VK_MAX_TEXTURE_UNITS: %d\n", glConfig.numTextureUnits );
-#else
-	const char *enablestrings[] = { "disabled", "enabled" };
-
-	ri.Printf( PRINT_ALL, "\nGL_VENDOR: %s\n", glConfig.vendor_string );
-	ri.Printf( PRINT_ALL, "GL_RENDERER: %s\n", glConfig.renderer_string );
-	ri.Printf( PRINT_ALL, "GL_VERSION: %s\n", glConfig.version_string );
-	ri.Printf( PRINT_DEVELOPER, "GL_EXTENSIONS: " );
-	R_PrintLongString( glConfig.extensions_string );
-	ri.Printf( PRINT_ALL, "\n" );
-	ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_SIZE: %d\n", glConfig.maxTextureSize );
-	ri.Printf( PRINT_ALL, "GL_MAX_TEXTURE_UNITS_ARB: %d\n", glConfig.numTextureUnits );
-#endif
 
 	ri.Printf( PRINT_ALL, "\nPIXELFORMAT: color(%d-bits) Z(%d-bit) stencil(%d-bits)\n", glConfig.colorBits, glConfig.depthBits, glConfig.stencilBits );
-#ifdef USE_VULKAN
 	ri.Printf( PRINT_ALL, " presentation: %s\n", vk_format_string( vk.present_format.format ) );
 	if ( vk.color_format != vk.present_format.format ) {
 		ri.Printf( PRINT_ALL, " color: %s\n", vk_format_string( vk.color_format ) );
@@ -69,7 +55,6 @@ static void GfxInfo( void )
 		ri.Printf( PRINT_ALL, " capture: %s\n", vk_format_string( vk.capture_format ) );
 	}
 	ri.Printf( PRINT_ALL, " depth: %s\n", vk_format_string( vk.depth_format ) );
-#endif
 	if ( glConfig.isFullscreen )
 	{
 		const char *modefs = ri.Cvar_VariableString( "r_modeFullscreen" );
@@ -103,12 +88,6 @@ static void GfxInfo( void )
 		ri.Printf( PRINT_ALL, "N/A\n" );
 	}
 
-#ifndef USE_VULKAN
-	ri.Printf( PRINT_ALL, "multitexture: %s\n", enablestrings[qglActiveTextureARB != 0] );
-	ri.Printf( PRINT_ALL, "compiled vertex arrays: %s\n", enablestrings[qglLockArraysEXT != 0 ] );
-	ri.Printf( PRINT_ALL, "texenv add: %s\n", enablestrings[glConfig.textureEnvAddAvailable != 0] );
-	ri.Printf( PRINT_ALL, "compressed textures: %s\n", enablestrings[glConfig.textureCompression!=TC_NONE] );
-#endif
 }
 
 
@@ -132,11 +111,9 @@ static void VarInfo( void )
 	ri.Printf( PRINT_ALL, "texture bits: %d\n", r_texturebits ? (r_texturebits->integer ? r_texturebits->integer : 32) : 32 );
 	ri.Printf( PRINT_ALL, "picmip: %d%s\n", r_picmip ? r_picmip->integer : 0, (r_nomip && r_nomip->integer) ? ", worldspawn only" : "" );
 
-#ifdef USE_VULKAN
 	if ( r_vertexLight && r_vertexLight->integer ) {
 		ri.Printf( PRINT_ALL, "Note: using vertex lightmap approximation\n" );
 	}
-#if defined (USE_VK_PBR)
 	ri.Printf( PRINT_ALL, "PBR SH extraction: %s\n", (r_pbr_shExtract && r_pbr_shExtract->integer) ? "enabled" : "disabled" );
 	if ( r_glint && r_glint->integer ) {
 		ri.Printf( PRINT_ALL, "PBR glint NDF: enabled (r_glint 1)\n" );
@@ -147,16 +124,6 @@ static void VarInfo( void )
 	if ( r_pbr_debug && r_pbr_debug->integer ) {
 		ri.Printf( PRINT_ALL, "PBR debug view: mode %d (1=direct,2=ibl spec,3=irradiance,4=env samples,5-8=glint,17-19=resource health)\n", r_pbr_debug->integer );
 	}
-#endif
-#else
-	if ( (r_vertexLight && r_vertexLight->integer) || glConfig.hardwareType == GLHW_PERMEDIA2 ) {
-		ri.Printf( PRINT_ALL, "Note: using vertex lightmap approximation\n" );
-	} else if ( glConfig.hardwareType == GLHW_RAGEPRO ) {
-		ri.Printf( PRINT_ALL, "Note: ragePro approximations\n" );
-	} else if ( glConfig.hardwareType == GLHW_RIVA128 ) {
-		ri.Printf( PRINT_ALL, "Note: riva128 approximations\n" );
-	}
-#endif
 	if ( r_finish && r_finish->integer ) {
 		ri.Printf( PRINT_ALL, "Forcing glFinish\n" );
 	}
@@ -175,7 +142,6 @@ static void GfxInfo_f( void )
 }
 
 
-#ifdef USE_VULKAN
 static void VkInfo_f( void )
 {
 	ri.Printf(PRINT_ALL, "max_vertex_usage: %iKb\n", (int)((vk.stats.vertex_buffer_max + 1023) / 1024) );
@@ -228,4 +194,3 @@ static void VulkanInfo_f( void )
 		ri.Printf( PRINT_ALL, "Platform  : Raspberry Pi (V3DV)\n" );
 	ri.Printf( PRINT_ALL, "==============================\n" );
 }
-#endif

renderers/vulkan/extensions/neural/vk_nvc.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#ifdef USE_VULKAN
 
 void R_NVC_Init( void );
 void R_NVC_Shutdown( void );
@@ -10,4 +9,3 @@ qboolean R_NVC_Active( void );
 
 void vk_nvc_apply_after_geometry( void );
 
-#endif /* USE_VULKAN */

renderers/vulkan/extensions/neural/vk_renderformer.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#ifdef USE_VULKAN
 
 void R_RenderFormer_Init( void );
 void R_RenderFormer_Shutdown( void );
@@ -10,4 +9,3 @@ qboolean R_RenderFormer_Active( void );
 
 void vk_renderformer_apply_after_geometry( void );
 
-#endif /* USE_VULKAN */

renderers/vulkan/extensions/neural/vk_vfgi.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#ifdef USE_VULKAN
 
 void R_VFGI_Init( void );
 void R_VFGI_Shutdown( void );
@@ -10,4 +9,3 @@ qboolean R_VFGI_Active( void );
 
 void vk_vfgi_apply_after_geometry( void );
 
-#endif /* USE_VULKAN */

renderers/vulkan/extensions/neural/vk_wpt.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#ifdef USE_VULKAN
 
 void R_WPT_Init( void );
 void R_WPT_Shutdown( void );
@@ -9,4 +8,3 @@ qboolean R_WPT_Active( void );
 
 void vk_wpt_apply_after_geometry( void );
 
-#endif /* USE_VULKAN */

renderers/vulkan/extensions/rtx/vk_fsa.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#ifdef USE_VULKAN
 
 void R_FSA_Init( void );
 void R_FSA_Shutdown( void );
@@ -17,4 +16,3 @@ VkImageView vk_fsa_get_importance_view( void );
 void vk_fsa_patch_rtx_trace_params( float traceParams[4], uint32_t frameSeed );
 void vk_fsa_write_rtx_importance_descriptor( VkDescriptorSet rtxSet );
 
-#endif /* USE_VULKAN */

renderers/vulkan/extensions/rtx/vk_rtx_world.c

@@ -115,11 +115,7 @@ static void rtx_albedo_from_srfvert( const srfVert_t *v, float *outRgb )
 static void rtx_albedo_from_face_vert( const srfSurfaceFace_t *face, unsigned vidx, float *outRgb )
 {
 	const byte *c;
-#ifdef USE_VK_PBR
 	c = (const byte *)&face->points[vidx][10];
-#else
-	c = (const byte *)&face->points[vidx][7];
-#endif
 	rtx_albedo_from_bytes( c, outRgb );
 }
 
@@ -166,13 +162,8 @@ static void rtx_resolve_prim_albedo( const shader_t *shader, float u, float v,
 static void rtx_face_st( const srfSurfaceFace_t *face, unsigned vidx, float *u, float *v )
 {
 	const float *p = face->points[vidx];
-#ifdef USE_VK_PBR
 	*u = p[6];
 	*v = p[7];
-#else
-	*u = p[3];
-	*v = p[4];
-#endif
 }
 
 static uint32_t rtx_count_face_tris( const srfSurfaceFace_t *face )

renderers/vulkan/extensions/scaffold/vk_arc_blanc.c

@@ -289,9 +289,7 @@ static surfaceType_t *R_ArcBlanc_BuildPatch( int div, float tileSize, float orig
 	tri = ri.Hunk_Alloc( allocSize, h_low );
 	tri->surfaceType = SF_TRIANGLES;
 	tri->dlightBits = 0;
-#ifdef USE_VBO
 	tri->vboItemIndex = 0;
-#endif
 	tri->numVerts = numVerts;
 	tri->numIndexes = numIndexes;
 	tri->verts = (srfVert_t *)( tri + 1 );

renderers/vulkan/extensions/scaffold/vk_vuda.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#ifdef USE_VULKAN
 
 #include "vuda/vuda_types.h"
 
@@ -20,4 +19,3 @@ void vk_vuda_after_queue_submit( void );
 qboolean vk_vuda_consume_compute_window( void );
 void vk_vuda_notify_cuda_complete( uint64_t value );
 
-#endif /* USE_VULKAN */

renderers/vulkan/inspector/vk_imgui.cpp

@@ -122,7 +122,6 @@ extern "C" void VkImgui_Initialize(void) {
 	vkImguiState.inputState = qfalse;
 	imguiLastFrameTimeMs = 0;
 
-#ifdef USE_VULKAN
 	{
 		char errBuf[256];
 
@@ -138,21 +137,18 @@ extern "C" void VkImgui_Initialize(void) {
 			}
 		}
 	}
-#endif
 }
 
 extern "C" void VkImgui_Shutdown(void) {
 	if (!vkImguiState.active) return;
 
 	if (imguiContext) {
 		VkImgui_SetCurrentContext();
-#ifdef USE_VULKAN
 		if ( vkImgBackendReady ) {
 			VkImgui_ShutdownVulkanBackend();
 			vkImgBackendReady = qfalse;
 			VkImgui_SetVulkanBackendReady( qfalse );
 		}
-#endif
 		ImGui::DestroyContext(imguiContext);
 		imguiContext = nullptr;
 	}
@@ -179,9 +175,7 @@ extern "C" void VkImgui_BeginFrame(void) {
 			VkImgui_ApplyInspectorStyle();
 		}
 	}
-#ifdef USE_VULKAN
 	VkImgui_NewFrameVulkan();
-#endif
 	ImGui::NewFrame();
 }
 
@@ -232,9 +226,7 @@ extern "C" void VkImgui_Draw(void) {
 }
 
 extern "C" void VkImgui_SwapchainRestarted(void) {
-#ifdef USE_VULKAN
 	VkImgui_NotifySwapchainRestart();
-#endif
 }
 
 extern "C" void VkImgui_BindGameColorImage(void) { }

renderers/vulkan/inspector/vk_imgui_chrome_panels.cpp

@@ -26,11 +26,7 @@ static void VkImgui_DrawAboutInspectorPopup( void )
 		ImGui::TextUnformatted( Q3_VERSION );
 		ImGui::Separator();
 		ImGui::Text( "ImGui %s", IMGUI_VERSION );
-#ifdef USE_VULKAN
 		ImGui::Text( "Renderer API: Vulkan" );
-#else
-		ImGui::Text( "Renderer API: OpenGL" );
-#endif
 		ImGui::Spacing();
 		ImGui::TextWrapped( "Vendor: %s", glConfig.vendor_string );
 		ImGui::TextWrapped( "Device: %s", glConfig.renderer_string );