From 3a5ca1503af0abff16b5065beca4fedb08f763c1 Mon Sep 17 00:00:00 2001 From: moudgils Date: Thu, 13 May 2021 14:00:44 -0700 Subject: [PATCH] Renamed some variables --- .../Include/Atom/RHI.Reflect/ImageSubresource.h | 4 ++-- .../Code/Source/RHI.Reflect/ImageSubresource.cpp | 16 ++++++++-------- .../DX12/Code/Source/RHI/AsyncUploadQueue.cpp | 2 +- Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h | 2 +- .../Metal/Code/Source/RHI/AsyncUploadQueue.cpp | 2 +- .../Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageSubresource.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageSubresource.h index d81ffc006c..e75ee4d4bf 100644 --- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageSubresource.h +++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageSubresource.h @@ -118,10 +118,10 @@ namespace AZ uint32_t m_bytesPerImage = 0; /// The number of blocks in width based on the texture fomat - uint32_t m_numBlocksWidth = 1; + uint32_t m_blockElementWidth = 1; /// The number of blocks in height based on the texture fomat - uint32_t m_numBlocksHeight = 1; + uint32_t m_blockElementHeight = 1; }; diff --git a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageSubresource.cpp b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageSubresource.cpp index a956a13d1b..a92c0c1502 100644 --- a/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageSubresource.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageSubresource.cpp @@ -107,8 +107,8 @@ namespace AZ ->Field("m_rowCount", &ImageSubresourceLayout::m_rowCount) ->Field("m_bytesPerRow", &ImageSubresourceLayout::m_bytesPerRow) ->Field("m_bytesPerImage", &ImageSubresourceLayout::m_bytesPerImage) - ->Field("m_numBlocksWidth", &ImageSubresourceLayout::m_numBlocksWidth) - ->Field("m_numBlocksHeight", &ImageSubresourceLayout::m_numBlocksHeight) + ->Field("m_blockElementWidth", &ImageSubresourceLayout::m_blockElementWidth) + ->Field("m_blockElementHeight", &ImageSubresourceLayout::m_blockElementHeight) ; } } @@ -118,14 +118,14 @@ namespace AZ uint32_t rowCount, uint32_t bytesPerRow, uint32_t bytesPerImage, - uint32_t numBlocksWidth, - uint32_t numBlocksHeight) + uint32_t blockElementWidth, + uint32_t blockElementHeight) : m_size{size} , m_rowCount{rowCount} , m_bytesPerRow{bytesPerRow} , m_bytesPerImage{bytesPerImage} - , m_numBlocksWidth{numBlocksWidth} - , m_numBlocksHeight{numBlocksHeight} + , m_blockElementWidth{blockElementWidth} + , m_blockElementHeight{blockElementHeight} {} ImageSubresourceLayoutPlaced::ImageSubresourceLayoutPlaced(const ImageSubresourceLayout& subresourceLayout, size_t offset) @@ -322,8 +322,8 @@ namespace AZ subresourceLayout.m_rowCount = numBlocksHigh; subresourceLayout.m_size.m_width = imageSize.m_width; subresourceLayout.m_size.m_height = imageSize.m_height; - subresourceLayout.m_numBlocksWidth = numBlocks; - subresourceLayout.m_numBlocksHeight = numBlocks; + subresourceLayout.m_blockElementWidth = numBlocks; + subresourceLayout.m_blockElementHeight = numBlocks; } else if (isPacked) { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp index ec18b985ff..e7bb4f69fe 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp @@ -267,7 +267,7 @@ namespace AZ // Staging sizes uint32_t stagingRowPitch = RHI::AlignUp(subresourceLayout.m_bytesPerRow, DX12_TEXTURE_DATA_PITCH_ALIGNMENT); uint32_t stagingSlicePitch = RHI::AlignUp(subresourceLayout.m_rowCount*stagingRowPitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); - const uint32_t compressedTexelBlockSizeHeight = subresourceLayout.m_numBlocksHeight; + const uint32_t compressedTexelBlockSizeHeight = subresourceLayout.m_blockElementHeight; // ImageHeight must be bigger than or equal to the Image's row count. Images with a RowCount that is less than the ImageHeight indicates a block compression. // Images with a RowCount which is higher than the ImageHeight indicates a planar image, which is not supported for streaming images. diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h index c7a2a5dd64..a6fe57f6d8 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h @@ -415,7 +415,7 @@ namespace AZ // this assert typically happens when a shader needs a particular Srg (e.g., the ViewSrg) but the code did not bind it, // check the pass code in this callstack to determine why it was not bound - AZ_Assert(false, "ShaderResourceGroup in slot '%d' is null at DrawItem submit time. This is not valid and means the shader is expecting an Srg that is not currently bound in the pipeline. Current bindings: %s", + AZ_Assert(false, "ShaderResourceGroup in slot '%d' is null at DrawItem submit time. This is not valid and means the shader is expecting an Srg that isF not currently bound in the pipeline. Current bindings: %s", srgSlot, slotSrgString.c_str()); diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp index d9a8f8aa3b..594a4931b9 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp @@ -190,7 +190,7 @@ namespace AZ const uint32_t stagingRowPitch = RHI::AlignUp(subresourceLayout.m_bytesPerRow, bufferOffsetAlign); const uint32_t stagingSlicePitch = RHI::AlignUp(subresourceLayout.m_rowCount * stagingRowPitch, bufferOffsetAlign); const uint32_t rowsPerSplit = static_cast(m_descriptor.m_stagingSizeInBytes) / stagingRowPitch; - const uint32_t compressedTexelBlockSizeHeight = subresourceLayout.m_numBlocksHeight; + const uint32_t compressedTexelBlockSizeHeight = subresourceLayout.m_blockElementHeight; // ImageHeight must be bigger than or equal to the Image's row count. Images with a RowCount that is less than the ImageHeight indicates a block compression. // Images with a RowCount which is higher than the ImageHeight indicates a planar image, which is not supported for streaming images. diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp index 6b16110c12..ed578f18c5 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp @@ -214,7 +214,7 @@ namespace AZ const uint32_t stagingRowPitch = RHI::AlignUp(subresourceLayout.m_bytesPerRow, bufferOffsetAlign); const uint32_t stagingSlicePitch = subresourceLayout.m_rowCount * stagingRowPitch; const uint32_t rowsPerSplit = static_cast(m_descriptor.m_stagingSizeInBytes) / stagingRowPitch; - const uint32_t compressedTexelBlockSizeHeight = subresourceLayout.m_numBlocksHeight; + const uint32_t compressedTexelBlockSizeHeight = subresourceLayout.m_blockElementHeight; // ImageHeight must be bigger than or equal to the Image's row count. Images with a RowCount that is less than the ImageHeight indicates a block compression. // Images with a RowCount which is higher than the ImageHeight indicates a planar image, which is not supported for streaming images.