Divide large constant buffer into subsets and implement push constants for Vulkan performance

README.md

@@ -510,7 +510,7 @@ Recommended in this case is `cmake-vs2022-win64-no-ffmpeg.bat`
 
 	Xcode release and universal builds now automatically package the executable into a macOS app bundle, defining an Info.plist file and copying the base directory and custom icon into the application bundle's Contents/Resources folder.  This is controlled by adding -DMACOSX_BUNDLE=ON to the CMake options.
 
-	Depending on which package manager you install (Homebrew or MacPorts) you may need to change the openal-soft library and include paths specified in the cmake shell scripts.  For single architecture builds (debug, release, retail) the default openal-soft paths are set for Homebrew on x86, while for universal builds the default paths are set for MacPorts on x86 or Apple Silicon.  If you want to build using the single architecture shell scripts (debug, release, retail) on Apple Silicon, you will need to change the openal-soft paths from `/usr/local/...` to either `/opt/homebrew/...` (Homebrew) or `/opt/local/...` (MacPorts).
+	For single architecture builds (debug, release, retail) the default openal-soft paths are set for Homebrew, while for universal builds the default paths are set for MacPorts. The single architecture build scripts are now portable and automatically detect Homebrew's openal-soft path prefix for x86 and Apple Silicon.  The universal build script remains portable since MacPorts uses the same openal-soft installation path on x86 and Apple Silicon.
 
 4. Compile RBDOOM-3-BFG targets:
 

neo/CMakeLists.txt

@@ -429,6 +429,8 @@ if(USE_VULKAN)
 	if(USE_VMA)
 		add_definitions(-DUSE_AMD_ALLOCATOR)
 		include_directories("libs/vma/include")
