Remove atomic usage for RG32Uint.

squidbus · squidbus · commit d5a5d3a5dc2d · 2024-12-28T18:07:46.000-08:00
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

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`