Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unneeded MVK_IOS_SIMULATOR and MVK_TVOS_SIMULATOR macros.

Browse Source
This commit is contained in:
Bill Hollings 2020-07-17 22:18:08 -04:00
parent 5ff8531bba
commit 72c4ba1118
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Common/MVKCommonEnvironment.h
View File

@ -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")))

8
MoltenVK/MoltenVK/GPUObjects/MVKPixelFormats.mm
View File

@ -1299,8 +1299,8 @@ void MVKPixelFormats::modifyMTLFormatCapabilities(id<MTLDevice> 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> 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);