diff --git a/Demos/LunarG-VulkanSamples/Cube/Cube.entitlements b/Demos/Cube/Cube.entitlements similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/Cube.entitlements rename to Demos/Cube/Cube.entitlements diff --git a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj b/Demos/Cube/Cube.xcodeproj/project.pbxproj similarity index 99% rename from Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj rename to Demos/Cube/Cube.xcodeproj/project.pbxproj index 7e984073..b6cc7aee 100644 --- a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/project.pbxproj +++ b/Demos/Cube/Cube.xcodeproj/project.pbxproj @@ -38,7 +38,7 @@ A93DBF4B24A2A4D500079F64 /* Cube.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cube.app; sourceTree = BUILT_PRODUCTS_DIR; }; A94D4CB424A2A95E009C9139 /* InfoTV.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = InfoTV.plist; sourceTree = ""; }; A94D4CB624A2C9A3009C9139 /* MainTV.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MainTV.storyboard; sourceTree = ""; }; - A991E27524FD543A00D968D4 /* MoltenVK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MoltenVK.xcframework; path = ../../../MoltenVK/MoltenVK.xcframework; sourceTree = ""; }; + A991E27524FD543A00D968D4 /* MoltenVK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MoltenVK.xcframework; path = ../../MoltenVK/MoltenVK.xcframework; sourceTree = ""; }; A9B53B271C3AC0BE00ABC6F6 /* Cube.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cube.app; sourceTree = BUILT_PRODUCTS_DIR; }; A9B53B431C3AC15200ABC6F6 /* Cube.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Cube.app; sourceTree = BUILT_PRODUCTS_DIR; }; A9B67B6B1C3AAE9800373FFD /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -479,7 +479,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/include\"", - "\"$(SRCROOT)/../../../MoltenVK/include\"", + "\"$(SRCROOT)/../../MoltenVK/include\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -506,7 +506,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/include\"", - "\"$(SRCROOT)/../../../MoltenVK/include\"", + "\"$(SRCROOT)/../../MoltenVK/include\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme b/Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme rename to Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-iOS.xcscheme diff --git a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-macOS.xcscheme b/Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-macOS.xcscheme similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-macOS.xcscheme rename to Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-macOS.xcscheme diff --git a/Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-tvOS.xcscheme b/Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-tvOS.xcscheme similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-tvOS.xcscheme rename to Demos/Cube/Cube.xcodeproj/xcshareddata/xcschemes/Cube-tvOS.xcscheme diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/AppDelegate.h b/Demos/Cube/iOS/AppDelegate.h similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/iOS/AppDelegate.h rename to Demos/Cube/iOS/AppDelegate.h diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/AppDelegate.m b/Demos/Cube/iOS/AppDelegate.m similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/iOS/AppDelegate.m rename to Demos/Cube/iOS/AppDelegate.m diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/DemoViewController.h b/Demos/Cube/iOS/DemoViewController.h similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/iOS/DemoViewController.h rename to Demos/Cube/iOS/DemoViewController.h diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/DemoViewController.m b/Demos/Cube/iOS/DemoViewController.m similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/iOS/DemoViewController.m rename to Demos/Cube/iOS/DemoViewController.m diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/Info.plist b/Demos/Cube/iOS/Info.plist similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/iOS/Info.plist rename to Demos/Cube/iOS/Info.plist diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/InfoTV.plist b/Demos/Cube/iOS/InfoTV.plist similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/iOS/InfoTV.plist rename to Demos/Cube/iOS/InfoTV.plist diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/Prefix.pch b/Demos/Cube/iOS/Prefix.pch similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/iOS/Prefix.pch rename to Demos/Cube/iOS/Prefix.pch diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/Resources/Default-568h@2x.png b/Demos/Cube/iOS/Resources/Default-568h@2x.png similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/iOS/Resources/Default-568h@2x.png rename to Demos/Cube/iOS/Resources/Default-568h@2x.png diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/Resources/Default~ipad.png b/Demos/Cube/iOS/Resources/Default~ipad.png similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/iOS/Resources/Default~ipad.png rename to Demos/Cube/iOS/Resources/Default~ipad.png diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/Resources/Icon.png b/Demos/Cube/iOS/Resources/Icon.png similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/iOS/Resources/Icon.png rename to Demos/Cube/iOS/Resources/Icon.png diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Main.storyboard b/Demos/Cube/iOS/Resources/Main.storyboard similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Main.storyboard rename to Demos/Cube/iOS/Resources/Main.storyboard diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/MainTV.storyboard b/Demos/Cube/iOS/Resources/MainTV.storyboard similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/iOS/Resources/MainTV.storyboard rename to Demos/Cube/iOS/Resources/MainTV.storyboard diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/main.m b/Demos/Cube/iOS/main.m similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/iOS/main.m rename to Demos/Cube/iOS/main.m diff --git a/Demos/LunarG-VulkanSamples/Cube/include/cube.frag.inc b/Demos/Cube/include/cube.frag.inc similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/include/cube.frag.inc rename to Demos/Cube/include/cube.frag.inc diff --git a/Demos/LunarG-VulkanSamples/Cube/include/cube.vert.inc b/Demos/Cube/include/cube.vert.inc similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/include/cube.vert.inc rename to Demos/Cube/include/cube.vert.inc diff --git a/Demos/LunarG-VulkanSamples/Cube/include/vk_enum_string_helper.h b/Demos/Cube/include/vk_enum_string_helper.h similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/include/vk_enum_string_helper.h rename to Demos/Cube/include/vk_enum_string_helper.h diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/AppDelegate.h b/Demos/Cube/macOS/AppDelegate.h similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/AppDelegate.h rename to Demos/Cube/macOS/AppDelegate.h diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/AppDelegate.m b/Demos/Cube/macOS/AppDelegate.m similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/AppDelegate.m rename to Demos/Cube/macOS/AppDelegate.m diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/DemoViewController.h b/Demos/Cube/macOS/DemoViewController.h similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/DemoViewController.h rename to Demos/Cube/macOS/DemoViewController.h diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/DemoViewController.m b/Demos/Cube/macOS/DemoViewController.m similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/macOS/DemoViewController.m rename to Demos/Cube/macOS/DemoViewController.m diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Info.plist b/Demos/Cube/macOS/Info.plist similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/macOS/Info.plist rename to Demos/Cube/macOS/Info.plist diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Prefix.pch b/Demos/Cube/macOS/Prefix.pch similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/macOS/Prefix.pch rename to Demos/Cube/macOS/Prefix.pch diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/Main.storyboard b/Demos/Cube/macOS/Resources/Main.storyboard similarity index 100% rename from Demos/LunarG-VulkanSamples/Cube/macOS/Resources/Main.storyboard rename to Demos/Cube/macOS/Resources/Main.storyboard diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json b/Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json rename to Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png b/Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png rename to Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png b/Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png rename to Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png b/Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png rename to Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png b/Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png rename to Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png b/Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png rename to Demos/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/Contents.json b/Demos/Cube/macOS/Resources/macOS.xcassets/Contents.json similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/macOS.xcassets/Contents.json rename to Demos/Cube/macOS/Resources/macOS.xcassets/Contents.json diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/main.m b/Demos/Cube/macOS/main.m similarity index 100% rename from Demos/LunarG-VulkanSamples/API-Samples/macOS/main.m rename to Demos/Cube/macOS/main.m diff --git a/Demos/Demos.xcworkspace/contents.xcworkspacedata b/Demos/Demos.xcworkspace/contents.xcworkspacedata index 4a9447fc..5bf49c57 100644 --- a/Demos/Demos.xcworkspace/contents.xcworkspacedata +++ b/Demos/Demos.xcworkspace/contents.xcworkspacedata @@ -4,17 +4,7 @@ - - - - - - - - + + diff --git a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.entitlements b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.entitlements deleted file mode 100644 index ee95ab7e..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.entitlements +++ /dev/null @@ -1,10 +0,0 @@ - - - - - com.apple.security.app-sandbox - - com.apple.security.network.client - - - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj deleted file mode 100644 index 13c708e7..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/project.pbxproj +++ /dev/null @@ -1,812 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 52; - objects = { - -/* Begin PBXBuildFile section */ - A95C050B1C98FC1100CC653D /* blue.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05021C98FC1100CC653D /* blue.ppm */; }; - A95C050C1C98FC1100CC653D /* blue.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05021C98FC1100CC653D /* blue.ppm */; }; - A95C050D1C98FC1100CC653D /* green.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05041C98FC1100CC653D /* green.ppm */; }; - A95C050E1C98FC1100CC653D /* green.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05041C98FC1100CC653D /* green.ppm */; }; - A95C050F1C98FC1100CC653D /* logo-256x256-solid.png in Resources */ = {isa = PBXBuildFile; fileRef = A95C05051C98FC1100CC653D /* logo-256x256-solid.png */; }; - A95C05101C98FC1100CC653D /* logo-256x256-solid.png in Resources */ = {isa = PBXBuildFile; fileRef = A95C05051C98FC1100CC653D /* logo-256x256-solid.png */; }; - A95C05111C98FC1100CC653D /* logo-256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = A95C05061C98FC1100CC653D /* logo-256x256.png */; }; - A95C05121C98FC1100CC653D /* logo-256x256.png in Resources */ = {isa = PBXBuildFile; fileRef = A95C05061C98FC1100CC653D /* logo-256x256.png */; }; - A95C05131C98FC1100CC653D /* lunarg.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05071C98FC1100CC653D /* lunarg.ppm */; }; - A95C05141C98FC1100CC653D /* lunarg.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05071C98FC1100CC653D /* lunarg.ppm */; }; - A95C05151C98FC1100CC653D /* red.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05081C98FC1100CC653D /* red.ppm */; }; - A95C05161C98FC1100CC653D /* red.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05081C98FC1100CC653D /* red.ppm */; }; - A95C05171C98FC1100CC653D /* spotlight.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05091C98FC1100CC653D /* spotlight.ppm */; }; - A95C05181C98FC1100CC653D /* spotlight.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C05091C98FC1100CC653D /* spotlight.ppm */; }; - A95C05191C98FC1100CC653D /* yellow.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C050A1C98FC1100CC653D /* yellow.ppm */; }; - A95C051A1C98FC1100CC653D /* yellow.ppm in Resources */ = {isa = PBXBuildFile; fileRef = A95C050A1C98FC1100CC653D /* yellow.ppm */; }; - A964BD3D1E4EA6FC00CA9AF1 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A964BC611E4EA6FC00CA9AF1 /* util.cpp */; }; - A964BD3E1E4EA6FC00CA9AF1 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A964BC611E4EA6FC00CA9AF1 /* util.cpp */; }; - A964BD3F1E4EA6FC00CA9AF1 /* util_init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A964BC631E4EA6FC00CA9AF1 /* util_init.cpp */; }; - A964BD401E4EA6FC00CA9AF1 /* util_init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A964BC631E4EA6FC00CA9AF1 /* util_init.cpp */; }; - A991E26924FCA59600D968D4 /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A991E26824FCA59600D968D4 /* MoltenVK.xcframework */; }; - A991E26A24FCA59600D968D4 /* MoltenVK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A991E26824FCA59600D968D4 /* MoltenVK.xcframework */; }; - A9B67B781C3AAE9800373FFD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B6C1C3AAE9800373FFD /* AppDelegate.m */; }; - A9B67B7A1C3AAE9800373FFD /* DemoViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B6F1C3AAE9800373FFD /* DemoViewController.mm */; }; - A9B67B7C1C3AAE9800373FFD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B711C3AAE9800373FFD /* main.m */; }; - A9B67B7D1C3AAE9800373FFD /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B741C3AAE9800373FFD /* Default-568h@2x.png */; }; - A9B67B7E1C3AAE9800373FFD /* Default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B751C3AAE9800373FFD /* Default~ipad.png */; }; - A9B67B7F1C3AAE9800373FFD /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B761C3AAE9800373FFD /* Icon.png */; }; - A9B67B801C3AAE9800373FFD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B771C3AAE9800373FFD /* Main.storyboard */; }; - A9B67B8C1C3AAEA200373FFD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B831C3AAEA200373FFD /* AppDelegate.m */; }; - A9B67B8D1C3AAEA200373FFD /* DemoViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B851C3AAEA200373FFD /* DemoViewController.mm */; }; - A9B67B8F1C3AAEA200373FFD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B871C3AAEA200373FFD /* main.m */; }; - A9B67B901C3AAEA200373FFD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B8A1C3AAEA200373FFD /* Main.storyboard */; }; - A9B67B911C3AAEA200373FFD /* macOS.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B8B1C3AAEA200373FFD /* macOS.xcassets */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 1D6058910D05DD3D006BFB54 /* API-Samples.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "API-Samples.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - A92F37071C7E1B2B008F8BC9 /* Samples.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Samples.h; sourceTree = ""; }; - A95C05021C98FC1100CC653D /* blue.ppm */ = {isa = PBXFileReference; lastKnownFileType = file; path = blue.ppm; sourceTree = ""; }; - A95C05031C98FC1100CC653D /* cube_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cube_data.h; sourceTree = ""; }; - A95C05041C98FC1100CC653D /* green.ppm */ = {isa = PBXFileReference; lastKnownFileType = file; path = green.ppm; sourceTree = ""; }; - A95C05051C98FC1100CC653D /* logo-256x256-solid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-256x256-solid.png"; sourceTree = ""; }; - A95C05061C98FC1100CC653D /* logo-256x256.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-256x256.png"; sourceTree = ""; }; - A95C05071C98FC1100CC653D /* lunarg.ppm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lunarg.ppm; sourceTree = ""; }; - A95C05081C98FC1100CC653D /* red.ppm */ = {isa = PBXFileReference; lastKnownFileType = file; path = red.ppm; sourceTree = ""; }; - A95C05091C98FC1100CC653D /* spotlight.ppm */ = {isa = PBXFileReference; lastKnownFileType = file; path = spotlight.ppm; sourceTree = ""; }; - A95C050A1C98FC1100CC653D /* yellow.ppm */ = {isa = PBXFileReference; lastKnownFileType = file; path = yellow.ppm; sourceTree = ""; }; - A964BAF11E4E95E500CA9AF1 /* copy_blit_image.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = copy_blit_image.cpp; sourceTree = ""; }; - A964BAF51E4E968F00CA9AF1 /* 15-draw_cube.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "15-draw_cube.cpp"; sourceTree = ""; }; - A964BAF91E4E96B400CA9AF1 /* draw_subpasses.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw_subpasses.cpp; sourceTree = ""; }; - A964BAFD1E4E976C00CA9AF1 /* draw_textured_cube.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = draw_textured_cube.cpp; sourceTree = ""; }; - A964BAFF1E4E976C00CA9AF1 /* dynamic_uniform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dynamic_uniform.cpp; sourceTree = ""; }; - A964BB011E4E976C00CA9AF1 /* enable_validation_with_callback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = enable_validation_with_callback.cpp; sourceTree = ""; }; - A964BB031E4E976C00CA9AF1 /* enumerate_devices_adv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = enumerate_devices_adv.cpp; sourceTree = ""; }; - A964BB051E4E976C00CA9AF1 /* events.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = events.cpp; sourceTree = ""; }; - A964BB071E4E976C00CA9AF1 /* immutable_sampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = immutable_sampler.cpp; sourceTree = ""; }; - A964BB091E4E976C00CA9AF1 /* init_texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = init_texture.cpp; sourceTree = ""; }; - A964BB0B1E4E976C00CA9AF1 /* input_attachment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = input_attachment.cpp; sourceTree = ""; }; - A964BB0D1E4E976C00CA9AF1 /* instance_extension_properties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = instance_extension_properties.cpp; sourceTree = ""; }; - A964BB0F1E4E976C00CA9AF1 /* instance_layer_extension_properties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = instance_layer_extension_properties.cpp; sourceTree = ""; }; - A964BB111E4E976C00CA9AF1 /* instance_layer_properties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = instance_layer_properties.cpp; sourceTree = ""; }; - A964BB131E4E976C00CA9AF1 /* memory_barriers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = memory_barriers.cpp; sourceTree = ""; }; - A964BB151E4E976C00CA9AF1 /* multiple_sets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = multiple_sets.cpp; sourceTree = ""; }; - A964BB171E4E976C00CA9AF1 /* multithreaded_command_buffers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = multithreaded_command_buffers.cpp; sourceTree = ""; }; - A964BB191E4E976C00CA9AF1 /* occlusion_query.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = occlusion_query.cpp; sourceTree = ""; }; - A964BB1B1E4E976C00CA9AF1 /* pipeline_cache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pipeline_cache.cpp; sourceTree = ""; }; - A964BB1D1E4E976C00CA9AF1 /* pipeline_derivative.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pipeline_derivative.cpp; sourceTree = ""; }; - A964BB1F1E4E976C00CA9AF1 /* push_constants.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = push_constants.cpp; sourceTree = ""; }; - A964BB211E4E976C00CA9AF1 /* secondary_command_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = secondary_command_buffer.cpp; sourceTree = ""; }; - A964BB231E4E976C00CA9AF1 /* separate_image_sampler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = separate_image_sampler.cpp; sourceTree = ""; }; - A964BB251E4E976C00CA9AF1 /* spirv_assembly.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spirv_assembly.cpp; sourceTree = ""; }; - A964BB271E4E976C00CA9AF1 /* spirv_specialization.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spirv_specialization.cpp; sourceTree = ""; }; - A964BB291E4E976C00CA9AF1 /* template.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = template.cpp; sourceTree = ""; }; - A964BB2B1E4E976C00CA9AF1 /* texel_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = texel_buffer.cpp; sourceTree = ""; }; - A964BC601E4EA6FC00CA9AF1 /* samples_platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = samples_platform.h; sourceTree = ""; }; - A964BC611E4EA6FC00CA9AF1 /* util.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util.cpp; sourceTree = ""; }; - A964BC621E4EA6FC00CA9AF1 /* util.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = util.hpp; sourceTree = ""; }; - A964BC631E4EA6FC00CA9AF1 /* util_init.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = util_init.cpp; sourceTree = ""; }; - A964BC641E4EA6FC00CA9AF1 /* util_init.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = util_init.hpp; sourceTree = ""; }; - A977BCFE1B66BB010067E5BF /* API-Samples.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "API-Samples.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - A991E26824FCA59600D968D4 /* MoltenVK.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = MoltenVK.xcframework; path = ../../../MoltenVK/MoltenVK.xcframework; sourceTree = ""; }; - A99B2F0D24436190001117F7 /* generateSPIRVShaders */ = {isa = PBXFileReference; lastKnownFileType = text; path = generateSPIRVShaders; sourceTree = ""; }; - A9B67B6B1C3AAE9800373FFD /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - A9B67B6C1C3AAE9800373FFD /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - A9B67B6E1C3AAE9800373FFD /* DemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoViewController.h; sourceTree = ""; }; - A9B67B6F1C3AAE9800373FFD /* DemoViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DemoViewController.mm; sourceTree = ""; }; - A9B67B701C3AAE9800373FFD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A9B67B711C3AAE9800373FFD /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - A9B67B721C3AAE9800373FFD /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; - A9B67B741C3AAE9800373FFD /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - A9B67B751C3AAE9800373FFD /* Default~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default~ipad.png"; sourceTree = ""; }; - A9B67B761C3AAE9800373FFD /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; - A9B67B771C3AAE9800373FFD /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; - A9B67B821C3AAEA200373FFD /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - A9B67B831C3AAEA200373FFD /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - A9B67B841C3AAEA200373FFD /* DemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoViewController.h; sourceTree = ""; }; - A9B67B851C3AAEA200373FFD /* DemoViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DemoViewController.mm; sourceTree = ""; }; - A9B67B861C3AAEA200373FFD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A9B67B871C3AAEA200373FFD /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - A9B67B881C3AAEA200373FFD /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; - A9B67B8A1C3AAEA200373FFD /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; - A9B67B8B1C3AAEA200373FFD /* macOS.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = macOS.xcassets; sourceTree = ""; }; - A9B735072576E0D900455E2A /* API-Samples.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "API-Samples.entitlements"; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A991E26924FCA59600D968D4 /* MoltenVK.xcframework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A977BCF11B66BB010067E5BF /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A991E26A24FCA59600D968D4 /* MoltenVK.xcframework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 1D6058910D05DD3D006BFB54 /* API-Samples.app */, - A977BCFE1B66BB010067E5BF /* API-Samples.app */, - ); - name = Products; - sourceTree = ""; - }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { - isa = PBXGroup; - children = ( - A9B735072576E0D900455E2A /* API-Samples.entitlements */, - A92F37071C7E1B2B008F8BC9 /* Samples.h */, - A99B2F0D24436190001117F7 /* generateSPIRVShaders */, - A95C03971C98FBED00CC653D /* API-Samples */, - A9B67B6A1C3AAE9800373FFD /* iOS */, - A9B67B811C3AAEA200373FFD /* macOS */, - 19C28FACFE9D520D11CA2CBB /* Products */, - A9C2AB9F218505B000DDBC03 /* Frameworks */, - ); - name = CustomTemplate; - sourceTree = ""; - }; - A95C03971C98FBED00CC653D /* API-Samples */ = { - isa = PBXGroup; - children = ( - A964BAF01E4E95E500CA9AF1 /* copy_blit_image */, - A95C05011C98FC1100CC653D /* data */, - A964BAF41E4E968F00CA9AF1 /* 15-draw_cube */, - A964BAF81E4E96B400CA9AF1 /* draw_subpasses */, - A964BAFC1E4E976C00CA9AF1 /* draw_textured_cube */, - A964BAFE1E4E976C00CA9AF1 /* dynamic_uniform */, - A964BB001E4E976C00CA9AF1 /* enable_validation_with_callback */, - A964BB021E4E976C00CA9AF1 /* enumerate_devices_adv */, - A964BB041E4E976C00CA9AF1 /* events */, - A964BB061E4E976C00CA9AF1 /* immutable_sampler */, - A964BB081E4E976C00CA9AF1 /* init_texture */, - A964BB0A1E4E976C00CA9AF1 /* input_attachment */, - A964BB0C1E4E976C00CA9AF1 /* instance_extension_properties */, - A964BB0E1E4E976C00CA9AF1 /* instance_layer_extension_properties */, - A964BB101E4E976C00CA9AF1 /* instance_layer_properties */, - A964BB121E4E976C00CA9AF1 /* memory_barriers */, - A964BB141E4E976C00CA9AF1 /* multiple_sets */, - A964BB161E4E976C00CA9AF1 /* multithreaded_command_buffers */, - A964BB181E4E976C00CA9AF1 /* occlusion_query */, - A964BB1A1E4E976C00CA9AF1 /* pipeline_cache */, - A964BB1C1E4E976C00CA9AF1 /* pipeline_derivative */, - A964BB1E1E4E976C00CA9AF1 /* push_constants */, - A964BB201E4E976C00CA9AF1 /* secondary_command_buffer */, - A964BB221E4E976C00CA9AF1 /* separate_image_sampler */, - A964BB241E4E976C00CA9AF1 /* spirv_assembly */, - A964BB261E4E976C00CA9AF1 /* spirv_specialization */, - A964BB281E4E976C00CA9AF1 /* template */, - A964BB2A1E4E976C00CA9AF1 /* texel_buffer */, - A964BB5C1E4EA6FB00CA9AF1 /* utils */, - ); - name = "API-Samples"; - path = "../VulkanSamples/API-Samples"; - sourceTree = ""; - }; - A95C05011C98FC1100CC653D /* data */ = { - isa = PBXGroup; - children = ( - A95C05021C98FC1100CC653D /* blue.ppm */, - A95C05031C98FC1100CC653D /* cube_data.h */, - A95C05041C98FC1100CC653D /* green.ppm */, - A95C05051C98FC1100CC653D /* logo-256x256-solid.png */, - A95C05061C98FC1100CC653D /* logo-256x256.png */, - A95C05071C98FC1100CC653D /* lunarg.ppm */, - A95C05081C98FC1100CC653D /* red.ppm */, - A95C05091C98FC1100CC653D /* spotlight.ppm */, - A95C050A1C98FC1100CC653D /* yellow.ppm */, - ); - path = data; - sourceTree = ""; - }; - A964BAF01E4E95E500CA9AF1 /* copy_blit_image */ = { - isa = PBXGroup; - children = ( - A964BAF11E4E95E500CA9AF1 /* copy_blit_image.cpp */, - ); - path = copy_blit_image; - sourceTree = ""; - }; - A964BAF41E4E968F00CA9AF1 /* 15-draw_cube */ = { - isa = PBXGroup; - children = ( - A964BAF51E4E968F00CA9AF1 /* 15-draw_cube.cpp */, - ); - path = "15-draw_cube"; - sourceTree = ""; - }; - A964BAF81E4E96B400CA9AF1 /* draw_subpasses */ = { - isa = PBXGroup; - children = ( - A964BAF91E4E96B400CA9AF1 /* draw_subpasses.cpp */, - ); - path = draw_subpasses; - sourceTree = ""; - }; - A964BAFC1E4E976C00CA9AF1 /* draw_textured_cube */ = { - isa = PBXGroup; - children = ( - A964BAFD1E4E976C00CA9AF1 /* draw_textured_cube.cpp */, - ); - path = draw_textured_cube; - sourceTree = ""; - }; - A964BAFE1E4E976C00CA9AF1 /* dynamic_uniform */ = { - isa = PBXGroup; - children = ( - A964BAFF1E4E976C00CA9AF1 /* dynamic_uniform.cpp */, - ); - path = dynamic_uniform; - sourceTree = ""; - }; - A964BB001E4E976C00CA9AF1 /* enable_validation_with_callback */ = { - isa = PBXGroup; - children = ( - A964BB011E4E976C00CA9AF1 /* enable_validation_with_callback.cpp */, - ); - path = enable_validation_with_callback; - sourceTree = ""; - }; - A964BB021E4E976C00CA9AF1 /* enumerate_devices_adv */ = { - isa = PBXGroup; - children = ( - A964BB031E4E976C00CA9AF1 /* enumerate_devices_adv.cpp */, - ); - path = enumerate_devices_adv; - sourceTree = ""; - }; - A964BB041E4E976C00CA9AF1 /* events */ = { - isa = PBXGroup; - children = ( - A964BB051E4E976C00CA9AF1 /* events.cpp */, - ); - path = events; - sourceTree = ""; - }; - A964BB061E4E976C00CA9AF1 /* immutable_sampler */ = { - isa = PBXGroup; - children = ( - A964BB071E4E976C00CA9AF1 /* immutable_sampler.cpp */, - ); - path = immutable_sampler; - sourceTree = ""; - }; - A964BB081E4E976C00CA9AF1 /* init_texture */ = { - isa = PBXGroup; - children = ( - A964BB091E4E976C00CA9AF1 /* init_texture.cpp */, - ); - path = init_texture; - sourceTree = ""; - }; - A964BB0A1E4E976C00CA9AF1 /* input_attachment */ = { - isa = PBXGroup; - children = ( - A964BB0B1E4E976C00CA9AF1 /* input_attachment.cpp */, - ); - path = input_attachment; - sourceTree = ""; - }; - A964BB0C1E4E976C00CA9AF1 /* instance_extension_properties */ = { - isa = PBXGroup; - children = ( - A964BB0D1E4E976C00CA9AF1 /* instance_extension_properties.cpp */, - ); - path = instance_extension_properties; - sourceTree = ""; - }; - A964BB0E1E4E976C00CA9AF1 /* instance_layer_extension_properties */ = { - isa = PBXGroup; - children = ( - A964BB0F1E4E976C00CA9AF1 /* instance_layer_extension_properties.cpp */, - ); - path = instance_layer_extension_properties; - sourceTree = ""; - }; - A964BB101E4E976C00CA9AF1 /* instance_layer_properties */ = { - isa = PBXGroup; - children = ( - A964BB111E4E976C00CA9AF1 /* instance_layer_properties.cpp */, - ); - path = instance_layer_properties; - sourceTree = ""; - }; - A964BB121E4E976C00CA9AF1 /* memory_barriers */ = { - isa = PBXGroup; - children = ( - A964BB131E4E976C00CA9AF1 /* memory_barriers.cpp */, - ); - path = memory_barriers; - sourceTree = ""; - }; - A964BB141E4E976C00CA9AF1 /* multiple_sets */ = { - isa = PBXGroup; - children = ( - A964BB151E4E976C00CA9AF1 /* multiple_sets.cpp */, - ); - path = multiple_sets; - sourceTree = ""; - }; - A964BB161E4E976C00CA9AF1 /* multithreaded_command_buffers */ = { - isa = PBXGroup; - children = ( - A964BB171E4E976C00CA9AF1 /* multithreaded_command_buffers.cpp */, - ); - path = multithreaded_command_buffers; - sourceTree = ""; - }; - A964BB181E4E976C00CA9AF1 /* occlusion_query */ = { - isa = PBXGroup; - children = ( - A964BB191E4E976C00CA9AF1 /* occlusion_query.cpp */, - ); - path = occlusion_query; - sourceTree = ""; - }; - A964BB1A1E4E976C00CA9AF1 /* pipeline_cache */ = { - isa = PBXGroup; - children = ( - A964BB1B1E4E976C00CA9AF1 /* pipeline_cache.cpp */, - ); - path = pipeline_cache; - sourceTree = ""; - }; - A964BB1C1E4E976C00CA9AF1 /* pipeline_derivative */ = { - isa = PBXGroup; - children = ( - A964BB1D1E4E976C00CA9AF1 /* pipeline_derivative.cpp */, - ); - path = pipeline_derivative; - sourceTree = ""; - }; - A964BB1E1E4E976C00CA9AF1 /* push_constants */ = { - isa = PBXGroup; - children = ( - A964BB1F1E4E976C00CA9AF1 /* push_constants.cpp */, - ); - path = push_constants; - sourceTree = ""; - }; - A964BB201E4E976C00CA9AF1 /* secondary_command_buffer */ = { - isa = PBXGroup; - children = ( - A964BB211E4E976C00CA9AF1 /* secondary_command_buffer.cpp */, - ); - path = secondary_command_buffer; - sourceTree = ""; - }; - A964BB221E4E976C00CA9AF1 /* separate_image_sampler */ = { - isa = PBXGroup; - children = ( - A964BB231E4E976C00CA9AF1 /* separate_image_sampler.cpp */, - ); - path = separate_image_sampler; - sourceTree = ""; - }; - A964BB241E4E976C00CA9AF1 /* spirv_assembly */ = { - isa = PBXGroup; - children = ( - A964BB251E4E976C00CA9AF1 /* spirv_assembly.cpp */, - ); - path = spirv_assembly; - sourceTree = ""; - }; - A964BB261E4E976C00CA9AF1 /* spirv_specialization */ = { - isa = PBXGroup; - children = ( - A964BB271E4E976C00CA9AF1 /* spirv_specialization.cpp */, - ); - path = spirv_specialization; - sourceTree = ""; - }; - A964BB281E4E976C00CA9AF1 /* template */ = { - isa = PBXGroup; - children = ( - A964BB291E4E976C00CA9AF1 /* template.cpp */, - ); - path = template; - sourceTree = ""; - }; - A964BB2A1E4E976C00CA9AF1 /* texel_buffer */ = { - isa = PBXGroup; - children = ( - A964BB2B1E4E976C00CA9AF1 /* texel_buffer.cpp */, - ); - path = texel_buffer; - sourceTree = ""; - }; - A964BB5C1E4EA6FB00CA9AF1 /* utils */ = { - isa = PBXGroup; - children = ( - A964BC601E4EA6FC00CA9AF1 /* samples_platform.h */, - A964BC611E4EA6FC00CA9AF1 /* util.cpp */, - A964BC621E4EA6FC00CA9AF1 /* util.hpp */, - A964BC631E4EA6FC00CA9AF1 /* util_init.cpp */, - A964BC641E4EA6FC00CA9AF1 /* util_init.hpp */, - ); - path = utils; - sourceTree = ""; - }; - A9B67B6A1C3AAE9800373FFD /* iOS */ = { - isa = PBXGroup; - children = ( - A9B67B6B1C3AAE9800373FFD /* AppDelegate.h */, - A9B67B6C1C3AAE9800373FFD /* AppDelegate.m */, - A9B67B6E1C3AAE9800373FFD /* DemoViewController.h */, - A9B67B6F1C3AAE9800373FFD /* DemoViewController.mm */, - A9B67B701C3AAE9800373FFD /* Info.plist */, - A9B67B711C3AAE9800373FFD /* main.m */, - A9B67B721C3AAE9800373FFD /* Prefix.pch */, - A9B67B731C3AAE9800373FFD /* Resources */, - ); - path = iOS; - sourceTree = ""; - }; - A9B67B731C3AAE9800373FFD /* Resources */ = { - isa = PBXGroup; - children = ( - A9B67B741C3AAE9800373FFD /* Default-568h@2x.png */, - A9B67B751C3AAE9800373FFD /* Default~ipad.png */, - A9B67B761C3AAE9800373FFD /* Icon.png */, - A9B67B771C3AAE9800373FFD /* Main.storyboard */, - ); - path = Resources; - sourceTree = ""; - }; - A9B67B811C3AAEA200373FFD /* macOS */ = { - isa = PBXGroup; - children = ( - A9B67B821C3AAEA200373FFD /* AppDelegate.h */, - A9B67B831C3AAEA200373FFD /* AppDelegate.m */, - A9B67B841C3AAEA200373FFD /* DemoViewController.h */, - A9B67B851C3AAEA200373FFD /* DemoViewController.mm */, - A9B67B861C3AAEA200373FFD /* Info.plist */, - A9B67B871C3AAEA200373FFD /* main.m */, - A9B67B881C3AAEA200373FFD /* Prefix.pch */, - A9B67B891C3AAEA200373FFD /* Resources */, - ); - path = macOS; - sourceTree = ""; - }; - A9B67B891C3AAEA200373FFD /* Resources */ = { - isa = PBXGroup; - children = ( - A9B67B8A1C3AAEA200373FFD /* Main.storyboard */, - A9B67B8B1C3AAEA200373FFD /* macOS.xcassets */, - ); - path = Resources; - sourceTree = ""; - }; - A9C2AB9F218505B000DDBC03 /* Frameworks */ = { - isa = PBXGroup; - children = ( - A991E26824FCA59600D968D4 /* MoltenVK.xcframework */, - ); - name = Frameworks; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* API-Samples-iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "API-Samples-iOS" */; - buildPhases = ( - 1D60588D0D05DD3D006BFB54 /* Resources */, - 1D60588E0D05DD3D006BFB54 /* Sources */, - 1D60588F0D05DD3D006BFB54 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "API-Samples-iOS"; - productName = foo; - productReference = 1D6058910D05DD3D006BFB54 /* API-Samples.app */; - productType = "com.apple.product-type.application"; - }; - A977BCBD1B66BB010067E5BF /* API-Samples-macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = A977BCFB1B66BB010067E5BF /* Build configuration list for PBXNativeTarget "API-Samples-macOS" */; - buildPhases = ( - A977BCBE1B66BB010067E5BF /* Resources */, - A977BCC91B66BB010067E5BF /* Sources */, - A977BCF11B66BB010067E5BF /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "API-Samples-macOS"; - productName = foo; - productReference = A977BCFE1B66BB010067E5BF /* API-Samples.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1240; - }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "API-Samples" */; - compatibilityVersion = "Xcode 8.0"; - developmentRegion = en; - hasScannedForEncodings = 1; - knownRegions = ( - de, - en, - Base, - fr, - ja, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 1D6058900D05DD3D006BFB54 /* API-Samples-iOS */, - A977BCBD1B66BB010067E5BF /* API-Samples-macOS */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 1D60588D0D05DD3D006BFB54 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A9B67B7F1C3AAE9800373FFD /* Icon.png in Resources */, - A95C050B1C98FC1100CC653D /* blue.ppm in Resources */, - A9B67B801C3AAE9800373FFD /* Main.storyboard in Resources */, - A95C05151C98FC1100CC653D /* red.ppm in Resources */, - A95C05131C98FC1100CC653D /* lunarg.ppm in Resources */, - A95C05111C98FC1100CC653D /* logo-256x256.png in Resources */, - A95C050D1C98FC1100CC653D /* green.ppm in Resources */, - A9B67B7E1C3AAE9800373FFD /* Default~ipad.png in Resources */, - A95C050F1C98FC1100CC653D /* logo-256x256-solid.png in Resources */, - A95C05191C98FC1100CC653D /* yellow.ppm in Resources */, - A95C05171C98FC1100CC653D /* spotlight.ppm in Resources */, - A9B67B7D1C3AAE9800373FFD /* Default-568h@2x.png in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A977BCBE1B66BB010067E5BF /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A9B67B911C3AAEA200373FFD /* macOS.xcassets in Resources */, - A95C05141C98FC1100CC653D /* lunarg.ppm in Resources */, - A95C050E1C98FC1100CC653D /* green.ppm in Resources */, - A95C050C1C98FC1100CC653D /* blue.ppm in Resources */, - A95C05181C98FC1100CC653D /* spotlight.ppm in Resources */, - A9B67B901C3AAEA200373FFD /* Main.storyboard in Resources */, - A95C05161C98FC1100CC653D /* red.ppm in Resources */, - A95C051A1C98FC1100CC653D /* yellow.ppm in Resources */, - A95C05101C98FC1100CC653D /* logo-256x256-solid.png in Resources */, - A95C05121C98FC1100CC653D /* logo-256x256.png in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 1D60588E0D05DD3D006BFB54 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A9B67B7A1C3AAE9800373FFD /* DemoViewController.mm in Sources */, - A964BD3F1E4EA6FC00CA9AF1 /* util_init.cpp in Sources */, - A9B67B781C3AAE9800373FFD /* AppDelegate.m in Sources */, - A964BD3D1E4EA6FC00CA9AF1 /* util.cpp in Sources */, - A9B67B7C1C3AAE9800373FFD /* main.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A977BCC91B66BB010067E5BF /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A9B67B8C1C3AAEA200373FFD /* AppDelegate.m in Sources */, - A964BD401E4EA6FC00CA9AF1 /* util_init.cpp in Sources */, - A9B67B8F1C3AAEA200373FFD /* main.m in Sources */, - A964BD3E1E4EA6FC00CA9AF1 /* util.cpp in Sources */, - A9B67B8D1C3AAEA200373FFD /* DemoViewController.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 1D6058940D05DD3E006BFB54 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_ENTITLEMENTS = "API-Samples.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - GCC_PREFIX_HEADER = "$(SRCROOT)/iOS/Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "DEBUG=1", - _DEBUG, - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2; - MARKETING_VERSION = 1; - PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.API-Samples"; - PRODUCT_NAME = "API-Samples"; - SDKROOT = iphoneos; - SUPPORTS_MACCATALYST = YES; - TARGETED_DEVICE_FAMILY = "1,2,6"; - }; - name = Debug; - }; - 1D6058950D05DD3E006BFB54 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_ENTITLEMENTS = "API-Samples.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - GCC_PREFIX_HEADER = "$(SRCROOT)/iOS/Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - "IPHONEOS_DEPLOYMENT_TARGET[sdk=macosx*]" = 14.2; - MARKETING_VERSION = 1; - PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.API-Samples"; - PRODUCT_NAME = "API-Samples"; - SDKROOT = iphoneos; - SUPPORTS_MACCATALYST = YES; - TARGETED_DEVICE_FAMILY = "1,2,6"; - }; - name = Release; - }; - A977BCFC1B66BB010067E5BF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - COMBINE_HIDPI_IMAGES = YES; - GCC_PREFIX_HEADER = "$(SRCROOT)/macOS/Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = ( - "$(inherited)", - "DEBUG=1", - _DEBUG, - ); - INFOPLIST_FILE = "$(SRCROOT)/macOS/Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.11; - OTHER_LDFLAGS = ( - "$(inherited)", - "-w", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.API-Samples"; - PRODUCT_NAME = "API-Samples"; - SDKROOT = macosx; - }; - name = Debug; - }; - A977BCFD1B66BB010067E5BF /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - COMBINE_HIDPI_IMAGES = YES; - GCC_PREFIX_HEADER = "$(SRCROOT)/macOS/Prefix.pch"; - GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; - INFOPLIST_FILE = "$(SRCROOT)/macOS/Info.plist"; - MACOSX_DEPLOYMENT_TARGET = 10.11; - OTHER_LDFLAGS = ( - "$(inherited)", - "-w", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.API-Samples"; - PRODUCT_NAME = "API-Samples"; - SDKROOT = macosx; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = NO; - COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = NO; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "VULKAN_SAMPLES_BASE_DIR=\\\"Samples\\\"", - MVK_SAMP_15_draw_cube, - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/include\"", - "\"$(SRCROOT)/../VulkanSamples/API-Samples/utils\"", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.${PRODUCT_NAME:identifier}"; - PRODUCT_NAME = "${PROJECT}"; - }; - name = Debug; - }; - C01FCF5008A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = NO; - ENABLE_BITCODE = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "VULKAN_SAMPLES_BASE_DIR=\\\"Samples\\\"", - MVK_SAMP_15_draw_cube, - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/include\"", - "\"$(SRCROOT)/../VulkanSamples/API-Samples/utils\"", - ); - PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.${PRODUCT_NAME:identifier}"; - PRODUCT_NAME = "${PROJECT}"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "API-Samples-iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D6058940D05DD3E006BFB54 /* Debug */, - 1D6058950D05DD3E006BFB54 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - A977BCFB1B66BB010067E5BF /* Build configuration list for PBXNativeTarget "API-Samples-macOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - A977BCFC1B66BB010067E5BF /* Debug */, - A977BCFD1B66BB010067E5BF /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "API-Samples" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} diff --git a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme deleted file mode 100644 index 1bec6fdd..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-iOS.xcscheme +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-macOS.xcscheme b/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-macOS.xcscheme deleted file mode 100644 index e8cf6f10..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/API-Samples.xcodeproj/xcshareddata/xcschemes/API-Samples-macOS.xcscheme +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/Samples.h b/Demos/LunarG-VulkanSamples/API-Samples/Samples.h deleted file mode 100644 index 57dcaf75..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/Samples.h +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Samples.h - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -/** - * Loads the appropriate sample code, as indicated by the appropriate compiler build setting below. - * - * To select a sample to run, define one (and only one) of the macros below, either by adding - * a #define XXX statement at the top of this file, or more flexibily, by adding the macro value - * to the Preprocessor Macros (aka GCC_PREPROCESSOR_DEFINITIONS) compiler setting. - * - * To add a compiler setting, select the project in the Xcode Project Navigator panel, - * select the Build Settings panel, and add the value to the Preprocessor Macros - * (aka GCC_PREPROCESSOR_DEFINITIONS) entry. - * - * If you choose to add a #define statement to this file, be sure to clear the existing macro - * from the Preprocessor Macros (aka GCC_PREPROCESSOR_DEFINITIONS) compiler setting in Xcode. - * - * Each of the `API-Samples` demos loads SPIR-V shader code from a file. Before running - * any of these demos, generate these SPIR-V files from a command line as follows: - * - * cd MoltenVK/Demos/LunarG-VulkanSamples/API-Samples - * ./generateSPIRVShaders - * - * You only need to do this step once. It generates the SPIR-V shader code files for all of these demos. - */ - -#include - -// Rename main() in sample file so it won't conflict with the application main() -#define main(argc, argv) sample_main(argc, argv) - - -#ifdef MVK_SAMP_15_draw_cube -# define _5_draw_cube_vert __draw_cube_vert -# define _5_draw_cube_frag __draw_cube_frag -# include "../VulkanSamples/API-Samples/15-draw_cube/15-draw_cube.cpp" -#endif - -#ifdef MVK_SAMP_copy_blit_image -# include "../VulkanSamples/API-Samples/copy_blit_image/copy_blit_image.cpp" -#endif - -#ifdef MVK_SAMP_draw_subpasses -# include "../VulkanSamples/API-Samples/draw_subpasses/draw_subpasses.cpp" -#endif - -#ifdef MVK_SAMP_draw_textured_cube -# include "../VulkanSamples/API-Samples/draw_textured_cube/draw_textured_cube.cpp" -#endif - -#ifdef MVK_SAMP_dynamic_uniform -# include "../VulkanSamples/API-Samples/dynamic_uniform/dynamic_uniform.cpp" -#endif - -#ifdef MVK_SAMP_immutable_sampler -# include "../VulkanSamples/API-Samples/immutable_sampler/immutable_sampler.cpp" -#endif - -#ifdef MVK_SAMP_input_attachment -# include "../VulkanSamples/API-Samples/input_attachment/input_attachment.cpp" -#endif - -#ifdef MVK_SAMP_memory_barriers -# include "../VulkanSamples/API-Samples/memory_barriers/memory_barriers.cpp" -#endif - -#ifdef MVK_SAMP_multiple_sets -# include "../VulkanSamples/API-Samples/multiple_sets/multiple_sets.cpp" -#endif - -#ifdef MVK_SAMP_multithreaded_command_buffers -# include "../VulkanSamples/API-Samples/multithreaded_command_buffers/multithreaded_command_buffers.cpp" -#endif - -#ifdef MVK_SAMP_occlusion_query -# include "../VulkanSamples/API-Samples/occlusion_query/occlusion_query.cpp" -#endif - -#ifdef MVK_SAMP_pipeline_cache -# include "../VulkanSamples/API-Samples/pipeline_cache/pipeline_cache.cpp" -#endif - -#ifdef MVK_SAMP_push_constants -# include "../VulkanSamples/API-Samples/push_constants/push_constants.cpp" -#endif - -#ifdef MVK_SAMP_push_descriptors -# include "../VulkanSamples/API-Samples/push_descriptors/push_descriptors.cpp" -#endif - -#ifdef MVK_SAMP_secondary_command_buffer -# include "../VulkanSamples/API-Samples/secondary_command_buffer/secondary_command_buffer.cpp" -#endif - -#ifdef MVK_SAMP_separate_image_sampler -# include "../VulkanSamples/API-Samples/separate_image_sampler/separate_image_sampler.cpp" -#endif - -// Does not run on macOS, which does not support textures in host-coherent memory. -#ifdef MVK_SAMP_texel_buffer -# include "../VulkanSamples/API-Samples/texel_buffer/texel_buffer.cpp" -#endif - - - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/generateSPIRVShaders b/Demos/LunarG-VulkanSamples/API-Samples/generateSPIRVShaders deleted file mode 100755 index ac119cc6..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/generateSPIRVShaders +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2016-2021 The Brenwill Workshop Ltd. -# -# generateSPIRVShaders - Convert GLSL shader files to SPIRV header files -# -# macOS usage: ./generateSPIRVShaders -# - -set -e - -echo -echo ========== Converting API-Samples shader files ========== -echo - -cd "../../.." - -"Package/Latest/MoltenVKShaderConverter/Tools/MoltenVKShaderConverter" \ - -r -gi -so -oh -xs . -q \ - -d "Demos/LunarG-VulkanSamples/VulkanSamples/API-Samples" > /dev/null - -cd - > /dev/null - -echo ========== Done! ========== - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/DemoViewController.mm b/Demos/LunarG-VulkanSamples/API-Samples/iOS/DemoViewController.mm deleted file mode 100644 index 433a9e9d..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/iOS/DemoViewController.mm +++ /dev/null @@ -1,70 +0,0 @@ -/* - * DemoViewController.mm - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import "DemoViewController.h" - - -#pragma mark - -#pragma mark VulkanSamples extension for iOS & macOS support - -#include "Samples.h" // The LunarG VulkanSamples code - - -static UIView* sampleView; // Global variable to pass UIView to LunarG sample code - -/** - * Called from sample. - * Initialize sample from view, and resize view in accordance with the sample. - */ -void init_window(struct sample_info &info) { - info.caMetalLayer = sampleView.layer; - sampleView.bounds = CGRectMake(0, 0, info.width, info.height); -} - -/** Called from sample. Return path to resource folder. */ -std::string get_base_data_dir() { - return [NSBundle.mainBundle.resourcePath stringByAppendingString: @"/"].UTF8String; -} - - -#pragma mark - -#pragma mark DemoViewController - -@implementation DemoViewController {} - -/** Since this is a single-view app, init Vulkan when the view is loaded. */ --(void) viewDidLoad { - [super viewDidLoad]; - - sampleView = self.view; // Pass the view to the sample code - sample_main(0, NULL); // Run the LunarG sample -} - -@end - - -#pragma mark - -#pragma mark DemoView - -@implementation DemoView - -/** Returns a Metal-compatible layer. */ -+(Class) layerClass { return [CAMetalLayer class]; } - -@end - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/Info.plist b/Demos/LunarG-VulkanSamples/API-Samples/iOS/Info.plist deleted file mode 100644 index 8101a177..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/iOS/Info.plist +++ /dev/null @@ -1,48 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - iOS/Resources/Icon.png - CFBundleIcons~ipad - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - LSApplicationCategoryType - - UIMainStoryboardFile - Main - UIRequiresFullScreen - - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/iOS/Resources/Main.storyboard b/Demos/LunarG-VulkanSamples/API-Samples/iOS/Resources/Main.storyboard deleted file mode 100644 index 6205491f..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/iOS/Resources/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/include/MoltenVK b/Demos/LunarG-VulkanSamples/API-Samples/include/MoltenVK deleted file mode 120000 index aa025ad1..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/include/MoltenVK +++ /dev/null @@ -1 +0,0 @@ -../../../../MoltenVK/include/MoltenVK \ No newline at end of file diff --git a/Demos/LunarG-VulkanSamples/API-Samples/include/MoltenVKGLSLToSPIRVConverter b/Demos/LunarG-VulkanSamples/API-Samples/include/MoltenVKGLSLToSPIRVConverter deleted file mode 120000 index b03c7b14..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/include/MoltenVKGLSLToSPIRVConverter +++ /dev/null @@ -1 +0,0 @@ -../../../../MoltenVKShaderConverter/include/MoltenVKShaderConverter \ No newline at end of file diff --git a/Demos/LunarG-VulkanSamples/API-Samples/include/vulkan b/Demos/LunarG-VulkanSamples/API-Samples/include/vulkan deleted file mode 120000 index 00414dfb..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/include/vulkan +++ /dev/null @@ -1 +0,0 @@ -../../../../MoltenVK/include/vulkan \ No newline at end of file diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/DemoViewController.mm b/Demos/LunarG-VulkanSamples/API-Samples/macOS/DemoViewController.mm deleted file mode 100644 index a0183a5c..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/macOS/DemoViewController.mm +++ /dev/null @@ -1,90 +0,0 @@ -/* - * DemoViewController.mm - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import "DemoViewController.h" -#import - - -#pragma mark - -#pragma mark VulkanSamples extension for iOS & OSX support - -#include "Samples.h" // The LunarG VulkanSamples code - - -static NSView* sampleView; // Global variable to pass NSView to LunarG sample code - -/** - * Called from sample. - * Initialize sample from view, and resize view in accordance with the sample. - */ -void init_window(struct sample_info &info) { - info.caMetalLayer = sampleView.layer; - sampleView.bounds = CGRectMake(0, 0, info.width, info.height); -} - -/** Called from sample. Return path to resource folder. */ -std::string get_base_data_dir() { - return [NSBundle.mainBundle.resourcePath stringByAppendingString: @"/"].UTF8String; -} - - -#pragma mark - -#pragma mark DemoViewController - -@implementation DemoViewController {} - -/** Since this is a single-view app, initialize Vulkan during view loading. */ --(void) viewDidLoad { - [super viewDidLoad]; - - self.view.wantsLayer = YES; // Back the view with a layer created by the makeBackingLayer method. - - sampleView = self.view; // Pass the view to the sample code - sample_main(0, NULL); // Run the LunarG sample -} - -/** Resize the window to fit the size of the content as set by the sample code. */ --(void) viewWillAppear { - [super viewWillAppear]; - - CGSize vSz = self.view.bounds.size; - NSWindow *window = self.view.window; - NSRect wFrm = [window contentRectForFrameRect: window.frame]; - NSRect newWFrm = [window frameRectForContentRect: NSMakeRect(wFrm.origin.x, wFrm.origin.y, vSz.width, vSz.height)]; - [window setFrame: newWFrm display: YES animate: window.isVisible]; - [window center]; -} - -@end - - -#pragma mark - -#pragma mark DemoView - -@implementation DemoView - -/** Indicates that the view wants to draw using the backing layer instead of using drawRect:. */ --(BOOL) wantsUpdateLayer { return YES; } - -/** Returns a Metal-compatible layer. */ -+(Class) layerClass { return [CAMetalLayer class]; } - -/** If the wantsLayer property is set to YES, this method will be invoked to return a layer instance. */ --(CALayer*) makeBackingLayer { return [self.class.layerClass layer]; } - -@end diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Info.plist b/Demos/LunarG-VulkanSamples/API-Samples/macOS/Info.plist deleted file mode 100644 index d690fdab..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSApplicationCategoryType - - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSHumanReadableCopyright - Copyright (c) 2015 The Brenwill Workshop Ltd. All rights reserved. - NSMainStoryboardFile - Main - NSPrincipalClass - NSApplication - - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Prefix.pch b/Demos/LunarG-VulkanSamples/API-Samples/macOS/Prefix.pch deleted file mode 100644 index 2af02ba7..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Prefix.pch +++ /dev/null @@ -1,4 +0,0 @@ -// -// Prefix header for all source files of the project -// - diff --git a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/Main.storyboard b/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/Main.storyboard deleted file mode 100644 index 64bab25c..00000000 --- a/Demos/LunarG-VulkanSamples/API-Samples/macOS/Resources/Main.storyboard +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/AppDelegate.h b/Demos/LunarG-VulkanSamples/Cube/iOS/AppDelegate.h deleted file mode 100644 index 15cbfeaf..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/iOS/AppDelegate.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * AppDelegate.h - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end - diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/AppDelegate.m b/Demos/LunarG-VulkanSamples/Cube/iOS/AppDelegate.m deleted file mode 100644 index 6a7ebaba..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/iOS/AppDelegate.m +++ /dev/null @@ -1,55 +0,0 @@ -/* - * AppDelegate.m - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - -@end diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/DemoViewController.h b/Demos/LunarG-VulkanSamples/Cube/iOS/DemoViewController.h deleted file mode 100644 index 01757b53..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/iOS/DemoViewController.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * DemoViewController.h - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - - -#pragma mark - -#pragma mark DemoViewController - -/** The main view controller for the demo storyboard. */ -@interface DemoViewController : UIViewController -@end - - -#pragma mark - -#pragma mark DemoView - -/** The Metal-compatibile view for the demo Storyboard. */ -@interface DemoView : UIView -@end - diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/Prefix.pch b/Demos/LunarG-VulkanSamples/Cube/iOS/Prefix.pch deleted file mode 100644 index e41a7241..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/iOS/Prefix.pch +++ /dev/null @@ -1,5 +0,0 @@ -#import - -#ifdef __OBJC__ - #import -#endif diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Default-568h@2x.png b/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Default-568h@2x.png deleted file mode 100644 index 1669d7b6..00000000 Binary files a/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Default-568h@2x.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Default~ipad.png b/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Default~ipad.png deleted file mode 100644 index ec9a3dcd..00000000 Binary files a/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Default~ipad.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Icon.png b/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Icon.png deleted file mode 100644 index dc3b10f5..00000000 Binary files a/Demos/LunarG-VulkanSamples/Cube/iOS/Resources/Icon.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Cube/iOS/main.m b/Demos/LunarG-VulkanSamples/Cube/iOS/main.m deleted file mode 100644 index 4f577a44..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/iOS/main.m +++ /dev/null @@ -1,26 +0,0 @@ -/* - * main.m - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, @"AppDelegate"); - } -} - diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/AppDelegate.h b/Demos/LunarG-VulkanSamples/Cube/macOS/AppDelegate.h deleted file mode 100644 index aebdf791..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/macOS/AppDelegate.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * AppDelegate.h - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - -@interface AppDelegate : NSObject - -@end diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/AppDelegate.m b/Demos/LunarG-VulkanSamples/Cube/macOS/AppDelegate.m deleted file mode 100644 index ecec056c..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/macOS/AppDelegate.m +++ /dev/null @@ -1,39 +0,0 @@ -/* - * AppDelegate.m - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - // Insert code here to initialize your application -} - -- (void)applicationWillTerminate:(NSNotification *)aNotification { - // Insert code here to tear down your application -} - -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender { - return YES; -} - -@end diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/DemoViewController.h b/Demos/LunarG-VulkanSamples/Cube/macOS/DemoViewController.h deleted file mode 100644 index dadc5a52..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/macOS/DemoViewController.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * DemoViewController.h - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - - -#pragma mark - -#pragma mark DemoViewController - -/** The main view controller for the demo storyboard. */ -@interface DemoViewController : NSViewController -@end - - -#pragma mark - -#pragma mark DemoView - -/** The Metal-compatibile view for the demo Storyboard. */ -@interface DemoView : NSView -@end - diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json b/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 4124516b..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "images" : [ - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "Icon-16.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "Icon-32.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "Icon-128.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "2x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "Icon-256.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "2x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "Icon-512.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png b/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png deleted file mode 100644 index 8c55f1be..00000000 Binary files a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png b/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png deleted file mode 100644 index 583d636d..00000000 Binary files a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png b/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png deleted file mode 100644 index bb35d46e..00000000 Binary files a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png b/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png deleted file mode 100644 index d73e1f60..00000000 Binary files a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png b/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png deleted file mode 100644 index f2d01ac2..00000000 Binary files a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/Contents.json b/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/Contents.json deleted file mode 100644 index da4a164c..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/macOS/Resources/macOS.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Demos/LunarG-VulkanSamples/Cube/macOS/main.m b/Demos/LunarG-VulkanSamples/Cube/macOS/main.m deleted file mode 100644 index bb84715f..00000000 --- a/Demos/LunarG-VulkanSamples/Cube/macOS/main.m +++ /dev/null @@ -1,23 +0,0 @@ -/* - * main.m - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - -int main(int argc, const char * argv[]) { - return NSApplicationMain(argc, argv); -} diff --git a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj b/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj deleted file mode 100644 index c894079c..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/project.pbxproj +++ /dev/null @@ -1,539 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 48; - objects = { - -/* Begin PBXBuildFile section */ - A92806E724FD77C00082B2CF /* libMoltenVK.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = A991E27124FD520900D968D4 /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - A92806E924FD77EC0082B2CF /* libMoltenVK.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = A991E27324FD521600D968D4 /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; - A991E27224FD520900D968D4 /* libMoltenVK.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A991E27124FD520900D968D4 /* libMoltenVK.dylib */; }; - A991E27424FD521600D968D4 /* libMoltenVK.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A991E27324FD521600D968D4 /* libMoltenVK.dylib */; }; - A99789AF1CD3D4E2005E7DAC /* Hologram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789831CD3D4E2005E7DAC /* Hologram.cpp */; }; - A99789B01CD3D4E2005E7DAC /* Hologram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789831CD3D4E2005E7DAC /* Hologram.cpp */; }; - A99789B71CD3D4E2005E7DAC /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789881CD3D4E2005E7DAC /* Main.cpp */; }; - A99789B81CD3D4E2005E7DAC /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789881CD3D4E2005E7DAC /* Main.cpp */; }; - A99789B91CD3D4E2005E7DAC /* Meshes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789891CD3D4E2005E7DAC /* Meshes.cpp */; }; - A99789BA1CD3D4E2005E7DAC /* Meshes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789891CD3D4E2005E7DAC /* Meshes.cpp */; }; - A99789BD1CD3D4E2005E7DAC /* Shell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A997898D1CD3D4E2005E7DAC /* Shell.cpp */; }; - A99789BE1CD3D4E2005E7DAC /* Shell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A997898D1CD3D4E2005E7DAC /* Shell.cpp */; }; - A99789C51CD3D4E2005E7DAC /* Simulation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789951CD3D4E2005E7DAC /* Simulation.cpp */; }; - A99789C61CD3D4E2005E7DAC /* Simulation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789951CD3D4E2005E7DAC /* Simulation.cpp */; }; - A99789C91CD3D819005E7DAC /* ShellMVK.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789C71CD3D819005E7DAC /* ShellMVK.cpp */; }; - A99789CA1CD3D819005E7DAC /* ShellMVK.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A99789C71CD3D819005E7DAC /* ShellMVK.cpp */; }; - A9B67B781C3AAE9800373FFD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B6C1C3AAE9800373FFD /* AppDelegate.m */; }; - A9B67B7A1C3AAE9800373FFD /* DemoViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B6F1C3AAE9800373FFD /* DemoViewController.mm */; }; - A9B67B7C1C3AAE9800373FFD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B711C3AAE9800373FFD /* main.m */; }; - A9B67B7D1C3AAE9800373FFD /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B741C3AAE9800373FFD /* Default-568h@2x.png */; }; - A9B67B7E1C3AAE9800373FFD /* Default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B751C3AAE9800373FFD /* Default~ipad.png */; }; - A9B67B7F1C3AAE9800373FFD /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B761C3AAE9800373FFD /* Icon.png */; }; - A9B67B801C3AAE9800373FFD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B771C3AAE9800373FFD /* Main.storyboard */; }; - A9B67B8C1C3AAEA200373FFD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B831C3AAEA200373FFD /* AppDelegate.m */; }; - A9B67B8D1C3AAEA200373FFD /* DemoViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B851C3AAEA200373FFD /* DemoViewController.mm */; }; - A9B67B8F1C3AAEA200373FFD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B67B871C3AAEA200373FFD /* main.m */; }; - A9B67B901C3AAEA200373FFD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B8A1C3AAEA200373FFD /* Main.storyboard */; }; - A9B67B911C3AAEA200373FFD /* macOS.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A9B67B8B1C3AAEA200373FFD /* macOS.xcassets */; }; - A9D516F81CD575E300097D96 /* HelpersDispatchTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D516F61CD575E300097D96 /* HelpersDispatchTable.cpp */; }; - A9D516F91CD575E300097D96 /* HelpersDispatchTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9D516F61CD575E300097D96 /* HelpersDispatchTable.cpp */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - A92806E624FD77AA0082B2CF /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - A92806E724FD77C00082B2CF /* libMoltenVK.dylib in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A92806E824FD77D50082B2CF /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - A92806E924FD77EC0082B2CF /* libMoltenVK.dylib in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - 1D6058910D05DD3D006BFB54 /* Hologram.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Hologram.app; sourceTree = BUILT_PRODUCTS_DIR; }; - A93374642284CD260059D36E /* Hologram.vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Hologram.vert.h; path = android/src/main/jni/Hologram.vert.h; sourceTree = ""; }; - A93374652284CD260059D36E /* Hologram.push_constant.vert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Hologram.push_constant.vert.h; path = android/src/main/jni/Hologram.push_constant.vert.h; sourceTree = ""; }; - A93374662284CD260059D36E /* Hologram.frag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Hologram.frag.h; path = android/src/main/jni/Hologram.frag.h; sourceTree = ""; }; - A93CC3701CD56B8F00EB8A56 /* generate-dispatch-table */ = {isa = PBXFileReference; explicitFileType = text.script.python; path = "generate-dispatch-table"; sourceTree = ""; }; - A93CC3711CD56FD600EB8A56 /* CMakeLists.txt */ = {isa = PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = ""; }; - A977BCFE1B66BB010067E5BF /* Hologram.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Hologram.app; sourceTree = BUILT_PRODUCTS_DIR; }; - A991E27124FD520900D968D4 /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = ../../../MoltenVK/dylib/iOS/libMoltenVK.dylib; sourceTree = ""; }; - A991E27324FD521600D968D4 /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = ../../../MoltenVK/dylib/macOS/libMoltenVK.dylib; sourceTree = ""; }; - A997897F1CD3D4E2005E7DAC /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Game.h; sourceTree = ""; }; - A99789821CD3D4E2005E7DAC /* Helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Helpers.h; sourceTree = ""; }; - A99789831CD3D4E2005E7DAC /* Hologram.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Hologram.cpp; sourceTree = ""; }; - A99789851CD3D4E2005E7DAC /* Hologram.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Hologram.h; sourceTree = ""; }; - A99789881CD3D4E2005E7DAC /* Main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Main.cpp; sourceTree = ""; }; - A99789891CD3D4E2005E7DAC /* Meshes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Meshes.cpp; sourceTree = ""; }; - A997898A1CD3D4E2005E7DAC /* Meshes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Meshes.h; sourceTree = ""; }; - A997898B1CD3D4E2005E7DAC /* Meshes.teapot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Meshes.teapot.h; sourceTree = ""; }; - A997898D1CD3D4E2005E7DAC /* Shell.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Shell.cpp; sourceTree = ""; }; - A997898E1CD3D4E2005E7DAC /* Shell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Shell.h; sourceTree = ""; }; - A99789951CD3D4E2005E7DAC /* Simulation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Simulation.cpp; sourceTree = ""; }; - A99789961CD3D4E2005E7DAC /* Simulation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Simulation.h; sourceTree = ""; }; - A99789C71CD3D819005E7DAC /* ShellMVK.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ShellMVK.cpp; sourceTree = SOURCE_ROOT; }; - A99789C81CD3D819005E7DAC /* ShellMVK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShellMVK.h; sourceTree = SOURCE_ROOT; }; - A9B67B6B1C3AAE9800373FFD /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - A9B67B6C1C3AAE9800373FFD /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - A9B67B6E1C3AAE9800373FFD /* DemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoViewController.h; sourceTree = ""; }; - A9B67B6F1C3AAE9800373FFD /* DemoViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DemoViewController.mm; sourceTree = ""; }; - A9B67B701C3AAE9800373FFD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A9B67B711C3AAE9800373FFD /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - A9B67B721C3AAE9800373FFD /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; - A9B67B741C3AAE9800373FFD /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - A9B67B751C3AAE9800373FFD /* Default~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default~ipad.png"; sourceTree = ""; }; - A9B67B761C3AAE9800373FFD /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = ""; }; - A9B67B771C3AAE9800373FFD /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; - A9B67B821C3AAEA200373FFD /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - A9B67B831C3AAEA200373FFD /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - A9B67B841C3AAEA200373FFD /* DemoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoViewController.h; sourceTree = ""; }; - A9B67B851C3AAEA200373FFD /* DemoViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DemoViewController.mm; sourceTree = ""; }; - A9B67B861C3AAEA200373FFD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - A9B67B871C3AAEA200373FFD /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - A9B67B881C3AAEA200373FFD /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; - A9B67B8A1C3AAEA200373FFD /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; - A9B67B8B1C3AAEA200373FFD /* macOS.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = macOS.xcassets; sourceTree = ""; }; - A9D516F61CD575E300097D96 /* HelpersDispatchTable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HelpersDispatchTable.cpp; sourceTree = ""; }; - A9D516F71CD575E300097D96 /* HelpersDispatchTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpersDispatchTable.h; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A991E27224FD520900D968D4 /* libMoltenVK.dylib in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A977BCF11B66BB010067E5BF /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - A991E27424FD521600D968D4 /* libMoltenVK.dylib in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 1D6058910D05DD3D006BFB54 /* Hologram.app */, - A977BCFE1B66BB010067E5BF /* Hologram.app */, - ); - name = Products; - sourceTree = ""; - }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { - isa = PBXGroup; - children = ( - A99789681CD3D4E2005E7DAC /* Hologram */, - A9B67B6A1C3AAE9800373FFD /* iOS */, - A9B67B811C3AAEA200373FFD /* macOS */, - 19C28FACFE9D520D11CA2CBB /* Products */, - A9C2AB96218503A400DDBC03 /* Frameworks */, - ); - name = CustomTemplate; - sourceTree = ""; - }; - A99789681CD3D4E2005E7DAC /* Hologram */ = { - isa = PBXGroup; - children = ( - A9D516F51CD575B000097D96 /* Generated */, - A93CC3711CD56FD600EB8A56 /* CMakeLists.txt */, - A93CC3701CD56B8F00EB8A56 /* generate-dispatch-table */, - A997897F1CD3D4E2005E7DAC /* Game.h */, - A99789821CD3D4E2005E7DAC /* Helpers.h */, - A99789831CD3D4E2005E7DAC /* Hologram.cpp */, - A99789851CD3D4E2005E7DAC /* Hologram.h */, - A93374662284CD260059D36E /* Hologram.frag.h */, - A93374652284CD260059D36E /* Hologram.push_constant.vert.h */, - A93374642284CD260059D36E /* Hologram.vert.h */, - A99789881CD3D4E2005E7DAC /* Main.cpp */, - A99789891CD3D4E2005E7DAC /* Meshes.cpp */, - A997898A1CD3D4E2005E7DAC /* Meshes.h */, - A997898B1CD3D4E2005E7DAC /* Meshes.teapot.h */, - A997898D1CD3D4E2005E7DAC /* Shell.cpp */, - A997898E1CD3D4E2005E7DAC /* Shell.h */, - A99789C71CD3D819005E7DAC /* ShellMVK.cpp */, - A99789C81CD3D819005E7DAC /* ShellMVK.h */, - A99789951CD3D4E2005E7DAC /* Simulation.cpp */, - A99789961CD3D4E2005E7DAC /* Simulation.h */, - ); - name = Hologram; - path = "../VulkanSamples/Sample-Programs/Hologram"; - sourceTree = ""; - }; - A9B67B6A1C3AAE9800373FFD /* iOS */ = { - isa = PBXGroup; - children = ( - A9B67B6B1C3AAE9800373FFD /* AppDelegate.h */, - A9B67B6C1C3AAE9800373FFD /* AppDelegate.m */, - A9B67B6E1C3AAE9800373FFD /* DemoViewController.h */, - A9B67B6F1C3AAE9800373FFD /* DemoViewController.mm */, - A9B67B701C3AAE9800373FFD /* Info.plist */, - A9B67B711C3AAE9800373FFD /* main.m */, - A9B67B721C3AAE9800373FFD /* Prefix.pch */, - A9B67B731C3AAE9800373FFD /* Resources */, - ); - path = iOS; - sourceTree = ""; - }; - A9B67B731C3AAE9800373FFD /* Resources */ = { - isa = PBXGroup; - children = ( - A9B67B741C3AAE9800373FFD /* Default-568h@2x.png */, - A9B67B751C3AAE9800373FFD /* Default~ipad.png */, - A9B67B761C3AAE9800373FFD /* Icon.png */, - A9B67B771C3AAE9800373FFD /* Main.storyboard */, - ); - path = Resources; - sourceTree = ""; - }; - A9B67B811C3AAEA200373FFD /* macOS */ = { - isa = PBXGroup; - children = ( - A9B67B821C3AAEA200373FFD /* AppDelegate.h */, - A9B67B831C3AAEA200373FFD /* AppDelegate.m */, - A9B67B841C3AAEA200373FFD /* DemoViewController.h */, - A9B67B851C3AAEA200373FFD /* DemoViewController.mm */, - A9B67B861C3AAEA200373FFD /* Info.plist */, - A9B67B871C3AAEA200373FFD /* main.m */, - A9B67B881C3AAEA200373FFD /* Prefix.pch */, - A9B67B891C3AAEA200373FFD /* Resources */, - ); - path = macOS; - sourceTree = ""; - }; - A9B67B891C3AAEA200373FFD /* Resources */ = { - isa = PBXGroup; - children = ( - A9B67B8A1C3AAEA200373FFD /* Main.storyboard */, - A9B67B8B1C3AAEA200373FFD /* macOS.xcassets */, - ); - path = Resources; - sourceTree = ""; - }; - A9C2AB96218503A400DDBC03 /* Frameworks */ = { - isa = PBXGroup; - children = ( - A991E27124FD520900D968D4 /* libMoltenVK.dylib */, - A991E27324FD521600D968D4 /* libMoltenVK.dylib */, - ); - name = Frameworks; - sourceTree = ""; - }; - A9D516F51CD575B000097D96 /* Generated */ = { - isa = PBXGroup; - children = ( - A9D516F61CD575E300097D96 /* HelpersDispatchTable.cpp */, - A9D516F71CD575E300097D96 /* HelpersDispatchTable.h */, - ); - name = Generated; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* Hologram-iOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Hologram-iOS" */; - buildPhases = ( - 1D60588D0D05DD3D006BFB54 /* Resources */, - 1D60588E0D05DD3D006BFB54 /* Sources */, - 1D60588F0D05DD3D006BFB54 /* Frameworks */, - A92806E624FD77AA0082B2CF /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Hologram-iOS"; - productName = foo; - productReference = 1D6058910D05DD3D006BFB54 /* Hologram.app */; - productType = "com.apple.product-type.application"; - }; - A977BCBD1B66BB010067E5BF /* Hologram-macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = A977BCFB1B66BB010067E5BF /* Build configuration list for PBXNativeTarget "Hologram-macOS" */; - buildPhases = ( - A977BCBE1B66BB010067E5BF /* Resources */, - A977BCC91B66BB010067E5BF /* Sources */, - A977BCF11B66BB010067E5BF /* Frameworks */, - A92806E824FD77D50082B2CF /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "Hologram-macOS"; - productName = foo; - productReference = A977BCFE1B66BB010067E5BF /* Hologram.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 1240; - }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Hologram" */; - compatibilityVersion = "Xcode 8.0"; - developmentRegion = en; - hasScannedForEncodings = 1; - knownRegions = ( - Base, - ja, - en, - fr, - de, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 1D6058900D05DD3D006BFB54 /* Hologram-iOS */, - A977BCBD1B66BB010067E5BF /* Hologram-macOS */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 1D60588D0D05DD3D006BFB54 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A9B67B7F1C3AAE9800373FFD /* Icon.png in Resources */, - A9B67B801C3AAE9800373FFD /* Main.storyboard in Resources */, - A9B67B7E1C3AAE9800373FFD /* Default~ipad.png in Resources */, - A9B67B7D1C3AAE9800373FFD /* Default-568h@2x.png in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A977BCBE1B66BB010067E5BF /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A9B67B911C3AAEA200373FFD /* macOS.xcassets in Resources */, - A9B67B901C3AAEA200373FFD /* Main.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 1D60588E0D05DD3D006BFB54 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A99789B71CD3D4E2005E7DAC /* Main.cpp in Sources */, - A9B67B7A1C3AAE9800373FFD /* DemoViewController.mm in Sources */, - A99789AF1CD3D4E2005E7DAC /* Hologram.cpp in Sources */, - A99789C51CD3D4E2005E7DAC /* Simulation.cpp in Sources */, - A99789C91CD3D819005E7DAC /* ShellMVK.cpp in Sources */, - A99789B91CD3D4E2005E7DAC /* Meshes.cpp in Sources */, - A9B67B781C3AAE9800373FFD /* AppDelegate.m in Sources */, - A9B67B7C1C3AAE9800373FFD /* main.m in Sources */, - A9D516F81CD575E300097D96 /* HelpersDispatchTable.cpp in Sources */, - A99789BD1CD3D4E2005E7DAC /* Shell.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - A977BCC91B66BB010067E5BF /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - A99789B81CD3D4E2005E7DAC /* Main.cpp in Sources */, - A9B67B8C1C3AAEA200373FFD /* AppDelegate.m in Sources */, - A99789B01CD3D4E2005E7DAC /* Hologram.cpp in Sources */, - A99789C61CD3D4E2005E7DAC /* Simulation.cpp in Sources */, - A99789CA1CD3D819005E7DAC /* ShellMVK.cpp in Sources */, - A99789BA1CD3D4E2005E7DAC /* Meshes.cpp in Sources */, - A9B67B8F1C3AAEA200373FFD /* main.m in Sources */, - A9B67B8D1C3AAEA200373FFD /* DemoViewController.mm in Sources */, - A9D516F91CD575E300097D96 /* HelpersDispatchTable.cpp in Sources */, - A99789BE1CD3D4E2005E7DAC /* Shell.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 1D6058940D05DD3E006BFB54 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - GCC_PREFIX_HEADER = "$(SRCROOT)/iOS/Prefix.pch"; - INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../MoltenVK/dylib/iOS\""; - MARKETING_VERSION = 1; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 1D6058950D05DD3E006BFB54 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; - GCC_PREFIX_HEADER = "$(SRCROOT)/iOS/Prefix.pch"; - INFOPLIST_FILE = "$(SRCROOT)/iOS/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../MoltenVK/dylib/iOS\""; - MARKETING_VERSION = 1; - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - A977BCFC1B66BB010067E5BF /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - COMBINE_HIDPI_IMAGES = YES; - GCC_PREFIX_HEADER = "$(SRCROOT)/macOS/Prefix.pch"; - INFOPLIST_FILE = "$(SRCROOT)/macOS/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../MoltenVK/dylib/macOS\""; - MACOSX_DEPLOYMENT_TARGET = 10.11; - OTHER_LDFLAGS = ( - "$(inherited)", - "-w", - ); - SDKROOT = macosx; - }; - name = Debug; - }; - A977BCFD1B66BB010067E5BF /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - COMBINE_HIDPI_IMAGES = YES; - GCC_PREFIX_HEADER = "$(SRCROOT)/macOS/Prefix.pch"; - INFOPLIST_FILE = "$(SRCROOT)/macOS/Info.plist"; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks"; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../MoltenVK/dylib/macOS\""; - MACOSX_DEPLOYMENT_TARGET = 10.11; - OTHER_LDFLAGS = ( - "$(inherited)", - "-w", - ); - SDKROOT = macosx; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = NO; - COPY_PHASE_STRIP = NO; - ENABLE_BITCODE = NO; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - _DEBUG, - GLM_FORCE_RADIANS, - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../../../MoltenVK/include\"", - "\"$(SRCROOT)/../VulkanSamples/API-Samples/utils\"", - ); - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.${PRODUCT_NAME:identifier}"; - PRODUCT_NAME = Hologram; - }; - name = Debug; - }; - C01FCF5008A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = NO; - ENABLE_BITCODE = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = GLM_FORCE_RADIANS; - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../../../MoltenVK/include\"", - "\"$(SRCROOT)/../VulkanSamples/API-Samples/utils\"", - ); - OTHER_LDFLAGS = "-ObjC"; - PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.${PRODUCT_NAME:identifier}"; - PRODUCT_NAME = Hologram; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Hologram-iOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D6058940D05DD3E006BFB54 /* Debug */, - 1D6058950D05DD3E006BFB54 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - A977BCFB1B66BB010067E5BF /* Build configuration list for PBXNativeTarget "Hologram-macOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - A977BCFC1B66BB010067E5BF /* Debug */, - A977BCFD1B66BB010067E5BF /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Hologram" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} diff --git a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-iOS.xcscheme b/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-iOS.xcscheme deleted file mode 100644 index b0ce24d1..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-iOS.xcscheme +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-macOS.xcscheme b/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-macOS.xcscheme deleted file mode 100644 index 2070c33f..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/Hologram.xcodeproj/xcshareddata/xcschemes/Hologram-macOS.xcscheme +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demos/LunarG-VulkanSamples/Hologram/ShellMVK.cpp b/Demos/LunarG-VulkanSamples/Hologram/ShellMVK.cpp deleted file mode 100644 index 32e3ae9d..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/ShellMVK.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2016 The Brenwill Workshop Ltd. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include "ShellMVK.h" -#include -#include -#include -#include -#include "Helpers.h" -#include "Game.h" - -PosixTimer::PosixTimer() -{ - _tsBase = mach_absolute_time(); - mach_timebase_info_data_t timebase; - mach_timebase_info(&timebase); - _tsPeriod = (double)timebase.numer / (double)timebase.denom; -} - -double PosixTimer::get() -{ - return (double)(mach_absolute_time() - _tsBase) * _tsPeriod / 1e9; -} - -ShellMVK::ShellMVK(Game& game) : Shell(game) -{ - _timer = PosixTimer(); - _current_time = _timer.get(); - _profile_start_time = _current_time; - _profile_present_count = 0; - - instance_extensions_.push_back(VK_EXT_METAL_SURFACE_EXTENSION_NAME); - - init_vk(); -} - -ShellMVK::~ShellMVK() -{ - destroy_context(); - cleanup_vk(); -} - -PFN_vkGetInstanceProcAddr ShellMVK::load_vk() -{ - return vkGetInstanceProcAddr; -} - -bool ShellMVK::can_present(VkPhysicalDevice phy, uint32_t queue_family) -{ - return true; -} - -VkSurfaceKHR ShellMVK::create_surface(VkInstance instance) { - VkSurfaceKHR surface; - - VkResult err; - VkMetalSurfaceCreateInfoEXT surface_info; - surface_info.sType = VK_STRUCTURE_TYPE_METAL_SURFACE_CREATE_INFO_EXT; - surface_info.pNext = NULL; - surface_info.flags = 0; - surface_info.pLayer = _caMetalLayer; - err = vkCreateMetalSurfaceEXT(instance, &surface_info, NULL, &surface); - assert(!err); - - return surface; -} - -void ShellMVK::update_and_draw() { - - acquire_back_buffer(); - - double t = _timer.get(); - add_game_time(static_cast(t - _current_time)); - - present_back_buffer(); - - _current_time = t; - - _profile_present_count++; - if (_current_time - _profile_start_time >= 5.0) { - const double fps = _profile_present_count / (_current_time - _profile_start_time); - std::stringstream ss; - ss << _profile_present_count << " presents in " << - _current_time - _profile_start_time << " seconds " << - "(FPS: " << fps << ")"; - log(LOG_INFO, ss.str().c_str()); - - _profile_start_time = _current_time; - _profile_present_count = 0; - } -} - -void ShellMVK::run(void* caMetalLayer) { - _caMetalLayer = caMetalLayer; // not retained - create_context(); - resize_swapchain(settings_.initial_width, settings_.initial_height); -} diff --git a/Demos/LunarG-VulkanSamples/Hologram/ShellMVK.h b/Demos/LunarG-VulkanSamples/Hologram/ShellMVK.h deleted file mode 100644 index 43099206..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/ShellMVK.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (C) 2016 The Brenwill Workshop Ltd. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef SHELL_MVK_H -#define SHELL_MVK_H - -#include -#include "Shell.h" -#include - -class PosixTimer { -public: - double get(); - PosixTimer(); - -protected: - uint64_t _tsBase; - double _tsPeriod; -}; - -class ShellMVK : public Shell { -public: - ShellMVK(Game &game); - ~ShellMVK(); - - void run(void* view); - void update_and_draw(); - - void run() { run(nullptr); }; - void quit() { } - -protected: - void* _caMetalLayer; - PosixTimer _timer; - double _current_time; - double _profile_start_time; - int _profile_present_count; - - PFN_vkGetInstanceProcAddr load_vk(); - bool can_present(VkPhysicalDevice phy, uint32_t queue_family); - - VkSurfaceKHR create_surface(VkInstance instance); -}; - -#endif // SHELL_MVK_H diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/AppDelegate.h b/Demos/LunarG-VulkanSamples/Hologram/iOS/AppDelegate.h deleted file mode 100644 index 15cbfeaf..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/iOS/AppDelegate.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * AppDelegate.h - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end - diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/AppDelegate.m b/Demos/LunarG-VulkanSamples/Hologram/iOS/AppDelegate.m deleted file mode 100644 index 6a7ebaba..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/iOS/AppDelegate.m +++ /dev/null @@ -1,55 +0,0 @@ -/* - * AppDelegate.m - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - - -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // Override point for customization after application launch. - return YES; -} - -- (void)applicationWillResignActive:(UIApplication *)application { - // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. - // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game. -} - -- (void)applicationDidEnterBackground:(UIApplication *)application { - // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. - // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. -} - -- (void)applicationWillEnterForeground:(UIApplication *)application { - // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background. -} - -- (void)applicationDidBecomeActive:(UIApplication *)application { - // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. -} - -- (void)applicationWillTerminate:(UIApplication *)application { - // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. -} - -@end diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/DemoViewController.h b/Demos/LunarG-VulkanSamples/Hologram/iOS/DemoViewController.h deleted file mode 100644 index 01757b53..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/iOS/DemoViewController.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * DemoViewController.h - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - - -#pragma mark - -#pragma mark DemoViewController - -/** The main view controller for the demo storyboard. */ -@interface DemoViewController : UIViewController -@end - - -#pragma mark - -#pragma mark DemoView - -/** The Metal-compatibile view for the demo Storyboard. */ -@interface DemoView : UIView -@end - diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/DemoViewController.mm b/Demos/LunarG-VulkanSamples/Hologram/iOS/DemoViewController.mm deleted file mode 100644 index 570f77be..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/iOS/DemoViewController.mm +++ /dev/null @@ -1,77 +0,0 @@ -/* - * DemoViewController.mm - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import "DemoViewController.h" - -#include "ShellMVK.h" -#include "Hologram.h" - - -#pragma mark - -#pragma mark DemoViewController - -@implementation DemoViewController { - CADisplayLink* _displayLink; - ShellMVK* _shell; - Game* _game; -} - --(void) dealloc { - delete _shell; - delete _game; - [_displayLink release]; - [super dealloc]; -} - -/** Since this is a single-view app, init Vulkan when the view is loaded. */ --(void) viewDidLoad { - [super viewDidLoad]; - - self.view.contentScaleFactor = UIScreen.mainScreen.nativeScale; - - std::vector args; - args.push_back("-p"); // Use push constants -// args.push_back("-s"); // Use a single thread - _game = new Hologram(args); - - _shell = new ShellMVK(*_game); - _shell->run(self.view.layer); - - uint32_t fps = 60; - _displayLink = [CADisplayLink displayLinkWithTarget: self selector: @selector(renderLoop)]; - [_displayLink setFrameInterval: 60 / fps]; - [_displayLink addToRunLoop: NSRunLoop.currentRunLoop forMode: NSDefaultRunLoopMode]; -} - --(void) renderLoop { - _shell->update_and_draw(); -} - -@end - - -#pragma mark - -#pragma mark DemoView - -@implementation DemoView - -/** Returns a Metal-compatible layer. */ -+(Class) layerClass { return [CAMetalLayer class]; } - -@end - diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/Info.plist b/Demos/LunarG-VulkanSamples/Hologram/iOS/Info.plist deleted file mode 100644 index 8101a177..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/iOS/Info.plist +++ /dev/null @@ -1,48 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleDisplayName - ${PRODUCT_NAME} - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - iOS/Resources/Icon.png - CFBundleIcons~ipad - - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - LSApplicationCategoryType - - UIMainStoryboardFile - Main - UIRequiresFullScreen - - UIStatusBarHidden - - UISupportedInterfaceOrientations - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UISupportedInterfaceOrientations~ipad - - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - - diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/Prefix.pch b/Demos/LunarG-VulkanSamples/Hologram/iOS/Prefix.pch deleted file mode 100644 index e41a7241..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/iOS/Prefix.pch +++ /dev/null @@ -1,5 +0,0 @@ -#import - -#ifdef __OBJC__ - #import -#endif diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Default-568h@2x.png b/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Default-568h@2x.png deleted file mode 100644 index 1669d7b6..00000000 Binary files a/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Default-568h@2x.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Default~ipad.png b/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Default~ipad.png deleted file mode 100644 index ec9a3dcd..00000000 Binary files a/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Default~ipad.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Icon.png b/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Icon.png deleted file mode 100644 index dc3b10f5..00000000 Binary files a/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Icon.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Main.storyboard b/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Main.storyboard deleted file mode 100644 index 6205491f..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/iOS/Resources/Main.storyboard +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demos/LunarG-VulkanSamples/Hologram/iOS/main.m b/Demos/LunarG-VulkanSamples/Hologram/iOS/main.m deleted file mode 100644 index 4f577a44..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/iOS/main.m +++ /dev/null @@ -1,26 +0,0 @@ -/* - * main.m - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - -int main(int argc, char * argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, @"AppDelegate"); - } -} - diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/AppDelegate.h b/Demos/LunarG-VulkanSamples/Hologram/macOS/AppDelegate.h deleted file mode 100644 index aebdf791..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/AppDelegate.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * AppDelegate.h - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - -@interface AppDelegate : NSObject - -@end diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/AppDelegate.m b/Demos/LunarG-VulkanSamples/Hologram/macOS/AppDelegate.m deleted file mode 100644 index ecec056c..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/AppDelegate.m +++ /dev/null @@ -1,39 +0,0 @@ -/* - * AppDelegate.m - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - // Insert code here to initialize your application -} - -- (void)applicationWillTerminate:(NSNotification *)aNotification { - // Insert code here to tear down your application -} - -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender { - return YES; -} - -@end diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/DemoViewController.h b/Demos/LunarG-VulkanSamples/Hologram/macOS/DemoViewController.h deleted file mode 100644 index dadc5a52..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/DemoViewController.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * DemoViewController.h - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - - -#pragma mark - -#pragma mark DemoViewController - -/** The main view controller for the demo storyboard. */ -@interface DemoViewController : NSViewController -@end - - -#pragma mark - -#pragma mark DemoView - -/** The Metal-compatibile view for the demo Storyboard. */ -@interface DemoView : NSView -@end - diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/DemoViewController.mm b/Demos/LunarG-VulkanSamples/Hologram/macOS/DemoViewController.mm deleted file mode 100644 index 353fc00a..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/DemoViewController.mm +++ /dev/null @@ -1,130 +0,0 @@ -/* - * DemoViewController.mm - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import "DemoViewController.h" -#import - -#include "ShellMVK.h" -#include "Hologram.h" - - -#pragma mark - -#pragma mark DemoViewController - -@implementation DemoViewController { - CVDisplayLinkRef _displayLink; - ShellMVK* _shell; - Game* _game; -} - --(void) dealloc { - delete _shell; - delete _game; - CVDisplayLinkRelease(_displayLink); - [super dealloc]; -} - -/** Since this is a single-view app, initialize Vulkan during view loading. */ --(void) viewDidLoad { - [super viewDidLoad]; - - self.view.wantsLayer = YES; // Back the view with a layer created by the makeBackingLayer method. - - std::vector args; - args.push_back("-p"); // Uncomment to use push constants -// args.push_back("-s"); // Uncomment to use a single thread - _game = new Hologram(args); - - _shell = new ShellMVK(*_game); - _shell->run(self.view.layer); - - CVDisplayLinkCreateWithActiveCGDisplays(&_displayLink); - CVDisplayLinkSetOutputCallback(_displayLink, &DisplayLinkCallback, _shell); - CVDisplayLinkStart(_displayLink); -} - - -#pragma mark Display loop callback function - -/** Rendering loop callback function for use with a CVDisplayLink. */ -static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, - const CVTimeStamp* now, - const CVTimeStamp* outputTime, - CVOptionFlags flagsIn, - CVOptionFlags* flagsOut, - void* target) { - ((ShellMVK*)target)->update_and_draw(); - return kCVReturnSuccess; -} - --(void) viewDidAppear { - self.view.window.initialFirstResponder = self.view; -} - -// Delegated from the view as first responder. --(void) keyDown:(NSEvent*) theEvent { - Game::Key key; - switch (theEvent.keyCode) { - case 53: - key = Game::KEY_ESC; - break; - case 126: - key = Game::KEY_UP; - break; - case 125: - key = Game::KEY_DOWN; - break; - case 49: - key = Game::KEY_SPACE; - break; - case 3: - key = Game::KEY_F; - break; - default: - key = Game::KEY_UNKNOWN; - break; - } - - _game->on_key(key); -} - -@end - - -#pragma mark - -#pragma mark DemoView - -@implementation DemoView - -/** Indicates that the view wants to draw using the backing layer instead of using drawRect:. */ --(BOOL) wantsUpdateLayer { return YES; } - -/** Returns a Metal-compatible layer. */ -+(Class) layerClass { return [CAMetalLayer class]; } - -/** If the wantsLayer property is set to YES, this method will be invoked to return a layer instance. */ --(CALayer*) makeBackingLayer { - CALayer* layer = [self.class.layerClass layer]; - CGSize viewScale = [self convertSizeToBacking: CGSizeMake(1.0, 1.0)]; - layer.contentsScale = MIN(viewScale.width, viewScale.height); - return layer; -} - --(BOOL) acceptsFirstResponder { return YES; } - -@end diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Info.plist b/Demos/LunarG-VulkanSamples/Hologram/macOS/Info.plist deleted file mode 100644 index 252a08e2..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSApplicationCategoryType - - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSHumanReadableCopyright - Copyright (c) 2015-2021 The Brenwill Workshop Ltd. All rights reserved. - NSMainStoryboardFile - Main - NSPrincipalClass - NSApplication - - diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Prefix.pch b/Demos/LunarG-VulkanSamples/Hologram/macOS/Prefix.pch deleted file mode 100644 index 1abd7a8c..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/Prefix.pch +++ /dev/null @@ -1,3 +0,0 @@ -// -// Prefix header for all source files of the project -// diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/Main.storyboard b/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/Main.storyboard deleted file mode 100644 index 2aca0bbb..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/Main.storyboard +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json b/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 4124516b..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "images" : [ - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "Icon-16.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" - }, - { - "size" : "32x32", - "idiom" : "mac", - "filename" : "Icon-32.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" - }, - { - "size" : "128x128", - "idiom" : "mac", - "filename" : "Icon-128.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "2x" - }, - { - "size" : "256x256", - "idiom" : "mac", - "filename" : "Icon-256.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "2x" - }, - { - "size" : "512x512", - "idiom" : "mac", - "filename" : "Icon-512.png", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png b/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png deleted file mode 100644 index 8c55f1be..00000000 Binary files a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-128.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png b/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png deleted file mode 100644 index 583d636d..00000000 Binary files a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-16.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png b/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png deleted file mode 100644 index bb35d46e..00000000 Binary files a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-256.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png b/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png deleted file mode 100644 index d73e1f60..00000000 Binary files a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-32.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png b/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png deleted file mode 100644 index f2d01ac2..00000000 Binary files a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/AppIcon.appiconset/Icon-512.png and /dev/null differ diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/Contents.json b/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/Contents.json deleted file mode 100644 index da4a164c..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/Resources/macOS.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Demos/LunarG-VulkanSamples/Hologram/macOS/main.m b/Demos/LunarG-VulkanSamples/Hologram/macOS/main.m deleted file mode 100644 index bb84715f..00000000 --- a/Demos/LunarG-VulkanSamples/Hologram/macOS/main.m +++ /dev/null @@ -1,23 +0,0 @@ -/* - * main.m - * - * Copyright (c) 2015-2021 The Brenwill Workshop Ltd. (http://www.brenwill.com) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#import - -int main(int argc, const char * argv[]) { - return NSApplicationMain(argc, argv); -} diff --git a/Demos/LunarG-VulkanSamples/Vulkan-Tools b/Demos/LunarG-VulkanSamples/Vulkan-Tools deleted file mode 120000 index 3e2b28b1..00000000 --- a/Demos/LunarG-VulkanSamples/Vulkan-Tools +++ /dev/null @@ -1 +0,0 @@ -../../External/Vulkan-Tools \ No newline at end of file diff --git a/Demos/LunarG-VulkanSamples/VulkanSamples b/Demos/LunarG-VulkanSamples/VulkanSamples deleted file mode 120000 index e98181e2..00000000 --- a/Demos/LunarG-VulkanSamples/VulkanSamples +++ /dev/null @@ -1 +0,0 @@ -../../External/VulkanSamples \ No newline at end of file diff --git a/Demos/README.md b/Demos/README.md index f5371321..ad890178 100644 --- a/Demos/README.md +++ b/Demos/README.md @@ -16,199 +16,35 @@ Copyright (c) 2015-2021 [The Brenwill Workshop Ltd.](http://www.brenwill.com) Table of Contents ----------------- -- [LunarG Vulkan Samples](#lunarg-vulkan-samples) - - [*Cube*](#lunarg-vulkan-samples-cube) - - [*Hologram*](#lunarg-vulkan-samples-hologram) - - [*API-Samples*](#lunarg-vulkan-samples-api) -- [Sascha Willems Vulkan Samples](#sascha-willems-vulkan-samples) - - [Installing the *Sascha Willems* Library](#sascha-willems-install) -- [Cinder Vulkan Samples](#cinder-vulkan-samples) - - [Installing the *Cinder* Library](#cinder-install) - - [*Fish Tornado*](#cinder-vulkan-samples-fish-tornado) +- [*Cube*](#vulkan-tools-cube) +- [Khronos Vulkan-Samples](#khronos-vulkan-samples) + +*Cube* +------ - -LunarG Vulkan Samples ---------------------- +The basic canonical *Cube* sample app from the +[*Vulkan-Tools* repository](https://github.com/KhronosGroup/Vulkan-Tools) +is included in this **MoltenVK** package. -[LunarG](https://lunarg.com), who have been involved in *Vulkan* development from the -beginning, and are one of the original developers of *Vulkan* tools and SDK's, provides -a suite of demo apps, that demonstrate a wide range of basic *Vulkan* features. +This demo renders a basic textured cube that spins in place. -These demo apps are included in **MoltenVK**, and can be found in the `LunarG-VulkanSamples` -folder of this `Demos` folder, and in the `LunarG-VulkanSamples` group in the *Xcode Project Navigator* -in the `Demos.xcworkspace` *Xcode* workspace. - - - -### *Cube* - -A basic textured cube that spins in place. - -The demo can be found in the `LunarG-VulkanSamples/Cube` folder, and in the -`LunarG-VulkanSamples/Cube` group in the *Xcode Project Navigator* in the -`Cube.xcworkspace` *Xcode* workspace. +The demo can be found in the `Cube` folder, and in the `Cube` group in the +*Xcode Project Navigator* in the `Demos.xcworkspace` *Xcode* workspace. To run this demo, run the `Cube-iOS`, `Cube-tvOS`, or `Cube-macOS` *Scheme* from within *Xcode*. In addition to devices, this demo will also run on the `iOS Simulator` or `tvOS Simulator` destinations. -The *macOS* version of this demo includes a sizable window, and represents an example of how to detect, -within your *Vulkan* code, when a window has been resized, and to modify the *Vulkan* swapchain accordingly. - The `Cube` demo is a simple example of installing **MoltenVK** as an `XCFramework` that is statically linked to the application. It supports all platforms, including _Mac Catalyst_, _iOS Simulator_ and _tvOS Simulator_, and all architectures including _Apple Silicon_. - -### *Hologram* -> **_Note:_** In order to build the `Hologram` demo, you must have *Python3* installed -> on your build computer. - -This is a sophisticated particle demo that populates command buffers from multiple threads. - -This demo can be found in the `LunarG-VulkanSamples/Hologram` folder, and in the -`LunarG-VulkanSamples/Hologram` group in the *Xcode Project Navigator* in the -`Demos.xcworkspace` *Xcode* workspace. - -To run this demo, run either the `Hologram-iOS` or `Hologram-macOS` *Scheme* from within *Xcode*. - -On *macOS*, once the demo is open, you can use the *Up-arrow* and *Down-arrow* keys on the -keyboard to zoom the camera in and out of the scene. Zooming out will show more items on screen. - -The demo allows some customization, by modifying the arguments passed to the demo at startup. -To customize, modify the arguments created in the `DemoViewController viewDidLoad` method -found in the `iOS/DemoViewController.mm` or `macOS/DemoViewController.mm` file. - -The `Hologram` demo is a simple example of installing **MoltenVK** as a *dynamic library* that is -dynamically linked to the application. In this demo, the **MoltenVK** *dynamic library* is copied -into and embedded in the application, but it could have been installed as a system library instead. - - - -### *API-Samples* - -This *Xcode* project contains a large number of modular demos, with each demo -demonstrating a particular *Vulkan* feature, or suite of calls. - -This demo can be found in the `LunarG-VulkanSamples/API-Samples` folder, and in the -`LunarG-VulkanSamples/API-Samples` group in the *Xcode Project Navigator* in the -`Demos.xcworkspace` *Xcode* workspace. - -Each of the `API-Samples` demos loads *SPIR-V* shader code from a file. Before any of the -`API-Samples` demos are run, these *SPIR-V* files need to be generated as follows: - - cd MoltenVK/Demos/LunarG-VulkanSamples/API-Samples - ./generateSPIRVShaders - -You only need to do this step once. It generates the *SPIR-V* shader code files for -all of the `API-Samples` demos. - -To run any of the `API-Samples` demos, run either the `API-Samples-iOS` or `API-Samples-macOS` -*Scheme* from within *Xcode*. - -To specify which of the many modular demos to run, open the `Samples.h` in the `API-Samples` -project in the *Xcode Project Navigator* in the `Demos.xcworkspace` *Xcode* workspace, and -follow the instructions in the comments within that file. - -> **_Note:_** For simplicity, the `API-Samples` demos are bare-bones. Each of the `API-Samples` -> demos renders a single frame during app startup, and then leaves the rendered image static. -> There is no display loop or motion in any of these demos. -> **This is normal for these demos, and the demo has not "hung" or "crashed" when this occurs.** - -To see descriptions and screenshots of each of the demos, open -[this summary document](LunarG-VulkanSamples/VulkanSamples/samples_index.html#AdditionalVulkan). - -The `API-Samples` demo is a simple example of installing **MoltenVK** as an `XCFramework` that -is statically linked to the application. It supports all platforms, including _Mac Catalyst_, _iOS -Simulator_ and _tvOS Simulator_, and all architectures including _Apple Silicon_. - - - - -Sascha Willems Vulkan Samples ------------------------------ - -[*Sascha Willems*](https://github.com/brenwill/Vulkan) provides an open-source library containing -a large number of sophisticated *Vulkan* samples. The library contains support for running these -examples on *iOS* and *macOS* in *Xcode*, using **MoltenVK**. - - - -### Installing the *Sascha Willems* Library - -To install the *Sascha Willems Vulkan* samples, open a *Terminal* session and perform -the following command-line steps: - -1. In the parent directory of this `MoltenVK` repository, clone the modified *Sascha Willems* `Vulkan` repo: - - git clone https://github.com/brenwill/Vulkan.git - -2. By default, the *Sascha Willems Vulkan* samples expect **MoltenVK** to be installed in a directory - beside the `Vulkan` repository: - - Vulkan/ - MoltenVK/ - - If you have installed **MoltenVK** somewhere else, create a symlink to your **MoltenVK** installation: - - ln -sfn path-to-MoltenVK/MoltenVK - -2. Follow the instructions in the `Vulkan\xcode\README_MoltenVK_Examples.md` document - within the *Sascha Willems* `Vulkan` repository. - - - - -Cinder Vulkan Samples ---------------------- - -[*Cinder*](https://libcinder.org) is a cross-platform 3D graphics engine built in C++. -*Cinder* supports *Vulkan*, and includes several *Vulkan* demos. - -These demo apps are included as part of the *Cinder* code repository. - -These **MoltenVK** demos use a modified version of *Cinder*, that allows *Vulkan* to run under -*iOS* and *macOS*. To download the modified version of *Cinder*, and link it to **MoltenVK**, -follow the instructions in the [Installing the *Cinder* Library](#cinder-install) -section next. - - - -### Installing the *Cinder* Library - -To install the modified *Cinder* library, and link it to **MoltenVK**, -open a *Terminal* session and perform the following command-line steps: - -1. In the parent directory of this `MoltenVK` repository, clone the modified `Cinder` repo, - including required submodules: - - git clone --recursive https://github.com/brenwill/Cinder.git - -2. Build the core *Cinder* library: - - Cinder/xcode/fullbuild.sh - -3. By default, the *Cinder Vulkan* samples expect **MoltenVK** to be installed in a directory - beside the `Cinder` repository: - - Cinder/ - MoltenVK/ - - If you have installed **MoltenVK** somewhere else, create a symlink to your **MoltenVK** installation: - - ln -sfn path-to-MoltenVK/MoltenVK - - - - -### *Fish Tornado* - -This is a sophisticated simulation of a *Fish Tornado*, a swirling school of thousands of fish. - -This demo can be found in the `samples/_vulkan_explicit/FishTornado` folder of the *Cinder* repository. -To build and run this demo for either *iOS* or *macOS*, open the `xcode-ios/FishTornado.xcodeproj` -or `xcode/FishTornado.xcodeproj` *Xcode* project, respectively. + +*Khronos Vulkan Samples* +---------------------- +*Khronos Group* provides a [repository](https://github.com/KhronosGroup/Vulkan-Samples) +containing a full suite of standard *Vulkan* samples that run on **MoltenVK** on *macOS*. diff --git a/Demos/Vulkan-Tools b/Demos/Vulkan-Tools new file mode 120000 index 00000000..230393df --- /dev/null +++ b/Demos/Vulkan-Tools @@ -0,0 +1 @@ +../External/Vulkan-Tools \ No newline at end of file diff --git a/Docs/MoltenVK_Runtime_UserGuide.md b/Docs/MoltenVK_Runtime_UserGuide.md index 3f6f4c13..3ee145f6 100644 --- a/Docs/MoltenVK_Runtime_UserGuide.md +++ b/Docs/MoltenVK_Runtime_UserGuide.md @@ -83,12 +83,6 @@ If you are unsure about which linking and deployment option you need, or on *iOS unless you have specific needs for dynamic libraries, follow the steps for linking **MoltenVK** as an `XCFramework`, as it is the simpler option, and encompasses the largest set of supported platforms. -The demo apps, found in the `Demos.xcworkspace`, located in the `Demos` folder, demonstrate both -of the installation techniques discussed above: - -- `XCFramework`: `Cube` and `API-Samples` demos. -- Dynamic library: `Hologram` demo. - ### Install *MoltenVK* as a Universal `XCFramework` diff --git a/Docs/Whats_New.md b/Docs/Whats_New.md index afb49ad7..d281a6f7 100644 --- a/Docs/Whats_New.md +++ b/Docs/Whats_New.md @@ -23,6 +23,8 @@ Released TBD env var to configure **MoltenVK** to advertise a particular _Vulkan_ version. - Add `MVKConfiguration::advertiseExtensions` and `MVK_CONFIG_ADVERTISE_EXTENSIONS` env var to configure **MoltenVK** to not advertise support for any _Vulkan_ extensions. +- Remove the `Hologram` and `API-Samples` demo apps, and remove + `LunarG/VulkanSamples` as a dependency library. - Update `VK_MVK_MOLTENVK_SPEC_VERSION` to `31`. diff --git a/README.md b/README.md index 96773e79..079fd0b0 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Table of Contents - [Introduction to **MoltenVK**](#intro) - [Fetching **MoltenVK** Source Code](#install) - [Building **MoltenVK**](#building) -- [Running the **MoltenVK** Demo Applications](#demos) +- [Running **MoltenVK** Demo Applications](#demos) - [Using **MoltenVK** in Your Application](#using) - [**MoltenVK** and *Vulkan* Compliance](#compliance) - [Getting Support](#support) @@ -243,20 +243,18 @@ building from within *Xcode*. -Running the **MoltenVK** Demo Applications ------------------------------------------- +Running **MoltenVK** Demo Applications +-------------------------------------- Once you have compiled and built the **MoltenVK** runtime distribution package from this **MoltenVK** repository, as described in the [Building **MoltenVK**](#building) section, you can explore how **MoltenVK** provides *Vulkan* -support on *macOS*, *iOS*, and *tvOS* by investigating and running the demo applications that are included in **MoltenVK**. +support on *macOS*, *iOS*, and *tvOS* by investigating and running the demo application that is included in **MoltenVK**. -The **MoltenVK** demo apps are located in the `Demos` folder. Each demo app is available as an *Xcode* project. -To review and run the included demo apps, open the `Demos/Demos.xcworkspace` workspace in *Xcode*. +The **MoltenVK** _Cube_ demo app is located in the `Demos` folder. The demo app is available as an *Xcode* project. +To review and run the included demo app, open the `Demos/Demos.xcworkspace` workspace in *Xcode*. -Please read the [`Demos/README.md`](Demos/README.md) document for a description of each demo app, and instructions -on running the demo apps. Several of the demo apps allow you to explore a variety of *Vulkan* features by modifying -*Xcode* build settings. Additional demos can be downloaded and built from external repositories, as described in the -[`Demos/README.md`](Demos/README.md) document +Please read the [`Demos/README.md`](Demos/README.md) document for a description and instructions for running the +included *Cube* demo app, and for external links to more sophisticated demo applications that can be run on **MoltenVK**. diff --git a/fetchDependencies b/fetchDependencies index 790a288e..5f209761 100755 --- a/fetchDependencies +++ b/fetchDependencies @@ -365,25 +365,6 @@ REPO_REV=$(cat "${EXT_REV_DIR}/${REPO_NAME}_repo_revision") update_repo ${REPO_NAME} ${REPO_URL} ${REPO_REV} -# ----------------- VulkanSamples ------------------- - -echo -echo ========== VulkanSamples ========== -echo - -REPO_NAME=VulkanSamples -REPO_URL="https://github.com/LunarG/${REPO_NAME}.git" -REPO_REV=$(cat "${EXT_REV_DIR}/${REPO_NAME}_repo_revision") - -update_repo ${REPO_NAME} ${REPO_URL} ${REPO_REV} - -# Generate dispatch files needed for Hologram demo -cd "${REPO_NAME}/Sample-Programs/Hologram" -./generate-dispatch-table HelpersDispatchTable.h -./generate-dispatch-table HelpersDispatchTable.cpp -cd - > /dev/null - - # ----------------- Cleanup ------------------- cd ..