Merge pull request #2330 from warmenhoven/warmenhoven/pr/tvos13

Fixes to enable running on tvOS 13
KhronosGroup · Sep 10, 2024 · 8a94475 · 8a94475
2 parents d128a7e + 107429b
commit 8a94475
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/MoltenVK/MoltenVK.xcodeproj/project.pbxproj b/MoltenVK/MoltenVK.xcodeproj/project.pbxproj
@@ -2561,6 +2561,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_DYLIB_INSTALL_NAME = "@rpath/${PRODUCT_NAME}.framework/${PRODUCT_NAME}";
 				OTHER_LDFLAGS = (
+					"-ld_classic",
 					"-all_load",
 					"-w",
 				);
@@ -2574,6 +2575,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				LD_DYLIB_INSTALL_NAME = "@rpath/${PRODUCT_NAME}.framework/${PRODUCT_NAME}";
 				OTHER_LDFLAGS = (
+					"-ld_classic",
 					"-all_load",
 					"-w",
 				);

diff --git a/MoltenVK/MoltenVK/Commands/MVKCommandPipelineStateFactoryShaderSource.h b/MoltenVK/MoltenVK/Commands/MVKCommandPipelineStateFactoryShaderSource.h
@@ -163,41 +163,47 @@ kernel void cmdResolveColorImage2DFloat(texture2d<float, access::write> dst [[ t
     dst.write(src.read(pos, 0), pos);                                                                           \n\
 }                                                                                                               \n\
                                                                                                                 \n\
+#if __HAVE_TEXTURE_2D_MS_ARRAY__                                                                                \n\
 kernel void cmdResolveColorImage2DFloatArray(texture2d_array<float, access::write> dst [[ texture(0) ]],        \n\
                                              texture2d_ms_array<float, access::read> src [[ texture(1) ]],      \n\
                                              uint2 pos [[thread_position_in_grid]]) {                           \n\
     for (uint i = 0u; i < src.get_array_size(); ++i) {                                                          \n\
         dst.write(src.read(pos, i, 0), pos, i);                                                                 \n\
     }                                                                                                           \n\
 }                                                                                                               \n\
+#endif                                                                                                          \n\
                                                                                                                 \n\
 kernel void cmdResolveColorImage2DUInt(texture2d<uint, access::write> dst [[ texture(0) ]],                     \n\
                                        texture2d_ms<uint, access::read> src [[ texture(1) ]],                   \n\
                                        uint2 pos [[thread_position_in_grid]]) {                                 \n\
     dst.write(src.read(pos, 0), pos);                                                                           \n\
 }                                                                                                               \n\
                                                                                                                 \n\
+#if __HAVE_TEXTURE_2D_MS_ARRAY__                                                                                \n\
 kernel void cmdResolveColorImage2DUIntArray(texture2d_array<uint, access::write> dst [[ texture(0) ]],          \n\
                                             texture2d_ms_array<uint, access::read> src [[ texture(1) ]],        \n\
                                             uint2 pos [[thread_position_in_grid]]) {                            \n\
     for (uint i = 0u; i < src.get_array_size(); ++i) {                                                          \n\
         dst.write(src.read(pos, i, 0), pos, i);                                                                 \n\
     }                                                                                                           \n\
 }                                                                                                               \n\
+#endif                                                                                                          \n\
                                                                                                                 \n\
 kernel void cmdResolveColorImage2DInt(texture2d<int, access::write> dst [[ texture(0) ]],                       \n\
                                       texture2d_ms<int, access::read> src [[ texture(1) ]],                     \n\
                                       uint2 pos [[thread_position_in_grid]]) {                                  \n\
     dst.write(src.read(pos, 0), pos);                                                                           \n\
 }                                                                                                               \n\
                                                                                                                 \n\
+#if __HAVE_TEXTURE_2D_MS_ARRAY__                                                                                \n\
 kernel void cmdResolveColorImage2DIntArray(texture2d_array<int, access::write> dst [[ texture(0) ]],            \n\
                                            texture2d_ms_array<int, access::read> src [[ texture(1) ]],          \n\
                                            uint2 pos [[thread_position_in_grid]]) {                             \n\
     for (uint i = 0u; i < src.get_array_size(); ++i) {                                                          \n\
         dst.write(src.read(pos, i, 0), pos, i);                                                                 \n\
     }                                                                                                           \n\
 }                                                                                                               \n\
+#endif                                                                                                          \n\
                                                                                                                 \n\
 typedef struct {                                                                                                \n\
     uint32_t srcRowStride;                                                                                      \n\