Move Push Constants index

IsaacMarovitz · IsaacMarovitz · commit 2ae533f3f855 · 2025-04-02T13:37:00.000-04:00
Signed-off-by: Isaac Marovitz &lt;isaacryu@icloud.com&gt;
diff --git a/UnleashedRecomp/gpu/shader/msl/blend_color_alpha_ps.metal b/UnleashedRecomp/gpu/shader/msl/blend_color_alpha_ps.metal
@@ -14,7 +14,7 @@ float4 shaderMain(float4 iPos [[position]],
                   Interpolators input [[stage_in]],
                   constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],
                   constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(3)]],
-                  constant PushConstants& g_PushConstants [[buffer(8)]])
+                  constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     texture2d<float> texture = g_Texture2DDescriptorHeap.g[s0_Texture2DDescriptorIndex];
     sampler samplerState = g_SamplerDescriptorHeap.g[s0_SamplerDescriptorIndex];
diff --git a/UnleashedRecomp/gpu/shader/msl/copy_color_ps.metal b/UnleashedRecomp/gpu/shader/msl/copy_color_ps.metal
@@ -8,7 +8,7 @@ struct Texture2DDescriptorHeap
 [[fragment]]
 float4 shaderMain(float4 position [[position]],
                   constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],
-                  constant PushConstants& g_PushConstants [[buffer(8)]])
+                  constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     return g_Texture2DDescriptorHeap.g[g_PushConstants.ResourceDescriptorIndex].read(uint2(position.xy), 0);
 }
diff --git a/UnleashedRecomp/gpu/shader/msl/copy_depth_ps.metal b/UnleashedRecomp/gpu/shader/msl/copy_depth_ps.metal
@@ -13,7 +13,7 @@ struct PixelShaderOutput
 [[fragment]]
 PixelShaderOutput shaderMain(float4 position [[position]],
                              constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],
-                             constant PushConstants& g_PushConstants [[buffer(8)]])
+                             constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     PixelShaderOutput output = PixelShaderOutput{};
 
diff --git a/UnleashedRecomp/gpu/shader/msl/csd_filter_ps.metal b/UnleashedRecomp/gpu/shader/msl/csd_filter_ps.metal
@@ -14,7 +14,7 @@ struct Interpolators
 float4 shaderMain(Interpolators input [[stage_in]],
                   constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],
                   constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(3)]],
-                  constant PushConstants& g_PushConstants [[buffer(8)]])
+                  constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     texture2d<float> texture = g_Texture2DDescriptorHeap.g[s0_Texture2DDescriptorIndex];
     sampler samplerState = g_SamplerDescriptorHeap.g[s0_SamplerDescriptorIndex];
diff --git a/UnleashedRecomp/gpu/shader/msl/csd_no_tex_vs.metal b/UnleashedRecomp/gpu/shader/msl/csd_no_tex_vs.metal
@@ -34,7 +34,7 @@ struct Interpolators
 
 [[vertex]]
 Interpolators shaderMain(VertexShaderInput input [[stage_in]],
-                         constant PushConstants& g_PushConstants [[buffer(8)]])
+                         constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     Interpolators output;
 
diff --git a/UnleashedRecomp/gpu/shader/msl/csd_vs.metal b/UnleashedRecomp/gpu/shader/msl/csd_vs.metal
@@ -35,7 +35,7 @@ struct Interpolators
 
 [[vertex]]
 Interpolators shaderMain(VertexShaderInput input [[stage_in]],
-                         constant PushConstants& g_PushConstants [[buffer(8)]])
+                         constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     Interpolators output;
 
diff --git a/UnleashedRecomp/gpu/shader/msl/enhanced_motion_blur_ps.metal b/UnleashedRecomp/gpu/shader/msl/enhanced_motion_blur_ps.metal
@@ -22,7 +22,7 @@ float4 shaderMain(float4 position [[position]],
                   Interpolators input [[stage_in]],
                   constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],
                   constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(3)]],
-                  constant PushConstants& g_PushConstants [[buffer(8)]])
+                  constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     texture2d<float> sampColor = g_Texture2DDescriptorHeap.g[sampColor_Texture2DDescriptorIndex];
     texture2d<float> sampVelocityMap = g_Texture2DDescriptorHeap.g[sampVelocityMap_Texture2DDescriptorIndex];