+		file(GLOB VMA_INCLUDES libs/vma/include/*.h)
+		source_group("libs\\vma" FILES ${VMA_INCLUDES})
 	endif()
 
 endif()
@@ -1304,6 +1306,7 @@ set(RBDOOM3_INCLUDES
 			#${FREETYPE_SOURCES}
 			${SOUND_INCLUDES}
 			${OGGVORBIS_INCLUDES}
+			${VMA_INCLUDES}
 			${OPTICK_INCLUDES}
 			${UI_INCLUDES}
 			${SWF_INCLUDES}
@@ -1776,7 +1779,8 @@ else()
 		# delete precompiled header file after executable is compiled: IDE build case (e.g. Xcode)
 		else()
 			add_custom_command(TARGET RBDoom3BFG POST_BUILD
-					COMMAND ${remove_command} "idlib/precompiled.h.gch"
+					# SRS - added wildcards to remove tmp files from cmake ZERO_CHECK regeneration
+					COMMAND ${remove_command} "idlib/precompiled.h*.gch*"
 					WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 					COMMENT "remove idlib/precompiled.h.gch"
 			)

neo/cmake-macos-release.sh

@@ -2,5 +2,16 @@ cd ..
 rm -rf build
 mkdir build
 cd build
+
+# asemarafa/SRS - Determine the Homebrew path prefix for openal-soft
+if [ -z "$OPENAL_PREFIX" ]; then
+  OPENAL_PREFIX=$(brew --prefix openal-soft 2>/dev/null)
+  if [ -z "$OPENAL_PREFIX" ]; then
+  	echo "Error: openal-soft is not installed via Homebrew."
+  	echo "Either install it using 'brew install openal-soft' or define the path prefix via OPENAL_PREFIX."
+  	exit 1
+  fi
+fi
+
 # change or remove -DCMAKE_OSX_DEPLOYMENT_TARGET=<version> to match supported runtime targets
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" -DCMAKE_OSX_DEPLOYMENT_TARGET=12.1 -DFFMPEG=OFF -DBINKDEC=ON -DUSE_MoltenVK=ON -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include ../neo -Wno-dev
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" -DCMAKE_OSX_DEPLOYMENT_TARGET=12.1 -DFFMPEG=OFF -DBINKDEC=ON -DUSE_MoltenVK=ON -DOPENAL_LIBRARY=$OPENAL_PREFIX/lib/libopenal.dylib -DOPENAL_INCLUDE_DIR=$OPENAL_PREFIX/include ../neo -Wno-dev

neo/cmake-macos-retail.sh

@@ -2,5 +2,16 @@ cd ..
 rm -rf build
 mkdir build
 cd build
+
+# asemarafa/SRS - Determine the Homebrew path prefix for openal-soft
+if [ -z "$OPENAL_PREFIX" ]; then
+  OPENAL_PREFIX=$(brew --prefix openal-soft 2>/dev/null)
+  if [ -z "$OPENAL_PREFIX" ]; then
+  	echo "Error: openal-soft is not installed via Homebrew."
+  	echo "Either install it using 'brew install openal-soft' or define the path prefix via OPENAL_PREFIX."
+  	exit 1
+  fi
+fi
+
 # change or remove -DCMAKE_OSX_DEPLOYMENT_TARGET=<version> to match supported runtime targets
-cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG -DID_RETAIL" -DCMAKE_OSX_DEPLOYMENT_TARGET=12.1 -DFFMPEG=OFF -DBINKDEC=ON -DUSE_MoltenVK=ON -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include ../neo -Wno-dev
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG -DID_RETAIL" -DCMAKE_OSX_DEPLOYMENT_TARGET=12.1 -DFFMPEG=OFF -DBINKDEC=ON -DUSE_MoltenVK=ON -DOPENAL_LIBRARY=$OPENAL_PREFIX/lib/libopenal.dylib -DOPENAL_INCLUDE_DIR=$OPENAL_PREFIX/include ../neo -Wno-dev

neo/cmake-xcode-debug.sh

@@ -2,10 +2,22 @@ cd ..
 rm -rf xcode-debug
 mkdir xcode-debug
 cd xcode-debug
+
+# asemarafa/SRS - Determine the Homebrew path prefix for openal-soft
+if [ -z "$OPENAL_PREFIX" ]; then
+  OPENAL_PREFIX=$(brew --prefix openal-soft 2>/dev/null)
+  if [ -z "$OPENAL_PREFIX" ]; then
+  	echo "Error: openal-soft is not installed via Homebrew."
+  	echo "Either install it using 'brew install openal-soft' or define the path prefix via OPENAL_PREFIX."
+  	exit 1
+  fi
+fi
+
 # note 1: remove or set -DCMAKE_SUPPRESS_REGENERATION=OFF to reenable ZERO_CHECK target which checks for CMakeLists.txt changes and re-runs CMake before builds
 #         however, if ZERO_CHECK is reenabled **must** add VULKAN_SDK location to Xcode Custom Paths (under Prefs/Locations) otherwise build failures may occur
 # note 2: policy CMAKE_POLICY_DEFAULT_CMP0142=NEW suppresses non-existant per-config suffixes on Xcode library search paths, works for cmake version 3.25 and later
 # note 3: env variable MVK_CONFIG_FULL_IMAGE_VIEW_SWIZZLE=1 enables MoltenVK's image view swizzle which may be required on older macOS versions or hardware (see vulkaninfo)
 # note 4: env variable MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS=0 disables synchronous queue submits which is optimal for the synchronization method used by the game
 # note 5: env variable MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=2 enables MoltenVK's use of Metal argument buffers only if VK_EXT_descriptor_indexing is enabled
-cmake -G Xcode -DCMAKE_BUILD_TYPE=Debug -DCMAKE_XCODE_GENERATE_SCHEME=ON -DCMAKE_XCODE_SCHEME_ENVIRONMENT="MVK_CONFIG_FULL_IMAGE_VIEW_SWIZZLE=1;MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS=0;MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=2" -DCMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION=OFF -DCMAKE_SUPPRESS_REGENERATION=ON -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include ../neo -DCMAKE_POLICY_DEFAULT_CMP0142=NEW -Wno-dev
+# note 6: env variable MVK_CONFIG_TIMESTAMP_PERIOD_LOWPASS_ALPHA=1.0 disables MoltenVK's timestampPeriod lowpass filter for non-Apple GPUs
+cmake -G Xcode -DCMAKE_BUILD_TYPE=Debug -DCMAKE_XCODE_GENERATE_SCHEME=ON -DCMAKE_XCODE_SCHEME_ENVIRONMENT="MVK_CONFIG_FULL_IMAGE_VIEW_SWIZZLE=1;MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS=0;MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=2;MVK_CONFIG_TIMESTAMP_PERIOD_LOWPASS_ALPHA=1.0" -DCMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION=OFF -DCMAKE_SUPPRESS_REGENERATION=ON -DOPENAL_LIBRARY=$OPENAL_PREFIX/lib/libopenal.dylib -DOPENAL_INCLUDE_DIR=$OPENAL_PREFIX/include ../neo -DCMAKE_POLICY_DEFAULT_CMP0142=NEW -Wno-dev

neo/cmake-xcode-release.sh

@@ -2,7 +2,18 @@ cd ..
 rm -rf xcode-release
 mkdir xcode-release
 cd xcode-release
+
+# asemarafa/SRS - Determine the Homebrew path prefix for openal-soft
+if [ -z "$OPENAL_PREFIX" ]; then
+  OPENAL_PREFIX=$(brew --prefix openal-soft 2>/dev/null)
+  if [ -z "$OPENAL_PREFIX" ]; then
+  	echo "Error: openal-soft is not installed via Homebrew."
+  	echo "Either install it using 'brew install openal-soft' or define the path prefix via OPENAL_PREFIX."
+  	exit 1
+  fi
+fi
+
 # note 1: remove or set -DCMAKE_SUPPRESS_REGENERATION=OFF to reenable ZERO_CHECK target which checks for CMakeLists.txt changes and re-runs CMake before builds
 #         however, if ZERO_CHECK is reenabled **must** add VULKAN_SDK location to Xcode Custom Paths (under Prefs/Locations) otherwise build failures may occur
 # note 2: policy CMAKE_POLICY_DEFAULT_CMP0142=NEW suppresses non-existant per-config suffixes on Xcode library search paths, works for cmake version 3.25 and later
-cmake -G Xcode -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES="Release;MinSizeRel;RelWithDebInfo" -DMACOSX_BUNDLE=ON -DFFMPEG=OFF -DBINKDEC=ON -DUSE_MoltenVK=ON -DCMAKE_XCODE_GENERATE_SCHEME=ON -DCMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION=OFF -DCMAKE_SUPPRESS_REGENERATION=ON -DOPENAL_LIBRARY=/usr/local/opt/openal-soft/lib/libopenal.dylib -DOPENAL_INCLUDE_DIR=/usr/local/opt/openal-soft/include ../neo -DCMAKE_POLICY_DEFAULT_CMP0142=NEW -Wno-dev
+cmake -G Xcode -DCMAKE_BUILD_TYPE=Release -DCMAKE_CONFIGURATION_TYPES="Release;MinSizeRel;RelWithDebInfo" -DMACOSX_BUNDLE=ON -DFFMPEG=OFF -DBINKDEC=ON -DUSE_MoltenVK=ON -DCMAKE_XCODE_GENERATE_SCHEME=ON -DCMAKE_XCODE_SCHEME_ENABLE_GPU_API_VALIDATION=OFF -DCMAKE_SUPPRESS_REGENERATION=ON -DOPENAL_LIBRARY=$OPENAL_PREFIX/lib/libopenal.dylib -DOPENAL_INCLUDE_DIR=$OPENAL_PREFIX/include ../neo -DCMAKE_POLICY_DEFAULT_CMP0142=NEW -Wno-dev

neo/cmake-xcode-universal.sh

@@ -2,6 +2,15 @@ cd ..
 rm -rf xcode-universal
 mkdir xcode-universal
 cd xcode-universal
+
+# SRS - Determine if openal-soft universal variant is installed via MacPorts
+OPENAL_VARIANTS=$(port info --variants openal-soft 2>/dev/null)
+if [[ $OPENAL_VARIANTS != *universal* ]]; then
+  echo "Error: openal-soft universal variant is not installed via MacPorts."
+  echo "Please install it using 'sudo port install openal-soft +universal'"
+  exit 1
+fi
+
 # note 1: remove or set -DCMAKE_SUPPRESS_REGENERATION=OFF to reenable ZERO_CHECK target which checks for CMakeLists.txt changes and re-runs CMake before builds
 #         however, if ZERO_CHECK is reenabled **must** add VULKAN_SDK location to Xcode Custom Paths (under Prefs/Locations) otherwise build failures may occur
 # note 2: policy CMAKE_POLICY_DEFAULT_CMP0142=NEW suppresses non-existant per-config suffixes on Xcode library search paths, works for cmake version 3.25 and later

neo/framework/Common_local.h

@@ -380,14 +380,26 @@ class idCommonLocal : public idCommon
 	// RB end
 
 	// SRS start
-	uint64      GetRendererStartFrameSyncMicroseconds() const
+	void		SetRendererMvkEncodeMicroseconds( uint64 mvkEncodeMicroSeconds )
 	{
-		return mainFrameTiming.finishSyncTime - mainFrameTiming.startSyncTime;
+		metal_encode = mvkEncodeMicroSeconds;
+		return;
 	}
 
-	uint64      GetRendererEndFrameSyncMicroseconds() const
+	uint64		GetRendererMvkEncodeMicroseconds() const
 	{
-		return mainFrameTiming.finishSyncTime_EndFrame - mainFrameTiming.startRenderTime;
+		return metal_encode;
+	}
+
+	void		SetRendererGpuMemoryMB( int gpuMemoryMB )
+	{
+		gpu_memory = gpuMemoryMB;
+		return;
+	}
+
+	int			GetRendererGpuMemoryMB() const
+	{
+		return gpu_memory;
 	}
 	// SRS end
 
@@ -604,6 +616,11 @@ class idCommonLocal : public idCommon
 	backEndCounters_t		stats_backend;
 	performanceCounters_t	stats_frontend;
 
+	// SRS - MoltenVK's Vulkan to Metal command buffer encoding time, set default to 0 for non-macOS platforms (Windows and Linux)
+	uint64					metal_encode = 0;
+	// SRS - Cross-platform GPU Memory usage counter, set default to 0 in case platform or graphics API does not support queries
+	int						gpu_memory = 0;
+
 	// Used during loading screens
 	int					lastPacifierSessionTime;
 	int					lastPacifierGuiTime;

neo/framework/Console.cpp

@@ -225,8 +225,10 @@ float idConsoleLocal::DrawFPS( float y )
 	extern idCVar r_swapInterval;
 
 	static float previousTimes[FPS_FRAMES];
+	static float previousCpuUsage[FPS_FRAMES] = {};
+	static float previousGpuUsage[FPS_FRAMES] = {};
 	static float previousTimesNormalized[FPS_FRAMES_HISTORY];
-	static int index;
+	static int index = 0;
 	static int previous;
 	static int valuesOffset = 0;
 
@@ -239,6 +241,8 @@ float idConsoleLocal::DrawFPS( float y )
 	previous = t;
 
 	int fps = 0;
+	float cpuUsage = 0.0;
+	float gpuUsage = 0.0;
 
 	const float milliSecondsPerFrame = 1000.0f / com_engineHz_latched;
 
@@ -253,13 +257,17 @@ float idConsoleLocal::DrawFPS( float y )
 		for( int i = 0 ; i < FPS_FRAMES ; i++ )
 		{
 			total += previousTimes[i];
+			cpuUsage += previousCpuUsage[i];
+			gpuUsage += previousGpuUsage[i];
 		}
 		if( !total )
 		{
 			total = 1;
 		}
 		fps = 1000000 * FPS_FRAMES / total;
 		fps = ( fps + 500 ) / 1000;
+		cpuUsage /= FPS_FRAMES;
+		gpuUsage /= FPS_FRAMES;
 
 		const char* s = va( "%ifps", fps );
 		int w = strlen( s ) * BIGCHAR_WIDTH;
@@ -290,6 +298,7 @@ float idConsoleLocal::DrawFPS( float y )
 
 	const uint64 rendererBackEndTime = commonLocal.GetRendererBackEndMicroseconds();
 	const uint64 rendererShadowsTime = commonLocal.GetRendererShadowsMicroseconds();
+	const uint64 rendererMvkEncodeTime = commonLocal.GetRendererMvkEncodeMicroseconds();
 	const uint64 rendererGPUTime = commonLocal.GetRendererGPUMicroseconds();
 	const uint64 rendererGPUEarlyZTime = commonLocal.GetRendererGpuEarlyZMicroseconds();
 	const uint64 rendererGPU_SSAOTime = commonLocal.GetRendererGpuSSAOMicroseconds();
@@ -315,14 +324,18 @@ float idConsoleLocal::DrawFPS( float y )
 	// SRS - GPU idle time is simply the difference between measured frame-over-frame time and GPU busy time (directly from GPU timers)
 	const int64 rendererGPUIdleTime = frameBusyTime + frameIdleTime - rendererGPUTime;
 
+	// SRS - Save current CPU and GPU usage factors in ring buffer to calculate smoothed averages for future frames
+	previousCpuUsage[(index - 1) % FPS_FRAMES] = float( frameBusyTime - frameSyncTime ) / float( frameBusyTime + frameIdleTime ) * 100.0;
+	previousGpuUsage[(index - 1) % FPS_FRAMES] = float( rendererGPUTime ) / float( rendererGPUTime + rendererGPUIdleTime ) * 100.0;
+
 #if 1
 
 	// RB: use ImGui to show more detailed stats about the scene loads
 	if( ImGuiHook::IsReadyToRender() )
 	{
 		// start smaller
 		int32 statsWindowWidth = 320;
-		int32 statsWindowHeight = 315;
+		int32 statsWindowHeight = 330;
 
 		if( com_showFPS.GetInteger() > 2 )
 		{
@@ -427,7 +440,7 @@ float idConsoleLocal::DrawFPS( float y )
 
 		ImGui::TextColored( colorCyan, "API: %s, AA[%i, %i]: %s, %s", API, width, height, aaMode, resolutionText.c_str() );
 
-		ImGui::TextColored( colorGold, "Device: %s", deviceManager->GetRendererString() );
+		ImGui::TextColored( colorGold, "Device: %s, Memory: %i MB", deviceManager->GetRendererString(), commonLocal.GetRendererGpuMemoryMB() );
 
 		ImGui::TextColored( colorLtGrey, "GENERAL: views:%i draws:%i tris:%i",
 							commonLocal.stats_frontend.c_numViews,
@@ -477,7 +490,7 @@ float idConsoleLocal::DrawFPS( float y )
 
 		if( com_showFPS.GetInteger() > 2 )
 		{
-			const char* overlay = va( "Average FPS %i", fps );
+			const char* overlay = va( "Average FPS %-4i", fps );
 
 			ImGui::PlotLines( "Relative\nFrametime ms", previousTimesNormalized, FPS_FRAMES_HISTORY, valuesOffset, overlay, -10.0f, 10.0f, ImVec2( 0, 50 ) );
 		}
@@ -494,12 +507,20 @@ float idConsoleLocal::DrawFPS( float y )
 		ImGui::TextColored( gameThreadRenderTime > maxTime ? colorRed : colorWhite,			"RF:      %5llu us   SSR:          %5llu us", gameThreadRenderTime, rendererGPU_SSRTime );
 		ImGui::TextColored( rendererBackEndTime > maxTime ? colorRed : colorWhite,			"RB:      %5llu us   Ambient Pass: %5llu us", rendererBackEndTime, rendererGPUAmbientPassTime );
 		ImGui::TextColored( rendererGPUShadowAtlasTime > maxTime ? colorRed : colorWhite,	"Shadows: %5llu us   Shadow Atlas: %5llu us", rendererShadowsTime, rendererGPUShadowAtlasTime );
+#if defined(__APPLE__) && defined( USE_MoltenVK )
+		// SRS - For more recent versions of MoltenVK with enhanced performance statistics (v1.2.6 and later), display the Vulkan to Metal encoding thread time on macOS
+		ImGui::TextColored( rendererMvkEncodeTime > maxTime || rendererGPUInteractionsTime > maxTime ? colorRed : colorWhite,	"Encode:  %5lld us   Interactions: %5llu us", rendererMvkEncodeTime, rendererGPUInteractionsTime );
+		ImGui::TextColored( rendererGPUShaderPassesTime > maxTime ? colorRed : colorWhite,	"Sync:    %5lld us   Shader Pass:  %5llu us", frameSyncTime, rendererGPUShaderPassesTime );
+#else
 		ImGui::TextColored( rendererGPUInteractionsTime > maxTime ? colorRed : colorWhite,	"Sync:    %5lld us   Interactions: %5llu us", frameSyncTime, rendererGPUInteractionsTime );
 		ImGui::TextColored( rendererGPUShaderPassesTime > maxTime ? colorRed : colorWhite,	"                    Shader Pass:  %5llu us", rendererGPUShaderPassesTime );
+#endif
 		ImGui::TextColored( rendererGPU_TAATime > maxTime ? colorRed : colorWhite,			"                    TAA:          %5llu us", rendererGPU_TAATime );
 		ImGui::TextColored( rendererGPUPostProcessingTime > maxTime ? colorRed : colorWhite, "                    PostFX:       %5llu us", rendererGPUPostProcessingTime );
 		ImGui::TextColored( frameBusyTime > maxTime || rendererGPUTime > maxTime ? colorRed : colorWhite, "Total:   %5lld us   Total:        %5lld us", frameBusyTime, rendererGPUTime );
 		ImGui::TextColored( colorWhite,														"Idle:    %5lld us   Idle:         %5lld us", frameIdleTime, rendererGPUIdleTime );
+		// SRS - Show CPU and GPU overall usage statistics
+		ImGui::TextColored( colorWhite,														"Usage:     %3.0f %%    Usage:          %3.0f %%", cpuUsage, gpuUsage );
 
 		ImGui::End();
 	}

neo/renderer/ImmediateMode.cpp

@@ -138,7 +138,7 @@ void fhImmediateMode::End()
 	vertexBuffer.Update( drawVerts, drawVertsUsed * sizeof( idDrawVert ), 0, false, commandList );
 	indexBuffer.Update( lineIndices, drawVertsUsed * sizeof( triIndex_t ), 0, false, commandList );
 
-	renderProgManager.CommitConstantBuffer( commandList, true );
+	renderProgManager.CommitConstantBuffer( commandList, false );
 
 	int bindingLayoutType = renderProgManager.BindingLayoutType();
 
@@ -147,7 +147,7 @@ void fhImmediateMode::End()
 
 	for( int i = 0; i < layouts->Num(); i++ )
 	{
-		if( !tr.backend.currentBindingSets[i] || *tr.backend.currentBindingSets[i]->getDesc() != tr.backend.pendingBindingSetDescs[bindingLayoutType][i] )
+		if( !tr.backend.currentBindingSets[i] || *tr.backend.currentBindingSets[i]->getDesc() != tr.backend.pendingBindingSetDescs[bindingLayoutType][i] || bindingLayoutType != tr.backend.prevBindingLayoutType )
 		{
 			tr.backend.currentBindingSets[i] = tr.backend.bindingCache.GetOrCreateBindingSet( tr.backend.pendingBindingSetDescs[bindingLayoutType][i], ( *layouts )[i] );
 		}
@@ -182,6 +182,8 @@ void fhImmediateMode::End()
 		state.viewport.addScissorRect( nvrhi::Rect( viewport ) );
 
 		commandList->setGraphicsState( state );
+
+		renderProgManager.CommitPushConstants( commandList, bindingLayoutType );
 	}
 
 	nvrhi::DrawArguments args;

neo/renderer/Material.cpp

@@ -2144,11 +2144,14 @@ void idMaterial::ParseStage( idLexer& src, const textureRepeat_t trpDefault )
 			ss->conditionRegister = ParseExpression( src );
 			continue;
 		}
+
+		auto usePushConstants = renderProgManager.layoutTypeAttributes[BINDING_LAYOUT_POST_PROCESS_INGAME].pcEnabled ? "1" : "0";
+
 		if( !token.Icmp( "program" ) )
 		{
 			if( src.ReadTokenOnLine( &token ) )
 			{
-				idList<shaderMacro_t> macros = { { "USE_GPU_SKINNING", "0" } };
+				idList<shaderMacro_t> macros = { { "USE_GPU_SKINNING", "0" }, { "USE_PUSH_CONSTANTS", usePushConstants } };
 				newStage.vertexProgram = renderProgManager.FindShader( token.c_str(), SHADER_STAGE_VERTEX, "", macros, false );
 				newStage.fragmentProgram = renderProgManager.FindShader( token.c_str(), SHADER_STAGE_FRAGMENT, "", macros, false );
 			}
@@ -2158,7 +2161,7 @@ void idMaterial::ParseStage( idLexer& src, const textureRepeat_t trpDefault )
 		{
 			if( src.ReadTokenOnLine( &token ) )
 			{
-				idList<shaderMacro_t> macros = { { "USE_GPU_SKINNING", "0" } };
+				idList<shaderMacro_t> macros = { { "USE_GPU_SKINNING", "0" }, { "USE_PUSH_CONSTANTS", usePushConstants } };
 				newStage.fragmentProgram = renderProgManager.FindShader( token.c_str(), SHADER_STAGE_FRAGMENT, "", macros, false );
 			}
 			continue;
@@ -2167,7 +2170,7 @@ void idMaterial::ParseStage( idLexer& src, const textureRepeat_t trpDefault )
 		{
 			if( src.ReadTokenOnLine( &token ) )
 			{
-				idList<shaderMacro_t> macros = { { "USE_GPU_SKINNING", "0" } };
+				idList<shaderMacro_t> macros = { { "USE_GPU_SKINNING", "0" }, { "USE_PUSH_CONSTANTS", usePushConstants } };
 				newStage.vertexProgram = renderProgManager.FindShader( token.c_str(), SHADER_STAGE_VERTEX, "", macros, false );
 			}
 			continue;