From c2ebbc732f080e8e92ffe9f26292a71184672332 Mon Sep 17 00:00:00 2001 From: Bill Hollings Date: Sun, 15 Mar 2020 20:48:39 -0400 Subject: [PATCH] Replace use of mvkMTLPixelFormatFromVkFormat() and mvkVkFormatFromMTLPixelFormat() with MVKPixelFormats versions. Remove mvkMTLPixelFormatFromVkFormatInObj(). --- MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm | 4 ++-- MoltenVK/MoltenVK/GPUObjects/MVKImage.mm | 2 +- MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm | 2 +- MoltenVK/MoltenVK/Vulkan/mvk_datatypes.hpp | 3 --- MoltenVK/MoltenVK/Vulkan/mvk_datatypes.mm | 7 +------ 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm index 60fd2825..6e2b25ed 100644 --- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm +++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm @@ -549,7 +549,7 @@ VkResult MVKPhysicalDevice::getSurfaceFormats(MVKSurface* surface, // Now populate the supplied array for (uint csIdx = 0, idx = 0; idx < *pCount && csIdx < colorSpaces.size(); csIdx++) { for (uint fmtIdx = 0; idx < *pCount && fmtIdx < mtlFmtsCnt; fmtIdx++, idx++) { - pSurfaceFormats[idx].format = mvkVkFormatFromMTLPixelFormat(mtlFormats[fmtIdx]); + pSurfaceFormats[idx].format = _pixelFormats.getVkFormatFromMTLPixelFormat(mtlFormats[fmtIdx]); pSurfaceFormats[idx].colorSpace = colorSpaces[csIdx]; } } @@ -1224,7 +1224,7 @@ void MVKPhysicalDevice::initProperties() { uint32_t maxStorage = 0, maxUniform = 0; bool singleTexelStorage = true, singleTexelUniform = true; mvkEnumerateSupportedFormats({0, 0, VK_FORMAT_FEATURE_UNIFORM_TEXEL_BUFFER_BIT | VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT}, true, [&](VkFormat vk) { - MTLPixelFormat mtlFmt = mvkMTLPixelFormatFromVkFormat(vk); + MTLPixelFormat mtlFmt = _pixelFormats.getMTLPixelFormatFromVkFormat(vk); if ( !mtlFmt ) { return false; } // If format is invalid, avoid validation errors on MTLDevice format alignment calls NSUInteger alignment; diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm index ed9318bf..1db0cd6a 100644 --- a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm +++ b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm @@ -40,7 +40,7 @@ void MVKImage::propogateDebugName() { setLabelIfNotNil(_mtlTexture, _debugName); VkImageType MVKImage::getImageType() { return mvkVkImageTypeFromMTLTextureType(_mtlTextureType); } -VkFormat MVKImage::getVkFormat() { return mvkVkFormatFromMTLPixelFormat(_mtlPixelFormat); } +VkFormat MVKImage::getVkFormat() { return getPixelFormats()->getVkFormatFromMTLPixelFormat(_mtlPixelFormat); } bool MVKImage::getIsCompressed() { return getPixelFormats()->getFormatTypeFromMTLPixelFormat(_mtlPixelFormat) == kMVKFormatCompressed; diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm index 7ce1d6c0..8d9486d4 100644 --- a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm +++ b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm @@ -492,7 +492,7 @@ void MVKSwapchain::initSurfaceImages(const VkSwapchainCreateInfoKHR* pCreateInfo .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, .pNext = VK_NULL_HANDLE, .imageType = VK_IMAGE_TYPE_2D, - .format = mvkVkFormatFromMTLPixelFormat(_mtlLayer.pixelFormat), + .format = getPixelFormats()->getVkFormatFromMTLPixelFormat(_mtlLayer.pixelFormat), .extent = { imgExtent.width, imgExtent.height, 1 }, .mipLevels = 1, .arrayLayers = 1, diff --git a/MoltenVK/MoltenVK/Vulkan/mvk_datatypes.hpp b/MoltenVK/MoltenVK/Vulkan/mvk_datatypes.hpp index 8994634a..26b92492 100644 --- a/MoltenVK/MoltenVK/Vulkan/mvk_datatypes.hpp +++ b/MoltenVK/MoltenVK/Vulkan/mvk_datatypes.hpp @@ -47,9 +47,6 @@ class MVKPixelFormats; * of an MVKBaseObject subclass, which is true for all but static calling functions. */ -MTLPixelFormat mvkMTLPixelFormatFromVkFormatInObj(VkFormat vkFormat, MVKBaseObject* mvkObj); -#define mvkMTLPixelFormatFromVkFormat(vkFormat) mvkMTLPixelFormatFromVkFormatInObj(vkFormat, this) - MTLVertexFormat mvkMTLVertexFormatFromVkFormatInObj(VkFormat vkFormat, MVKBaseObject* mvkObj); #define mvkMTLVertexFormatFromVkFormat(vkFormat) mvkMTLVertexFormatFromVkFormatInObj(vkFormat, this) diff --git a/MoltenVK/MoltenVK/Vulkan/mvk_datatypes.mm b/MoltenVK/MoltenVK/Vulkan/mvk_datatypes.mm index cfa93ec7..871b251e 100644 --- a/MoltenVK/MoltenVK/Vulkan/mvk_datatypes.mm +++ b/MoltenVK/MoltenVK/Vulkan/mvk_datatypes.mm @@ -567,12 +567,7 @@ MVK_PUBLIC_SYMBOL MVKFormatType mvkFormatTypeFromMTLPixelFormat(MTLPixelFormat m return formatDescForMTLPixelFormat(mtlFormat).formatType; } -#undef mvkMTLPixelFormatFromVkFormat MVK_PUBLIC_SYMBOL MTLPixelFormat mvkMTLPixelFormatFromVkFormat(VkFormat vkFormat) { - return mvkMTLPixelFormatFromVkFormatInObj(vkFormat, nullptr); -} - -MTLPixelFormat mvkMTLPixelFormatFromVkFormatInObj(VkFormat vkFormat, MVKBaseObject* mvkObj) { MTLPixelFormat mtlPixFmt = MTLPixelFormatInvalid; const MVKPlatformFormatDesc& fmtDesc = formatDescForVkFormat(vkFormat); @@ -597,7 +592,7 @@ MTLPixelFormat mvkMTLPixelFormatFromVkFormatInObj(VkFormat vkFormat, MVKBaseObje errMsg += (fmtDescSubs.vkName) ? fmtDescSubs.vkName : to_string(fmtDescSubs.vk); errMsg += " instead."; } - MVKBaseObject::reportError(mvkObj, VK_ERROR_FORMAT_NOT_SUPPORTED, "%s", errMsg.c_str()); + MVKBaseObject::reportError(nullptr, VK_ERROR_FORMAT_NOT_SUPPORTED, "%s", errMsg.c_str()); } }