From 72c4ba111871fab30610cb21f1d28b7cc705e9ff Mon Sep 17 00:00:00 2001 From: Bill Hollings Date: Fri, 17 Jul 2020 22:18:08 -0400 Subject: [PATCH] Remove unneeded MVK_IOS_SIMULATOR and MVK_TVOS_SIMULATOR macros. --- Common/MVKCommonEnvironment.h | 10 ---------- MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.mm | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Common/MVKCommonEnvironment.h b/Common/MVKCommonEnvironment.h index 502a4c94..4fe27b4f 100644 --- a/Common/MVKCommonEnvironment.h +++ b/Common/MVKCommonEnvironment.h @@ -72,16 +72,6 @@ extern "C" { # define MVK_OS_SIMULATOR TARGET_OS_SIMULATOR #endif -/** Building for iOS Simulator. */ -#ifndef MVK_IOS_SIMULATOR -# define MVK_IOS_SIMULATOR (MVK_IOS && MVK_OS_SIMULATOR) -#endif - -/** Building for tvOS Simulator. */ -#ifndef MVK_TVOS_SIMULATOR -# define MVK_TVOS_SIMULATOR (MVK_TVOS && MVK_OS_SIMULATOR) -#endif - /** Directive to identify public symbols. */ #define MVK_PUBLIC_SYMBOL __attribute__((visibility("default"))) diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.mm b/MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.mm index aaa4147a..6978d395 100644 --- a/MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.mm +++ b/MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.mm @@ -1299,8 +1299,8 @@ void MVKPixelFormats::modifyMTLFormatCapabilities(id mtlDevice) { addMTLVertexFormatCapabilities( tvOS_GPUFamily1_v3, Half, Vertex ); addMTLVertexFormatCapabilities( tvOS_GPUFamily1_v3, UChar4Normalized_BGRA, Vertex ); - // Disable for simulator last. -#if MVK_TVOS_SIMULATOR + // Disable for tvOS simulator last. +#if MVK_OS_SIMULATOR disableAllMTLPixelFormatCapabilities(R8Unorm_sRGB); disableAllMTLPixelFormatCapabilities(RG8Unorm_sRGB); disableAllMTLPixelFormatCapabilities(B5G6R5Unorm); @@ -1435,8 +1435,8 @@ void MVKPixelFormats::modifyMTLFormatCapabilities(id mtlDevice) { addMTLVertexFormatCapabilities( iOS_GPUFamily1_v4, Half, Vertex ); addMTLVertexFormatCapabilities( iOS_GPUFamily1_v4, UChar4Normalized_BGRA, Vertex ); -// Disable for simulator last. -#if MVK_IOS_SIMULATOR +// Disable for iOS simulator last. +#if MVK_OS_SIMULATOR disableAllMTLPixelFormatCapabilities(R8Unorm_sRGB); disableAllMTLPixelFormatCapabilities(RG8Unorm_sRGB); disableAllMTLPixelFormatCapabilities(B5G6R5Unorm);