Merge pull request KhronosGroup#2415 from squidbus/atomic64

cdavis5e · web-flow · commit 9f0b616d9e2c · 2024-12-29T03:19:31.000-07:00
Remove atomic usage for RG32Uint.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKBuffer.mm b/MoltenVK/MoltenVK/GPUObjects/MVKBuffer.mm
@@ -296,7 +296,7 @@
         if ( mvkIsAnyFlagEnabled(_buffer->getUsage(), VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT) ) {
 			usage |= MTLTextureUsageShaderWrite;
 #if MVK_XCODE_15
-			if (getMetalFeatures().nativeTextureAtomics && (_mtlPixelFormat == MTLPixelFormatR32Sint || _mtlPixelFormat == MTLPixelFormatR32Uint || _mtlPixelFormat == MTLPixelFormatRG32Uint))
+			if (getMetalFeatures().nativeTextureAtomics && (_mtlPixelFormat == MTLPixelFormatR32Sint || _mtlPixelFormat == MTLPixelFormatR32Uint))
 				usage |= MTLTextureUsageShaderAtomic;
 #endif
         }
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.mm b/MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.mm
@@ -748,7 +748,7 @@
 	}
 
 #if MVK_XCODE_15
-	if (supportAtomics && (mtlFormat == MTLPixelFormatR32Uint || mtlFormat == MTLPixelFormatR32Sint || mtlFormat == MTLPixelFormatRG32Uint)) {
+	if (supportAtomics && (mtlFormat == MTLPixelFormatR32Uint || mtlFormat == MTLPixelFormatR32Sint)) {
 		mvkEnableFlags(mtlUsage, MTLTextureUsageShaderAtomic);
 	}
 #endif
@@ -1542,7 +1542,6 @@
 	// Including this here so we remember to update this if support is added to Vulkan in the future.
 	bool atomic64 = noVulkanSupport && (gpuCaps.supportsApple9 || (gpuCaps.supportsApple8 && gpuCaps.supportsMac2));
 	enableMTLPixFmtCapsIf( atomic64, RG32Uint, Atomic );
-	enableMTLPixFmtCapsIf( atomic64, RG32Sint, Atomic );
 
 	setMTLPixFmtCapsIf( iosOnly8, RG32Float, RWCMB );
 	setMTLPixFmtCapsIf( iosOnly6, RG32Float, RWCB );

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@`
`296`	`296`	`if ( mvkIsAnyFlagEnabled(_buffer->getUsage(), VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT) ) {`
`297`	`297`	`usage \|= MTLTextureUsageShaderWrite;`
`298`	`298`	`#if MVK_XCODE_15`
`299`		`- if (getMetalFeatures().nativeTextureAtomics && (_mtlPixelFormat == MTLPixelFormatR32Sint \|\| _mtlPixelFormat == MTLPixelFormatR32Uint \|\| _mtlPixelFormat == MTLPixelFormatRG32Uint))`
	`299`	`+ if (getMetalFeatures().nativeTextureAtomics && (_mtlPixelFormat == MTLPixelFormatR32Sint \|\| _mtlPixelFormat == MTLPixelFormatR32Uint))`
`300`	`300`	`usage \|= MTLTextureUsageShaderAtomic;`
`301`	`301`	`#endif`
`302`	`302`	`}`
Original file line number	Diff line number	Diff line change
`@@ -748,7 +748,7 @@`
`748`	`748`	`}`
`749`	`749`
`750`	`750`	`#if MVK_XCODE_15`
`751`		`- if (supportAtomics && (mtlFormat == MTLPixelFormatR32Uint \|\| mtlFormat == MTLPixelFormatR32Sint \|\| mtlFormat == MTLPixelFormatRG32Uint)) {`
	`751`	`+ if (supportAtomics && (mtlFormat == MTLPixelFormatR32Uint \|\| mtlFormat == MTLPixelFormatR32Sint)) {`
`752`	`752`	`mvkEnableFlags(mtlUsage, MTLTextureUsageShaderAtomic);`
`753`	`753`	`}`
`754`	`754`	`#endif`
`@@ -1542,7 +1542,6 @@`
`1542`	`1542`	`// Including this here so we remember to update this if support is added to Vulkan in the future.`
`1543`	`1543`	`bool atomic64 = noVulkanSupport && (gpuCaps.supportsApple9 \|\| (gpuCaps.supportsApple8 && gpuCaps.supportsMac2));`
`1544`	`1544`	`enableMTLPixFmtCapsIf( atomic64, RG32Uint, Atomic );`
`1545`		`- enableMTLPixFmtCapsIf( atomic64, RG32Sint, Atomic );`
`1546`	`1545`
`1547`	`1546`	`setMTLPixFmtCapsIf( iosOnly8, RG32Float, RWCMB );`
`1548`	`1547`	`setMTLPixFmtCapsIf( iosOnly6, RG32Float, RWCB );`