diff --git a/UnleashedRecomp/gpu/shader/msl/gamma_correction_ps.metal b/UnleashedRecomp/gpu/shader/msl/gamma_correction_ps.metal
@@ -9,7 +9,7 @@
 [[fragment]]
 float4 shaderMain(float4 position [[position]],
                   constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],
-                  constant PushConstants& g_PushConstants [[buffer(8)]])
+                  constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     texture2d<float> texture = g_Texture2DDescriptorHeap.g[g_TextureDescriptorIndex];
     
diff --git a/UnleashedRecomp/gpu/shader/msl/gaussian_blur.metali b/UnleashedRecomp/gpu/shader/msl/gaussian_blur.metali
@@ -29,7 +29,7 @@ float4 shaderMain(float4 iPosition [[position]],
                   Interpolators input [[stage_in]],
                   constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],
                   constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(3)]],
-                  constant PushConstants& g_PushConstants [[buffer(8)]])
+                  constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     texture2d<float> texture = g_Texture2DDescriptorHeap.g[s0_Texture2DDescriptorIndex];
     sampler samplerState = g_SamplerDescriptorHeap.g[s0_SamplerDescriptorIndex];
diff --git a/UnleashedRecomp/gpu/shader/msl/imgui_ps.metal b/UnleashedRecomp/gpu/shader/msl/imgui_ps.metal
@@ -129,7 +129,7 @@ float4 SampleSdfFont(float4 color, texture2d<float> texture, float2 uv, float2 s
 float4 shaderMain(Interpolators interpolators [[stage_in]],
                   constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],
                   constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(1)]],
-                  constant PushConstants& g_PushConstants [[buffer(8)]])
+                  constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     float4 color = interpolators.Color;
     color *= PixelAntialiasing(interpolators.Position.xy - g_PushConstants.ProceduralOrigin, g_PushConstants);
diff --git a/UnleashedRecomp/gpu/shader/msl/imgui_vs.metal b/UnleashedRecomp/gpu/shader/msl/imgui_vs.metal
@@ -9,7 +9,7 @@ struct VertexStageIn
 
 [[vertex]]
 Interpolators shaderMain(VertexStageIn input [[stage_in]],
-                         constant PushConstants& g_PushConstants [[buffer(8)]])
+                         constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     Interpolators interpolators = Interpolators{};
 
diff --git a/UnleashedRecomp/gpu/shader/msl/movie_ps.metal b/UnleashedRecomp/gpu/shader/msl/movie_ps.metal
@@ -4,7 +4,7 @@
 PixelShaderOutput shaderMain(Interpolators In [[stage_in]],
                              constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],
                              constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(3)]],
-                             constant PushConstants& g_PushConstants [[buffer(8)]])
+                             constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     texture2d<float> Tex0 = g_Texture2DDescriptorHeap.g[Tex0_ResourceDescriptorIndex];
     texture2d<float> Tex1 = g_Texture2DDescriptorHeap.g[Tex1_ResourceDescriptorIndex];
diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color.metali b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_color.metali
@@ -10,7 +10,7 @@ struct Texture2DMSDescriptorHeap
 [[fragment]]
 float4 shaderMain(float4 position [[position]],
                   constant Texture2DMSDescriptorHeap& g_Texture2DMSDescriptorHeap [[buffer(0)]],
-                  constant PushConstants& g_PushConstants [[buffer(8)]])
+                  constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     float4 result = g_Texture2DMSDescriptorHeap.g[g_PushConstants.ResourceDescriptorIndex].read(uint2(position.xy), 0);
     
