fix some warnings

This commit is contained in:
Aman Gupta 2020-06-15 17:05:07 -07:00
parent 7d1b1e7e8e
commit ef08f0d9fb
3 changed files with 4 additions and 4 deletions

View File

@ -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
}

View File

@ -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

View File

@ -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