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

Account for the pixel size when computing the image data index

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2022-01-20 16:10:42 -06:00
parent cdcf8defd0
commit c090ad6a56
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAsset.cpp
+6 -3
View File
@@ -376,13 +376,14 @@ namespace AZ
{
const AZ::RHI::ImageDescriptor imageDescriptor = GetImageDescriptor();
auto width = imageDescriptor.m_size.m_width;
const uint32_t pixelSize = AZ::RHI::GetFormatSize(imageDescriptor.m_format);
size_t outValuesIndex = 0;
for (uint32_t y = topLeft.second; y <= bottomRight.second; ++y)
{
for (uint32_t x = topLeft.first; x <= bottomRight.first; ++x)
{
size_t imageDataIndex = (y * width) + x;
size_t imageDataIndex = (y * width * pixelSize) + (x * pixelSize);
auto& outValue = const_cast<float&>(outValues[outValuesIndex++]);
outValue = Internal::RetrieveFloatValue(imageData.data(), imageDataIndex, imageDescriptor.m_format);
@@ -402,13 +403,14 @@ namespace AZ
{
const AZ::RHI::ImageDescriptor imageDescriptor = GetImageDescriptor();
auto width = imageDescriptor.m_size.m_width;
const uint32_t pixelSize = AZ::RHI::GetFormatSize(imageDescriptor.m_format);
size_t outValuesIndex = 0;
for (uint32_t y = topLeft.second; y <= bottomRight.second; ++y)
{
for (uint32_t x = topLeft.first; x <= bottomRight.first; ++x)
{
size_t imageDataIndex = (y * width) + x;
size_t imageDataIndex = (y * width * pixelSize) + (x * pixelSize);
auto& outValue = const_cast<AZ::u32&>(outValues[outValuesIndex++]);
outValue = Internal::RetrieveUintValue(imageData.data(), imageDataIndex, imageDescriptor.m_format);
@@ -428,13 +430,14 @@ namespace AZ
{
const AZ::RHI::ImageDescriptor imageDescriptor = GetImageDescriptor();
auto width = imageDescriptor.m_size.m_width;
const uint32_t pixelSize = AZ::RHI::GetFormatSize(imageDescriptor.m_format);
size_t outValuesIndex = 0;
for (uint32_t y = topLeft.second; y <= bottomRight.second; ++y)
{
for (uint32_t x = topLeft.first; x <= bottomRight.first; ++x)
{
size_t imageDataIndex = (y * width) + x;
size_t imageDataIndex = (y * width * pixelSize) + (x * pixelSize);
auto& outValue = const_cast<AZ::s32&>(outValues[outValuesIndex++]);
outValue = Internal::RetrieveIntValue(imageData.data(), imageDataIndex, imageDescriptor.m_format);