From fc7c0fd265347e3a195072efbe37ce1e88d2abe8 Mon Sep 17 00:00:00 2001 From: Jeremy Kniager Date: Mon, 14 Oct 2019 09:25:47 -0600 Subject: cube: Revert 1.1.114 SDK workaround for vkcube During the release of the 1.1.114 MacOS SDK a workaround for vkcube was needed to get it functioning in time for release. The underlying problem has since been fixed and this workaround is not longer necessary. Change-Id: I3ad3d1bafa44cfbc158820025bb22757d6e5683d --- cube/cube.c | 6 ------ cube/cube.cpp | 6 ------ 2 files changed, 12 deletions(-) (limited to 'cube') diff --git a/cube/cube.c b/cube/cube.c index 1b7b3227..7398a2c1 100644 --- a/cube/cube.c +++ b/cube/cube.c @@ -3704,12 +3704,6 @@ static void demo_init(struct demo *demo, int argc, char **argv) { demo->presentMode = VK_PRESENT_MODE_FIFO_KHR; demo->frameCount = INT32_MAX; -#if defined(VK_USE_PLATFORM_MACOS_MVK) - // MoltenVK may not allow host coherent mapping to linear tiled images - // Force the use of a staging buffer to be safe - demo->use_staging_buffer = true; -#endif - for (int i = 1; i < argc; i++) { if (strcmp(argv[i], "--use_staging") == 0) { demo->use_staging_buffer = true; diff --git a/cube/cube.cpp b/cube/cube.cpp index 48c1f728..87b24f9f 100644 --- a/cube/cube.cpp +++ b/cube/cube.cpp @@ -909,12 +909,6 @@ void Demo::init(int argc, char **argv) { frameCount = UINT32_MAX; use_xlib = false; -#if defined(VK_USE_PLATFORM_MACOS_MVK) - // MoltenVK may not allow host coherent mapping to linear tiled images - // Force the use of a staging buffer to be safe - use_staging_buffer = true; -#endif - for (int i = 1; i < argc; i++) { if (strcmp(argv[i], "--use_staging") == 0) { use_staging_buffer = true; -- cgit v1.2.3