From cdf22a4086d85eaf407d3ee79dbb8876fa3bd41e Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Fri, 15 Jul 2022 17:23:54 +0200 Subject: [PATCH] [dxvk] Rename imageFormatInfo -> lookupFormatInfo --- src/d3d11/d3d11_context.cpp | 22 +++++++++++----------- src/d3d11/d3d11_context_def.cpp | 2 +- src/d3d11/d3d11_context_imm.cpp | 4 ++-- src/d3d11/d3d11_device.cpp | 8 ++++---- src/d3d11/d3d11_initializer.cpp | 2 +- src/d3d11/d3d11_texture.cpp | 16 ++++++++-------- src/d3d11/d3d11_video.cpp | 4 ++-- src/d3d11/d3d11_view_dsv.cpp | 2 +- src/d3d11/d3d11_view_rtv.cpp | 2 +- src/d3d11/d3d11_view_srv.cpp | 2 +- src/d3d11/d3d11_view_uav.cpp | 2 +- src/d3d9/d3d9_common_texture.cpp | 6 +++--- src/d3d9/d3d9_device.cpp | 22 +++++++++++----------- src/d3d9/d3d9_initializer.cpp | 4 ++-- src/d3d9/d3d9_swapchain.cpp | 6 +++--- src/dxvk/dxvk_buffer.h | 4 ++-- src/dxvk/dxvk_context.cpp | 10 +++++----- src/dxvk/dxvk_format.cpp | 2 +- src/dxvk/dxvk_format.h | 2 +- src/dxvk/dxvk_graphics.cpp | 6 +++--- src/dxvk/dxvk_image.h | 4 ++-- src/dxvk/dxvk_meta_copy.cpp | 2 +- src/dxvk/dxvk_meta_resolve.cpp | 4 ++-- src/dxvk/dxvk_state_cache_types.h | 2 +- src/dxvk/dxvk_util.cpp | 2 +- src/dxvk/dxvk_util.h | 2 +- src/dxvk/hud/dxvk_hud.cpp | 2 +- src/vulkan/vulkan_presenter.cpp | 4 ++-- 28 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/d3d11/d3d11_context.cpp b/src/d3d11/d3d11_context.cpp index 9bebbe48a..8aff2312e 100644 --- a/src/d3d11/d3d11_context.cpp +++ b/src/d3d11/d3d11_context.cpp @@ -355,8 +355,8 @@ namespace dxvk { || SrcSubresource >= srcTexture->CountSubresources()) return; - auto dstFormatInfo = imageFormatInfo(dstTexture->GetPackedFormat()); - auto srcFormatInfo = imageFormatInfo(srcTexture->GetPackedFormat()); + auto dstFormatInfo = lookupFormatInfo(dstTexture->GetPackedFormat()); + auto srcFormatInfo = lookupFormatInfo(srcTexture->GetPackedFormat()); auto dstLayers = vk::makeSubresourceLayers(dstTexture->GetSubresourceFromIndex(dstFormatInfo->aspectMask, DstSubresource)); auto srcLayers = vk::makeSubresourceLayers(srcTexture->GetSubresourceFromIndex(srcFormatInfo->aspectMask, SrcSubresource)); @@ -433,8 +433,8 @@ namespace dxvk { return; } - auto dstFormatInfo = imageFormatInfo(dstTexture->GetPackedFormat()); - auto srcFormatInfo = imageFormatInfo(srcTexture->GetPackedFormat()); + auto dstFormatInfo = lookupFormatInfo(dstTexture->GetPackedFormat()); + auto srcFormatInfo = lookupFormatInfo(srcTexture->GetPackedFormat()); for (uint32_t i = 0; i < dstDesc->MipLevels; i++) { VkImageSubresourceLayers dstLayers = { dstFormatInfo->aspectMask, i, 0, dstDesc->ArraySize }; @@ -870,7 +870,7 @@ namespace dxvk { // We'll need the format info to determine the buffer // element size, and we also need it for depth images. - const DxvkFormatInfo* formatInfo = imageFormatInfo(format); + const DxvkFormatInfo* formatInfo = lookupFormatInfo(format); // Convert the clear color format. ClearView takes // the clear value for integer formats as a set of @@ -1077,8 +1077,8 @@ namespace dxvk { const DXGI_VK_FORMAT_INFO dstFormatInfo = m_parent->LookupFormat(dstDesc.Format, DXGI_VK_FORMAT_MODE_ANY); const DXGI_VK_FORMAT_INFO srcFormatInfo = m_parent->LookupFormat(srcDesc.Format, DXGI_VK_FORMAT_MODE_ANY); - auto dstVulkanFormatInfo = imageFormatInfo(dstFormatInfo.Format); - auto srcVulkanFormatInfo = imageFormatInfo(srcFormatInfo.Format); + auto dstVulkanFormatInfo = lookupFormatInfo(dstFormatInfo.Format); + auto srcVulkanFormatInfo = lookupFormatInfo(srcFormatInfo.Format); if (DstSubresource >= dstTextureInfo->CountSubresources() || SrcSubresource >= srcTextureInfo->CountSubresources()) @@ -3428,8 +3428,8 @@ namespace dxvk { VkOffset3D SrcOffset, VkExtent3D SrcExtent) { // Image formats must be size-compatible - auto dstFormatInfo = imageFormatInfo(pDstTexture->GetPackedFormat()); - auto srcFormatInfo = imageFormatInfo(pSrcTexture->GetPackedFormat()); + auto dstFormatInfo = lookupFormatInfo(pDstTexture->GetPackedFormat()); + auto srcFormatInfo = lookupFormatInfo(pSrcTexture->GetPackedFormat()); if (dstFormatInfo->elementSize != srcFormatInfo->elementSize) { Logger::err("D3D11: CopyImage: Incompatible texel size"); @@ -3753,7 +3753,7 @@ namespace dxvk { VkFormat packedFormat = pDstTexture->GetPackedFormat(); - auto formatInfo = imageFormatInfo(packedFormat); + auto formatInfo = lookupFormatInfo(packedFormat); auto subresource = pDstTexture->GetSubresourceFromIndex( formatInfo->aspectMask, DstSubresource); @@ -3837,7 +3837,7 @@ namespace dxvk { VkExtent3D dstMipExtent = pDstTexture->MipLevelExtent(pDstSubresource->mipLevel); auto dstFormat = pDstTexture->GetPackedFormat(); - auto dstFormatInfo = imageFormatInfo(dstFormat); + auto dstFormatInfo = lookupFormatInfo(dstFormat); uint32_t planeCount = 1; diff --git a/src/d3d11/d3d11_context_def.cpp b/src/d3d11/d3d11_context_def.cpp index 552cfcc81..57695bf25 100644 --- a/src/d3d11/d3d11_context_def.cpp +++ b/src/d3d11/d3d11_context_def.cpp @@ -333,7 +333,7 @@ namespace dxvk { VkFormat packedFormat = pTexture->GetPackedFormat(); - auto formatInfo = imageFormatInfo(packedFormat); + auto formatInfo = lookupFormatInfo(packedFormat); auto subresource = pTexture->GetSubresourceFromIndex( formatInfo->aspectMask, Subresource); diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp index 489e77bce..0c4ea85e3 100644 --- a/src/d3d11/d3d11_context_imm.cpp +++ b/src/d3d11/d3d11_context_imm.cpp @@ -477,7 +477,7 @@ namespace dxvk { uint64_t sequenceNumber = pResource->GetSequenceNumber(Subresource); - auto formatInfo = imageFormatInfo(packedFormat); + auto formatInfo = lookupFormatInfo(packedFormat); void* mapPtr; if (mapMode == D3D11_COMMON_TEXTURE_MAP_MODE_DIRECT) { @@ -609,7 +609,7 @@ namespace dxvk { (pResource->GetMapMode() == D3D11_COMMON_TEXTURE_MAP_MODE_BUFFER)) { // Now that data has been written into the buffer, // we need to copy its contents into the image - VkImageAspectFlags aspectMask = imageFormatInfo(pResource->GetPackedFormat())->aspectMask; + VkImageAspectFlags aspectMask = lookupFormatInfo(pResource->GetPackedFormat())->aspectMask; VkImageSubresource subresource = pResource->GetSubresourceFromIndex(aspectMask, Subresource); UpdateImage(pResource, &subresource, VkOffset3D { 0, 0, 0 }, diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp index f5ffc3490..f71aa1561 100644 --- a/src/d3d11/d3d11_device.cpp +++ b/src/d3d11/d3d11_device.cpp @@ -629,7 +629,7 @@ namespace dxvk { // generate the exact vertex layout. In that case we'll // pack attributes on the same binding in the order they // are declared, aligning each attribute to four bytes. - const DxvkFormatInfo* formatInfo = imageFormatInfo(attrib.format); + const DxvkFormatInfo* formatInfo = lookupFormatInfo(attrib.format); VkDeviceSize alignment = std::min(formatInfo->elementSize, 4); if (attrib.offset == D3D11_APPEND_ALIGNED_ELEMENT) { @@ -639,7 +639,7 @@ namespace dxvk { const DxvkVertexAttribute& prev = attrList.at(i - j); if (prev.binding == attrib.binding) { - attrib.offset = align(prev.offset + imageFormatInfo(prev.format)->elementSize, alignment); + attrib.offset = align(prev.offset + lookupFormatInfo(prev.format)->elementSize, alignment); break; } } @@ -2046,7 +2046,7 @@ namespace dxvk { return E_FAIL; // Query Vulkan format properties and supported features for it - const DxvkFormatInfo* fmtProperties = imageFormatInfo(fmtMapping.Format); + const DxvkFormatInfo* fmtProperties = lookupFormatInfo(fmtMapping.Format); VkFormatProperties fmtSupport = fmtMapping.Format != VK_FORMAT_UNDEFINED ? m_dxvkAdapter->formatProperties(fmtMapping.Format) @@ -2338,7 +2338,7 @@ namespace dxvk { texture->Desc()->Format, texture->GetFormatMode()).Format; - auto formatInfo = imageFormatInfo(packedFormat); + auto formatInfo = lookupFormatInfo(packedFormat); // Validate box against subresource dimensions Rc image = texture->GetImage(); diff --git a/src/d3d11/d3d11_initializer.cpp b/src/d3d11/d3d11_initializer.cpp index cfe0e9bcc..9aa9ac672 100644 --- a/src/d3d11/d3d11_initializer.cpp +++ b/src/d3d11/d3d11_initializer.cpp @@ -123,7 +123,7 @@ namespace dxvk { auto desc = pTexture->Desc(); VkFormat packedFormat = m_parent->LookupPackedFormat(desc->Format, pTexture->GetFormatMode()).Format; - auto formatInfo = imageFormatInfo(packedFormat); + auto formatInfo = lookupFormatInfo(packedFormat); if (pInitialData != nullptr && pInitialData->pSysMem != nullptr) { // pInitialData is an array that stores an entry for diff --git a/src/d3d11/d3d11_texture.cpp b/src/d3d11/d3d11_texture.cpp index 08b6351d6..e1846559a 100644 --- a/src/d3d11/d3d11_texture.cpp +++ b/src/d3d11/d3d11_texture.cpp @@ -70,7 +70,7 @@ namespace dxvk { // The image must be marked as mutable if it can be reinterpreted // by a view with a different format. Depth-stencil formats cannot // be reinterpreted in Vulkan, so we'll ignore those. - auto formatProperties = imageFormatInfo(formatInfo.Format); + auto formatProperties = lookupFormatInfo(formatInfo.Format); bool isMutable = formatFamily.FormatCount > 1; bool isMultiPlane = (formatProperties->aspectMask & VK_IMAGE_ASPECT_PLANE_0_BIT) != 0; @@ -229,7 +229,7 @@ namespace dxvk { VkDeviceSize D3D11CommonTexture::ComputeMappedOffset(UINT Subresource, UINT Plane, VkOffset3D Offset) const { - auto packedFormatInfo = imageFormatInfo(m_packedFormat); + auto packedFormatInfo = lookupFormatInfo(m_packedFormat); VkImageAspectFlags aspectMask = packedFormatInfo->aspectMask; VkDeviceSize elementSize = packedFormatInfo->elementSize; @@ -281,7 +281,7 @@ namespace dxvk { case D3D11_COMMON_TEXTURE_MAP_MODE_NONE: case D3D11_COMMON_TEXTURE_MAP_MODE_BUFFER: case D3D11_COMMON_TEXTURE_MAP_MODE_STAGING: { - auto packedFormatInfo = imageFormatInfo(m_packedFormat); + auto packedFormatInfo = lookupFormatInfo(m_packedFormat); VkImageAspectFlags aspects = packedFormatInfo->aspectMask; VkExtent3D mipExtent = MipLevelExtent(subresource.mipLevel); @@ -379,8 +379,8 @@ namespace dxvk { // Otherwise, all bit-compatible formats can be used. if (imageInfo.viewFormatCount == 0 && planeCount == 1) { - auto baseFormatInfo = imageFormatInfo(baseFormat.Format); - auto viewFormatInfo = imageFormatInfo(viewFormat.Format); + auto baseFormatInfo = lookupFormatInfo(baseFormat.Format); + auto viewFormatInfo = lookupFormatInfo(viewFormat.Format); return baseFormatInfo->aspectMask == viewFormatInfo->aspectMask && baseFormatInfo->elementSize == viewFormatInfo->elementSize; @@ -530,7 +530,7 @@ namespace dxvk { const auto dsMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; - auto formatInfo = imageFormatInfo(Format); + auto formatInfo = lookupFormatInfo(Format); return formatInfo->aspectMask == dsMask ? VK_IMAGE_USAGE_SAMPLED_BIT @@ -572,7 +572,7 @@ namespace dxvk { return D3D11_COMMON_TEXTURE_MAP_MODE_BUFFER; // Multi-plane images have a special memory layout in D3D11 - if (imageFormatInfo(pImageInfo->format)->flags.test(DxvkFormatFlag::MultiPlane)) + if (lookupFormatInfo(pImageInfo->format)->flags.test(DxvkFormatFlag::MultiPlane)) return D3D11_COMMON_TEXTURE_MAP_MODE_BUFFER; // If we can't use linear tiling for this image, we have to use a buffer @@ -644,7 +644,7 @@ namespace dxvk { D3D11CommonTexture::MappedBuffer D3D11CommonTexture::CreateMappedBuffer(UINT MipLevel) const { - const DxvkFormatInfo* formatInfo = imageFormatInfo( + const DxvkFormatInfo* formatInfo = lookupFormatInfo( m_device->LookupPackedFormat(m_desc.Format, GetFormatMode()).Format); DxvkBufferCreateInfo info; diff --git a/src/d3d11/d3d11_video.cpp b/src/d3d11/d3d11_video.cpp index 883f9188e..75dc373aa 100644 --- a/src/d3d11/d3d11_video.cpp +++ b/src/d3d11/d3d11_video.cpp @@ -159,7 +159,7 @@ namespace dxvk { DXGI_VK_FORMAT_INFO formatInfo = pDevice->LookupFormat(resourceDesc.Format, DXGI_VK_FORMAT_MODE_COLOR); DXGI_VK_FORMAT_FAMILY formatFamily = pDevice->LookupFamily(resourceDesc.Format, DXGI_VK_FORMAT_MODE_COLOR); - VkImageAspectFlags aspectMask = imageFormatInfo(formatInfo.Format)->aspectMask; + VkImageAspectFlags aspectMask = lookupFormatInfo(formatInfo.Format)->aspectMask; DxvkImageViewCreateInfo viewInfo; viewInfo.format = formatInfo.Format; @@ -257,7 +257,7 @@ namespace dxvk { DxvkImageViewCreateInfo viewInfo; viewInfo.format = formatInfo.Format; - viewInfo.aspect = imageFormatInfo(viewInfo.format)->aspectMask; + viewInfo.aspect = lookupFormatInfo(viewInfo.format)->aspectMask; viewInfo.swizzle = formatInfo.Swizzle; viewInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; diff --git a/src/d3d11/d3d11_view_dsv.cpp b/src/d3d11/d3d11_view_dsv.cpp index f0520c645..62e79fedb 100644 --- a/src/d3d11/d3d11_view_dsv.cpp +++ b/src/d3d11/d3d11_view_dsv.cpp @@ -19,7 +19,7 @@ namespace dxvk { DxvkImageViewCreateInfo viewInfo; viewInfo.format = pDevice->LookupFormat(pDesc->Format, DXGI_VK_FORMAT_MODE_DEPTH).Format; - viewInfo.aspect = imageFormatInfo(viewInfo.format)->aspectMask; + viewInfo.aspect = lookupFormatInfo(viewInfo.format)->aspectMask; viewInfo.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; switch (pDesc->ViewDimension) { diff --git a/src/d3d11/d3d11_view_rtv.cpp b/src/d3d11/d3d11_view_rtv.cpp index 86460502a..09153d0a0 100644 --- a/src/d3d11/d3d11_view_rtv.cpp +++ b/src/d3d11/d3d11_view_rtv.cpp @@ -24,7 +24,7 @@ namespace dxvk { DxvkImageViewCreateInfo viewInfo; viewInfo.format = formatInfo.Format; - viewInfo.aspect = imageFormatInfo(viewInfo.format)->aspectMask; + viewInfo.aspect = lookupFormatInfo(viewInfo.format)->aspectMask; viewInfo.swizzle = formatInfo.Swizzle; viewInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; diff --git a/src/d3d11/d3d11_view_srv.cpp b/src/d3d11/d3d11_view_srv.cpp index 1c3d4d8dd..73c179b09 100644 --- a/src/d3d11/d3d11_view_srv.cpp +++ b/src/d3d11/d3d11_view_srv.cpp @@ -58,7 +58,7 @@ namespace dxvk { } else { viewInfo.format = pDevice->LookupFormat(pDesc->Format, DXGI_VK_FORMAT_MODE_COLOR).Format; - const DxvkFormatInfo* formatInfo = imageFormatInfo(viewInfo.format); + const DxvkFormatInfo* formatInfo = lookupFormatInfo(viewInfo.format); viewInfo.rangeOffset = formatInfo->elementSize * bufInfo.FirstElement; viewInfo.rangeLength = formatInfo->elementSize * bufInfo.NumElements; } diff --git a/src/d3d11/d3d11_view_uav.cpp b/src/d3d11/d3d11_view_uav.cpp index 54f826e79..562626acd 100644 --- a/src/d3d11/d3d11_view_uav.cpp +++ b/src/d3d11/d3d11_view_uav.cpp @@ -38,7 +38,7 @@ namespace dxvk { } else { viewInfo.format = pDevice->LookupFormat(pDesc->Format, DXGI_VK_FORMAT_MODE_COLOR).Format; - const DxvkFormatInfo* formatInfo = imageFormatInfo(viewInfo.format); + const DxvkFormatInfo* formatInfo = lookupFormatInfo(viewInfo.format); viewInfo.rangeOffset = formatInfo->elementSize * pDesc->Buffer.FirstElement; viewInfo.rangeLength = formatInfo->elementSize * pDesc->Buffer.NumElements; } diff --git a/src/d3d9/d3d9_common_texture.cpp b/src/d3d9/d3d9_common_texture.cpp index 22bc37c91..ef93e9473 100644 --- a/src/d3d9/d3d9_common_texture.cpp +++ b/src/d3d9/d3d9_common_texture.cpp @@ -199,7 +199,7 @@ namespace dxvk { const UINT MipLevel = Subresource % m_desc.MipLevels; const DxvkFormatInfo* formatInfo = m_mapping.FormatColor != VK_FORMAT_UNDEFINED - ? imageFormatInfo(m_mapping.FormatColor) + ? lookupFormatInfo(m_mapping.FormatColor) : m_device->UnsupportedFormatInfo(m_desc.Format); const VkExtent3D mipExtent = util::computeMipLevelExtent( @@ -263,7 +263,7 @@ namespace dxvk { // The image must be marked as mutable if it can be reinterpreted // by a view with a different format. Depth-stencil formats cannot // be reinterpreted in Vulkan, so we'll ignore those. - auto formatProperties = imageFormatInfo(m_mapping.FormatColor); + auto formatProperties = lookupFormatInfo(m_mapping.FormatColor); bool isMutable = m_mapping.FormatSrgb != VK_FORMAT_UNDEFINED; bool isColorFormat = (formatProperties->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) != 0; @@ -541,7 +541,7 @@ namespace dxvk { viewInfo.format = m_mapping.ConversionFormatInfo.FormatColor != VK_FORMAT_UNDEFINED ? PickSRGB(m_mapping.ConversionFormatInfo.FormatColor, m_mapping.ConversionFormatInfo.FormatSrgb, Srgb) : PickSRGB(m_mapping.FormatColor, m_mapping.FormatSrgb, Srgb); - viewInfo.aspect = imageFormatInfo(viewInfo.format)->aspectMask; + viewInfo.aspect = lookupFormatInfo(viewInfo.format)->aspectMask; viewInfo.swizzle = m_mapping.Swizzle; viewInfo.usage = UsageFlags; viewInfo.type = GetImageViewTypeFromResourceType(m_type, Layer); diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp index 0fb2fe5a1..86cc93904 100644 --- a/src/d3d9/d3d9_device.cpp +++ b/src/d3d9/d3d9_device.cpp @@ -735,7 +735,7 @@ namespace dxvk { if (unlikely(srcTextureInfo->Desc()->Format != dstTextureInfo->Desc()->Format)) return D3DERR_INVALIDCALL; - const DxvkFormatInfo* formatInfo = imageFormatInfo(dstTextureInfo->GetFormatMapping().FormatColor); + const DxvkFormatInfo* formatInfo = lookupFormatInfo(dstTextureInfo->GetFormatMapping().FormatColor); VkOffset3D srcOffset = { 0u, 0u, 0u }; VkOffset3D dstOffset = { 0u, 0u, 0u }; @@ -878,7 +878,7 @@ namespace dxvk { Rc dstBuffer = dstTexInfo->GetBuffer(dst->GetSubresource()); Rc srcImage = srcTexInfo->GetImage(); - const DxvkFormatInfo* srcFormatInfo = imageFormatInfo(srcImage->info().format); + const DxvkFormatInfo* srcFormatInfo = lookupFormatInfo(srcImage->info().format); const VkImageSubresource srcSubresource = srcTexInfo->GetSubresourceFromIndex(srcFormatInfo->aspectMask, src->GetSubresource()); VkImageSubresourceLayers srcSubresourceLayers = { @@ -953,8 +953,8 @@ namespace dxvk { if (dstImage == nullptr || srcImage == nullptr) return D3DERR_INVALIDCALL; - const DxvkFormatInfo* dstFormatInfo = imageFormatInfo(dstImage->info().format); - const DxvkFormatInfo* srcFormatInfo = imageFormatInfo(srcImage->info().format); + const DxvkFormatInfo* dstFormatInfo = lookupFormatInfo(dstImage->info().format); + const DxvkFormatInfo* srcFormatInfo = lookupFormatInfo(srcImage->info().format); const VkImageSubresource dstSubresource = dstTextureInfo->GetSubresourceFromIndex(dstFormatInfo->aspectMask, dst->GetSubresource()); const VkImageSubresource srcSubresource = srcTextureInfo->GetSubresourceFromIndex(srcFormatInfo->aspectMask, src->GetSubresource()); @@ -1464,7 +1464,7 @@ namespace dxvk { if (Flags & D3DCLEAR_STENCIL) depthAspectMask |= VK_IMAGE_ASPECT_STENCIL_BIT; - depthAspectMask &= imageFormatInfo(m_state.depthStencil->GetCommonTexture()->GetFormatMapping().FormatColor)->aspectMask; + depthAspectMask &= lookupFormatInfo(m_state.depthStencil->GetCommonTexture()->GetFormatMapping().FormatColor)->aspectMask; } auto ClearImageView = [this]( @@ -4134,7 +4134,7 @@ namespace dxvk { auto& formatMapping = pResource->GetFormatMapping(); const DxvkFormatInfo* formatInfo = formatMapping.IsValid() - ? imageFormatInfo(formatMapping.FormatColor) : UnsupportedFormatInfo(pResource->Desc()->Format); + ? lookupFormatInfo(formatMapping.FormatColor) : UnsupportedFormatInfo(pResource->Desc()->Format); auto subresource = pResource->GetSubresourceFromIndex( formatInfo->aspectMask, Subresource); @@ -4401,7 +4401,7 @@ namespace dxvk { UINT Subresource) { const Rc image = pResource->GetImage(); - auto formatInfo = imageFormatInfo(image->info().format); + auto formatInfo = lookupFormatInfo(image->info().format); auto subresource = pResource->GetSubresourceFromIndex( formatInfo->aspectMask, Subresource); @@ -4435,7 +4435,7 @@ namespace dxvk { // we need to copy its contents into the image const DxvkBufferSliceHandle srcSlice = pSrcTexture->GetMappedSlice(SrcSubresource); - auto formatInfo = imageFormatInfo(image->info().format); + auto formatInfo = lookupFormatInfo(image->info().format); auto srcSubresource = pSrcTexture->GetSubresourceFromIndex( formatInfo->aspectMask, SrcSubresource); @@ -4513,7 +4513,7 @@ namespace dxvk { TrackTextureMappingBufferSequenceNumber(pSrcTexture, SrcSubresource); } else { - const DxvkFormatInfo* formatInfo = imageFormatInfo(pDestTexture->GetFormatMapping().FormatColor); + const DxvkFormatInfo* formatInfo = lookupFormatInfo(pDestTexture->GetFormatMapping().FormatColor); // Add more blocks for the other planes that we might have. // TODO: PLEASE CLEAN ME @@ -6830,8 +6830,8 @@ namespace dxvk { const D3D9_VK_FORMAT_MAPPING srcFormatInfo = LookupFormat(srcDesc->Format); const D3D9_VK_FORMAT_MAPPING dstFormatInfo = LookupFormat(dstDesc->Format); - auto srcVulkanFormatInfo = imageFormatInfo(srcFormatInfo.FormatColor); - auto dstVulkanFormatInfo = imageFormatInfo(dstFormatInfo.FormatColor); + auto srcVulkanFormatInfo = lookupFormatInfo(srcFormatInfo.FormatColor); + auto dstVulkanFormatInfo = lookupFormatInfo(dstFormatInfo.FormatColor); const VkImageSubresource dstSubresource = dstTextureInfo->GetSubresourceFromIndex( diff --git a/src/d3d9/d3d9_initializer.cpp b/src/d3d9/d3d9_initializer.cpp index daf60cb0a..2695bdaf5 100644 --- a/src/d3d9/d3d9_initializer.cpp +++ b/src/d3d9/d3d9_initializer.cpp @@ -82,7 +82,7 @@ namespace dxvk { if (image == nullptr) return; - auto formatInfo = imageFormatInfo(image->info().format); + auto formatInfo = lookupFormatInfo(image->info().format); m_transferCommands += 1; @@ -119,7 +119,7 @@ namespace dxvk { if (pInitialData != nullptr) { VkExtent3D mipExtent = pTexture->GetExtentMip(m); - const DxvkFormatInfo* formatInfo = imageFormatInfo(pTexture->GetFormatMapping().FormatColor); + const DxvkFormatInfo* formatInfo = lookupFormatInfo(pTexture->GetFormatMapping().FormatColor); VkExtent3D blockCount = util::computeBlockCount(mipExtent, formatInfo->blockSize); uint32_t pitch = blockCount.width * formatInfo->elementSize; uint32_t alignedPitch = align(pitch, 4); diff --git a/src/d3d9/d3d9_swapchain.cpp b/src/d3d9/d3d9_swapchain.cpp index f2c08bc0e..41a373ef2 100644 --- a/src/d3d9/d3d9_swapchain.cpp +++ b/src/d3d9/d3d9_swapchain.cpp @@ -424,8 +424,8 @@ namespace dxvk { Rc blittedSrc = m_device->createImage( blitCreateInfo, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); - const DxvkFormatInfo* dstFormatInfo = imageFormatInfo(blittedSrc->info().format); - const DxvkFormatInfo* srcFormatInfo = imageFormatInfo(srcImage->info().format); + const DxvkFormatInfo* dstFormatInfo = lookupFormatInfo(blittedSrc->info().format); + const DxvkFormatInfo* srcFormatInfo = lookupFormatInfo(srcImage->info().format); const VkImageSubresource dstSubresource = dstTexInfo->GetSubresourceFromIndex(dstFormatInfo->aspectMask, 0); const VkImageSubresource srcSubresource = srcTexInfo->GetSubresourceFromIndex(srcFormatInfo->aspectMask, 0); @@ -467,7 +467,7 @@ namespace dxvk { srcImage = std::move(blittedSrc); } - const DxvkFormatInfo* srcFormatInfo = imageFormatInfo(srcImage->info().format); + const DxvkFormatInfo* srcFormatInfo = lookupFormatInfo(srcImage->info().format); const VkImageSubresource srcSubresource = srcTexInfo->GetSubresourceFromIndex(srcFormatInfo->aspectMask, 0); VkImageSubresourceLayers srcSubresourceLayers = { srcSubresource.aspectMask, diff --git a/src/dxvk/dxvk_buffer.h b/src/dxvk/dxvk_buffer.h index 5fc50f44b..3dbbf5b9a 100644 --- a/src/dxvk/dxvk_buffer.h +++ b/src/dxvk/dxvk_buffer.h @@ -574,7 +574,7 @@ namespace dxvk { * \returns Element count */ VkDeviceSize elementCount() const { - auto format = imageFormatInfo(m_info.format); + auto format = lookupFormatInfo(m_info.format); return m_info.rangeLength / format->elementSize; } @@ -607,7 +607,7 @@ namespace dxvk { * \returns View format info */ const DxvkFormatInfo* formatInfo() const { - return imageFormatInfo(m_info.format); + return lookupFormatInfo(m_info.format); } /** diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp index 03838d391..2fbaf92f9 100644 --- a/src/dxvk/dxvk_context.cpp +++ b/src/dxvk/dxvk_context.cpp @@ -320,7 +320,7 @@ namespace dxvk { // Query pipeline objects to use for this clear operation DxvkMetaClearPipeline pipeInfo = m_common->metaClear().getClearBufferPipeline( - imageFormatInfo(bufferView->info().format)->flags); + lookupFormatInfo(bufferView->info().format)->flags); // Create a descriptor set pointing to the view VkBufferView viewObject = bufferView->handle(); @@ -1098,8 +1098,8 @@ namespace dxvk { // Create temporary buffer for depth/stencil data VkDeviceSize pixelCount = dstExtent.width * dstExtent.height * dstSubresource.layerCount; - VkDeviceSize dataSizeD = align(pixelCount * imageFormatInfo(dataFormatD)->elementSize, 256); - VkDeviceSize dataSizeS = align(pixelCount * imageFormatInfo(dataFormatS)->elementSize, 256); + VkDeviceSize dataSizeD = align(pixelCount * lookupFormatInfo(dataFormatD)->elementSize, 256); + VkDeviceSize dataSizeS = align(pixelCount * lookupFormatInfo(dataFormatS)->elementSize, 256); DxvkBufferCreateInfo tmpBufferInfo; tmpBufferInfo.size = dataSizeD + dataSizeS; @@ -2189,7 +2189,7 @@ namespace dxvk { VkDeviceSize pitchPerRow, VkDeviceSize pitchPerLayer, VkFormat format) { - auto formatInfo = imageFormatInfo(format); + auto formatInfo = lookupFormatInfo(format); VkExtent3D extent3D; extent3D.width = imageExtent.width; @@ -3144,7 +3144,7 @@ namespace dxvk { // Query pipeline objects to use for this clear operation DxvkMetaClearPipeline pipeInfo = m_common->metaClear().getClearImagePipeline( - imageView->type(), imageFormatInfo(imageView->info().format)->flags); + imageView->type(), lookupFormatInfo(imageView->info().format)->flags); // Create a descriptor set pointing to the view VkDescriptorSet descriptorSet = m_descriptorPool->alloc(pipeInfo.dsetLayout); diff --git a/src/dxvk/dxvk_format.cpp b/src/dxvk/dxvk_format.cpp index 4ec42e6ea..cc4c4adba 100644 --- a/src/dxvk/dxvk_format.cpp +++ b/src/dxvk/dxvk_format.cpp @@ -572,7 +572,7 @@ namespace dxvk { }}; - const DxvkFormatInfo* imageFormatInfo(VkFormat format) { + const DxvkFormatInfo* lookupFormatInfo(VkFormat format) { uint32_t indexOffset = 0; for (const auto& group : g_formatGroups) { diff --git a/src/dxvk/dxvk_format.h b/src/dxvk/dxvk_format.h index 8541508e8..2554fe693 100644 --- a/src/dxvk/dxvk_format.h +++ b/src/dxvk/dxvk_format.h @@ -55,6 +55,6 @@ namespace dxvk { - const DxvkFormatInfo* imageFormatInfo(VkFormat format); + const DxvkFormatInfo* lookupFormatInfo(VkFormat format); } \ No newline at end of file diff --git a/src/dxvk/dxvk_graphics.cpp b/src/dxvk/dxvk_graphics.cpp index d8b568ac7..34ceaea09 100644 --- a/src/dxvk/dxvk_graphics.cpp +++ b/src/dxvk/dxvk_graphics.cpp @@ -191,7 +191,7 @@ namespace dxvk { if (rtColorFormats[i]) { rtInfo.colorAttachmentCount = i + 1; - auto formatInfo = imageFormatInfo(rtColorFormats[i]); + auto formatInfo = lookupFormatInfo(rtColorFormats[i]); cbAttachments[i] = state.omBlend[i].state(); if (!(fsOutputMask & (1 << i)) || !formatInfo) { @@ -222,7 +222,7 @@ namespace dxvk { VkFormat rtDepthFormat = state.rt.getDepthStencilFormat(); if (rtDepthFormat) { - auto rtDepthFormatInfo = imageFormatInfo(rtDepthFormat); + auto rtDepthFormatInfo = lookupFormatInfo(rtDepthFormat); if (rtDepthFormatInfo->aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) rtInfo.depthAttachmentFormat = rtDepthFormat; @@ -1145,7 +1145,7 @@ namespace dxvk { // Log render target and blend state auto depthFormat = state.rt.getDepthStencilFormat(); - auto depthFormatInfo = imageFormatInfo(depthFormat); + auto depthFormatInfo = lookupFormatInfo(depthFormat); VkImageAspectFlags writableAspects = depthFormat ? (depthFormatInfo->aspectMask & ~state.rt.getDepthStencilReadOnlyAspects()) diff --git a/src/dxvk/dxvk_image.h b/src/dxvk/dxvk_image.h index b3b8a58e7..314584139 100644 --- a/src/dxvk/dxvk_image.h +++ b/src/dxvk/dxvk_image.h @@ -202,7 +202,7 @@ namespace dxvk { * \returns Image format info */ const DxvkFormatInfo* formatInfo() const { - return imageFormatInfo(m_info.format); + return lookupFormatInfo(m_info.format); } /** @@ -428,7 +428,7 @@ namespace dxvk { * \returns View format info */ const DxvkFormatInfo* formatInfo() const { - return imageFormatInfo(m_info.format); + return lookupFormatInfo(m_info.format); } /** diff --git a/src/dxvk/dxvk_meta_copy.cpp b/src/dxvk/dxvk_meta_copy.cpp index b724e6331..7f7e11a29 100644 --- a/src/dxvk/dxvk_meta_copy.cpp +++ b/src/dxvk/dxvk_meta_copy.cpp @@ -299,7 +299,7 @@ namespace dxvk { VkPipeline DxvkMetaCopyObjects::createPipelineObject( const DxvkMetaCopyPipelineKey& key, VkPipelineLayout pipelineLayout) { - auto aspect = imageFormatInfo(key.format)->aspectMask; + auto aspect = lookupFormatInfo(key.format)->aspectMask; std::array stages; uint32_t stageCount = 0; diff --git a/src/dxvk/dxvk_meta_resolve.cpp b/src/dxvk/dxvk_meta_resolve.cpp index 9eb9ea108..b71b686bc 100644 --- a/src/dxvk/dxvk_meta_resolve.cpp +++ b/src/dxvk/dxvk_meta_resolve.cpp @@ -23,7 +23,7 @@ namespace dxvk { VkFormat format) : m_vkd(vkd) { VkImageViewUsageCreateInfo usageInfo = { VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO }; - usageInfo.usage = (imageFormatInfo(format)->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) + usageInfo.usage = (lookupFormatInfo(format)->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) ? VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT : VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; @@ -207,7 +207,7 @@ namespace dxvk { VkPipeline DxvkMetaResolveObjects::createPipelineObject( const DxvkMetaResolvePipelineKey& key, VkPipelineLayout pipelineLayout) { - auto formatInfo = imageFormatInfo(key.format); + auto formatInfo = lookupFormatInfo(key.format); std::array stages; uint32_t stageCount = 0; diff --git a/src/dxvk/dxvk_state_cache_types.h b/src/dxvk/dxvk_state_cache_types.h index 71577b1af..aa5d6848f 100644 --- a/src/dxvk/dxvk_state_cache_types.h +++ b/src/dxvk/dxvk_state_cache_types.h @@ -108,7 +108,7 @@ namespace dxvk { DxvkRtInfo convert() const { VkImageAspectFlags readOnlyAspects = 0; - auto depthFormatInfo = imageFormatInfo(depth.format); + auto depthFormatInfo = lookupFormatInfo(depth.format); if (depth.format && depthFormatInfo) { readOnlyAspects = depthFormatInfo->aspectMask diff --git a/src/dxvk/dxvk_util.cpp b/src/dxvk/dxvk_util.cpp index 508686967..ba689c5ca 100644 --- a/src/dxvk/dxvk_util.cpp +++ b/src/dxvk/dxvk_util.cpp @@ -144,7 +144,7 @@ namespace dxvk::util { VkDeviceSize computeImageDataSize(VkFormat format, VkExtent3D extent) { - const DxvkFormatInfo* formatInfo = imageFormatInfo(format); + const DxvkFormatInfo* formatInfo = lookupFormatInfo(format); VkDeviceSize size = 0; diff --git a/src/dxvk/dxvk_util.h b/src/dxvk/dxvk_util.h index 181e448db..cf26e9c5b 100644 --- a/src/dxvk/dxvk_util.h +++ b/src/dxvk/dxvk_util.h @@ -174,7 +174,7 @@ namespace dxvk::util { */ inline VkExtent3D computeMipLevelExtent(VkExtent3D size, uint32_t level, VkFormat format, VkImageAspectFlags aspect) { if (unlikely(!(aspect & (VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)))) { - auto plane = &imageFormatInfo(format)->planes[vk::getPlaneIndex(aspect)]; + auto plane = &lookupFormatInfo(format)->planes[vk::getPlaneIndex(aspect)]; size.width /= plane->blockSize.width; size.height /= plane->blockSize.height; } diff --git a/src/dxvk/hud/dxvk_hud.cpp b/src/dxvk/hud/dxvk_hud.cpp index f5e725044..892d5d431 100644 --- a/src/dxvk/hud/dxvk_hud.cpp +++ b/src/dxvk/hud/dxvk_hud.cpp @@ -79,7 +79,7 @@ namespace dxvk::hud { const Rc& ctx, VkSurfaceFormatKHR surfaceFormat, VkExtent2D surfaceSize) { - bool isSrgb = imageFormatInfo(surfaceFormat.format)->flags.test(DxvkFormatFlag::ColorSpaceSrgb); + bool isSrgb = lookupFormatInfo(surfaceFormat.format)->flags.test(DxvkFormatFlag::ColorSpaceSrgb); VkViewport viewport; viewport.x = 0.0f; diff --git a/src/vulkan/vulkan_presenter.cpp b/src/vulkan/vulkan_presenter.cpp index b02869e36..17e1067a3 100644 --- a/src/vulkan/vulkan_presenter.cpp +++ b/src/vulkan/vulkan_presenter.cpp @@ -378,10 +378,10 @@ namespace dxvk::vk { // If that didn't work, we'll fall back to a format // which has similar properties to the preferred one - DxvkFormatFlags prefFlags = imageFormatInfo(pDesired[0].format)->flags; + DxvkFormatFlags prefFlags = lookupFormatInfo(pDesired[0].format)->flags; for (uint32_t j = 0; j < numSupported; j++) { - auto currFlags = imageFormatInfo(pSupported[j].format)->flags; + auto currFlags = lookupFormatInfo(pSupported[j].format)->flags; if ((currFlags & DxvkFormatFlag::ColorSpaceSrgb) == (prefFlags & DxvkFormatFlag::ColorSpaceSrgb))