diff --git a/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth.metali b/UnleashedRecomp/gpu/shader/msl/resolve_msaa_depth.metali
@@ -15,7 +15,7 @@ struct PixelShaderOutput
 [[fragment]]
 PixelShaderOutput shaderMain(float4 position [[position]],
                        constant Texture2DMSDescriptorHeap& g_Texture2DMSDescriptorHeap [[buffer(0)]],
-                       constant PushConstants& g_PushConstants [[buffer(8)]])
+                       constant PushConstants& g_PushConstants [[buffer(4)]])
 {
     PixelShaderOutput output = PixelShaderOutput{};
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ float4 shaderMain(float4 iPos [[position]],`
`14`	`14`	`Interpolators input [[stage_in]],`
`15`	`15`	`constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],`
`16`	`16`	`constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(3)]],`
`17`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`17`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`18`	`18`	`{`
`19`	`19`	`texture2d<float> texture = g_Texture2DDescriptorHeap.g[s0_Texture2DDescriptorIndex];`
`20`	`20`	`sampler samplerState = g_SamplerDescriptorHeap.g[s0_SamplerDescriptorIndex];`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ struct Texture2DDescriptorHeap`
`8`	`8`	`[[fragment]]`
`9`	`9`	`float4 shaderMain(float4 position [[position]],`
`10`	`10`	`constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],`
`11`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`11`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`12`	`12`	`{`
`13`	`13`	`return g_Texture2DDescriptorHeap.g[g_PushConstants.ResourceDescriptorIndex].read(uint2(position.xy), 0);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ struct PixelShaderOutput`
`13`	`13`	`[[fragment]]`
`14`	`14`	`PixelShaderOutput shaderMain(float4 position [[position]],`
`15`	`15`	`constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],`
`16`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`16`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`17`	`17`	`{`
`18`	`18`	`PixelShaderOutput output = PixelShaderOutput{};`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ struct Interpolators`
`14`	`14`	`float4 shaderMain(Interpolators input [[stage_in]],`
`15`	`15`	`constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],`
`16`	`16`	`constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(3)]],`
`17`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`17`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`18`	`18`	`{`
`19`	`19`	`texture2d<float> texture = g_Texture2DDescriptorHeap.g[s0_Texture2DDescriptorIndex];`
`20`	`20`	`sampler samplerState = g_SamplerDescriptorHeap.g[s0_SamplerDescriptorIndex];`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct Interpolators`
`34`	`34`
`35`	`35`	`[[vertex]]`
`36`	`36`	`Interpolators shaderMain(VertexShaderInput input [[stage_in]],`
`37`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`37`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`38`	`38`	`{`
`39`	`39`	`Interpolators output;`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ struct Interpolators`
`35`	`35`
`36`	`36`	`[[vertex]]`
`37`	`37`	`Interpolators shaderMain(VertexShaderInput input [[stage_in]],`
`38`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`38`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`39`	`39`	`{`
`40`	`40`	`Interpolators output;`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ float4 shaderMain(float4 position [[position]],`
`22`	`22`	`Interpolators input [[stage_in]],`
`23`	`23`	`constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],`
`24`	`24`	`constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(3)]],`
`25`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`25`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`26`	`26`	`{`
`27`	`27`	`texture2d<float> sampColor = g_Texture2DDescriptorHeap.g[sampColor_Texture2DDescriptorIndex];`
`28`	`28`	`texture2d<float> sampVelocityMap = g_Texture2DDescriptorHeap.g[sampVelocityMap_Texture2DDescriptorIndex];`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`[[fragment]]`
`10`	`10`	`float4 shaderMain(float4 position [[position]],`
`11`	`11`	`constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],`
`12`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`12`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`13`	`13`	`{`
`14`	`14`	`texture2d<float> texture = g_Texture2DDescriptorHeap.g[g_TextureDescriptorIndex];`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ float4 shaderMain(float4 iPosition [[position]],`
`29`	`29`	`Interpolators input [[stage_in]],`
`30`	`30`	`constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],`
`31`	`31`	`constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(3)]],`
`32`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`32`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`33`	`33`	`{`
`34`	`34`	`texture2d<float> texture = g_Texture2DDescriptorHeap.g[s0_Texture2DDescriptorIndex];`
`35`	`35`	`sampler samplerState = g_SamplerDescriptorHeap.g[s0_SamplerDescriptorIndex];`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ float4 SampleSdfFont(float4 color, texture2d<float> texture, float2 uv, float2 s`
`129`	`129`	`float4 shaderMain(Interpolators interpolators [[stage_in]],`
`130`	`130`	`constant Texture2DDescriptorHeap& g_Texture2DDescriptorHeap [[buffer(0)]],`
`131`	`131`	`constant SamplerDescriptorHeap& g_SamplerDescriptorHeap [[buffer(1)]],`
`132`		`- constant PushConstants& g_PushConstants [[buffer(8)]])`
	`132`	`+ constant PushConstants& g_PushConstants [[buffer(4)]])`
`133`	`133`	`{`
`134`	`134`	`float4 color = interpolators.Color;`
`135`	`135`	`color *= PixelAntialiasing(interpolators.Position.xy - g_PushConstants.ProceduralOrigin, g_PushConstants);`