Merge pull request #1234 from SRSaunders/mvk-base-fixes

Update Apple iOS sub-project to support vulkanexamplebase changes

Author: SaschaWillems

apple/MVKExample.cpp

@@ -9,10 +9,6 @@
 #include "MVKExample.h"
 #include "examples.h"
 
-void MVKExample::renderFrame() {
-	_vulkanExample->renderFrame();
-}
-
 void MVKExample::displayLinkOutputCb() {                        // SRS - expose VulkanExampleBase::displayLinkOutputCb() to DemoViewController
     _vulkanExample->displayLinkOutputCb();
 }
@@ -26,7 +22,6 @@ void MVKExample::keyPressed(uint32_t keyChar) {					// SRS - handle keyboard key
 		case KEY_1:												// SRS - support keyboards with no function keys
 		case KEY_F1:
 			_vulkanExample->ui.visible = !_vulkanExample->ui.visible;
-			_vulkanExample->ui.updated = true;
 			break;
 		default:
 			_vulkanExample->keyPressed(keyChar);
@@ -112,7 +107,6 @@ void MVKExample::mouseDragged(double x, double y) {
 
 void MVKExample::scrollWheel(short wheelDelta) {
     _vulkanExample->camera.translate(glm::vec3(0.0f, 0.0f, wheelDelta * 0.05f * _vulkanExample->camera.movementSpeed));
-	_vulkanExample->viewUpdated = true;
 }
 
 void MVKExample::fullScreen(bool fullscreen) {

apple/MVKExample.h

@@ -13,7 +13,6 @@
 class MVKExample {
 
 public:
-	void renderFrame();
     void displayLinkOutputCb();                     // SRS - expose VulkanExampleBase::displayLinkOutputCb() to DemoViewController
 
     void keyPressed(uint32_t keyChar);              // SRS - expose keyboard events to DemoViewController

apple/examples.h

@@ -40,7 +40,7 @@
 #   include "../examples/triangle/triangle.cpp"
 #endif
 
-// Does not run. MoltenVK does not yet support Vulkan 1.3
+// Supported as of MoltenVK version 1.3.0 / Vulkan SDK 1.4.321.0
 #ifdef MVK_trianglevulkan13
 #   include "../examples/trianglevulkan13/trianglevulkan13.cpp"
 #endif

apple/macos/DemoViewController.mm

@@ -26,8 +26,7 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink,
                                     CVOptionFlags flagsIn,
                                     CVOptionFlags* flagsOut,
                                     void* target) {
-    //((MVKExample*)target)->renderFrame();
-    ((MVKExample*)target)->displayLinkOutputCb();   // SRS - Call displayLinkOutputCb() to animate frames vs. renderFrame() for static image
+    ((MVKExample*)target)->displayLinkOutputCb();   // SRS - Call displayLinkOutputCb() to render/animate at displayLink frame rate
     return kCVReturnSuccess;
 }