Updated main entry points (in line with the example base) (Refs #268, #270)

This commit is contained in:
saschawillems 2017-01-23 13:54:23 +01:00
parent f09993bc15
commit f86ff6dd27
2 changed files with 63 additions and 36 deletions

View file

@ -370,7 +370,6 @@ void android_main(android_app* state) \
}
#elif defined(_DIRECT2DISPLAY)
// Linux entry point with direct to display wsi
// todo: extract command line arguments
#define VULKAN_EXAMPLE_MAIN() \
VulkanExample *vulkanExample; \
static void handleEvent() \
@ -378,6 +377,7 @@ static void handleEvent() \
} \
int main(const int argc, const char *argv[]) \
{ \
for (size_t i = 0; i < argc; i++) { VulkanExample::args.push_back(argv[i]); }; \
vulkanExample = new VulkanExample(); \
vulkanExample->initVulkan(); \
vulkanExample->initSwapchain(); \
@ -388,7 +388,6 @@ int main(const int argc, const char *argv[]) \
}
#elif defined(__linux__)
// Linux entry point
// todo: extract command line arguments
#define VULKAN_EXAMPLE_MAIN() \
VulkanExample *vulkanExample; \
static void handleEvent(const xcb_generic_event_t *event) \