Merge pull request #184 from Devsh-Graphics-Programming/new_tgmath

Przemog1 · web-flow · commit 105bcdb66a91 · 2025-02-25T12:54:07.000+01:00
New tgmath
diff --git a/28_FFTBloom/app_resources/fft_convolve_ifft.hlsl b/28_FFTBloom/app_resources/fft_convolve_ifft.hlsl
@@ -130,7 +130,7 @@ struct PreloadedSecondAxisAccessor : PreloadedAccessorMirrorTradeBase
 	{
 		if (glsl::gl_WorkGroupID().x)
 		{
-			const uint32_t y = bitReverseAs<uint32_t, NumWorkgroupsLog2>(glsl::gl_WorkGroupID().x);
+			const uint32_t y = bitReverseAs<uint32_t>(glsl::gl_WorkGroupID().x, NumWorkgroupsLog2);
 			uint32_t globalElementIndex = workgroup::SubgroupContiguousIndex();
 			[unroll]
 			for (uint32_t localElementIndex = 0; localElementIndex < ElementsPerInvocation; localElementIndex++)
diff --git a/28_FFTBloom/app_resources/kernel_fft_second_axis.hlsl b/28_FFTBloom/app_resources/kernel_fft_second_axis.hlsl
@@ -132,7 +132,7 @@ struct PreloadedSecondAxisAccessor : MultiChannelPreloadedAccessorMirrorTradeBas
 		// the element in the DFT with `x = F(x')` and `y = bitreverse(y')`
 		if (glsl::gl_WorkGroupID().x)
 		{
-			const uint32_t y = bitReverseAs<uint32_t, NumWorkgroupsLog2>(glsl::gl_WorkGroupID().x);
+			const uint32_t y = bitReverseAs<uint32_t>(glsl::gl_WorkGroupID().x, NumWorkgroupsLog2);
 			[unroll]
 			for (uint16_t channel = 0; channel < Channels; channel++)
 			{

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ struct PreloadedSecondAxisAccessor : PreloadedAccessorMirrorTradeBase`
`130`	`130`	`{`
`131`	`131`	`if (glsl::gl_WorkGroupID().x)`
`132`	`132`	`{`
`133`		`- const uint32_t y = bitReverseAs<uint32_t, NumWorkgroupsLog2>(glsl::gl_WorkGroupID().x);`
	`133`	`+ const uint32_t y = bitReverseAs<uint32_t>(glsl::gl_WorkGroupID().x, NumWorkgroupsLog2);`
`134`	`134`	`uint32_t globalElementIndex = workgroup::SubgroupContiguousIndex();`
`135`	`135`	`[unroll]`
`136`	`136`	`for (uint32_t localElementIndex = 0; localElementIndex < ElementsPerInvocation; localElementIndex++)`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ struct PreloadedSecondAxisAccessor : MultiChannelPreloadedAccessorMirrorTradeBas`
`132`	`132`	// the element in the DFT with `x = F(x')` and `y = bitreverse(y')`
`133`	`133`	`if (glsl::gl_WorkGroupID().x)`
`134`	`134`	`{`
`135`		`- const uint32_t y = bitReverseAs<uint32_t, NumWorkgroupsLog2>(glsl::gl_WorkGroupID().x);`
	`135`	`+ const uint32_t y = bitReverseAs<uint32_t>(glsl::gl_WorkGroupID().x, NumWorkgroupsLog2);`
`136`	`136`	`[unroll]`
`137`	`137`	`for (uint16_t channel = 0; channel < Channels; channel++)`
`138`	`138`	`{`