birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed some variables

Browse Source
This commit is contained in:
moudgils
2021-05-13 14:00:44 -07:00
parent ccfb232e93
commit 3a5ca1503a
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/ImageSubresource.h
+2 -2
View File
@@ -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;
};
Gems/Atom/RHI/Code/Source/RHI.Reflect/ImageSubresource.cpp
+8 -8
View File
@@ -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)
{
Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp
+1 -1
View File
@@ -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.
Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h
+1 -1
View File
@@ -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());
Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp
+1 -1
View File
@@ -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<uint32_t>(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.
Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp
+1 -1
View File
@@ -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<uint32_t>(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.