From ef08f0d9fb054472bbc917f6d0f41a0fff59d148 Mon Sep 17 00:00:00 2001
From: Aman Gupta <aman@tmm1.net>
Date: Mon, 15 Jun 2020 17:05:07 -0700
Subject: [PATCH] fix some warnings

---
 MoltenVK/MoltenVK/GPUObjects/MVKBuffer.mm | 2 +-
 MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm | 4 ++--
 MoltenVK/MoltenVK/Utility/MVKFoundation.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKBuffer.mm b/MoltenVK/MoltenVK/GPUObjects/MVKBuffer.mm
index 178357da..d22c994f 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKBuffer.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKBuffer.mm
@@ -131,7 +131,7 @@ bool MVKBuffer::needsHostReadSync(VkPipelineStageFlags srcStageMask,
 			mvkIsAnyFlagEnabled(barrier.dstAccessMask, (VK_ACCESS_HOST_READ_BIT)) &&
 			isMemoryHostAccessible() && (!isMemoryHostCoherent() || _isHostCoherentTexelBuffer));
 #endif
-#if MVK_IOS
+#if MVK_IOS_OR_TVOS
 	return false;
 #endif
 }
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
index 5654a9d7..2ca6daad 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
@@ -1955,7 +1955,7 @@ void MVKPhysicalDevice::initMemoryProperties() {
 }
 
 bool MVKPhysicalDevice::getHasUnifiedMemory() {
-#if MVK_IOS
+#if MVK_IOS_OR_TVOS
 	return true;
 #endif
 #if MVK_MACOS
@@ -1993,7 +1993,7 @@ uint64_t MVKPhysicalDevice::getCurrentAllocatedSize() {
 	if ( [_mtlDevice respondsToSelector: @selector(currentAllocatedSize)] ) {
 		return _mtlDevice.currentAllocatedSize;
 	}
-#if MVK_IOS
+#if MVK_IOS_OR_TVOS
 	// We can use the current memory used by this process as a reasonable approximation.
 	return mvkGetUsedMemorySize();
 #endif
diff --git a/MoltenVK/MoltenVK/Utility/MVKFoundation.h b/MoltenVK/MoltenVK/Utility/MVKFoundation.h
index a8ea008b..37c31216 100644
--- a/MoltenVK/MoltenVK/Utility/MVKFoundation.h
+++ b/MoltenVK/MoltenVK/Utility/MVKFoundation.h
@@ -448,7 +448,7 @@ void mvkRemoveAllOccurances(C& container, T val) {
 /** Selects and returns one of the values, based on the platform OS. */
 template<typename T>
 const T& mvkSelectPlatformValue(const T& macOSVal, const T& iOSVal) {
-#if MVK_IOS
+#if MVK_IOS_OR_TVOS
 	return iOSVal;
 #endif
 #if MVK_MACOS