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

Added region-based APIs for uint and int

Browse Source 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
This commit is contained in:
Chris Galvan
2022-01-13 11:38:16 -06:00
parent 1ed81ae973
commit 2048d8c05c
2 changed files with 109 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Image/StreamingImageAsset.h
+9
View File
@@ -92,6 +92,12 @@ namespace AZ
//! Retrieve a region of image pixel values (float) for specified mip and slice
void GetSubImagePixelValues(AZStd::pair<uint32_t, uint32_t> topLeft, AZStd::pair<uint32_t, uint32_t> bottomRight, AZStd::array_view<float> outValues, uint32_t componentIndex = 0, uint32_t mip = 0, uint32_t slice = 0);
//! Retrieve a region of image pixel values (uint) for specified mip and slice
void GetSubImagePixelValues(AZStd::pair<uint32_t, uint32_t> topLeft, AZStd::pair<uint32_t, uint32_t> bottomRight, AZStd::array_view<AZ::u32> outValues, uint32_t componentIndex = 0, uint32_t mip = 0, uint32_t slice = 0);
//! Retrieve a region of image pixel values (int) for specified mip and slice
void GetSubImagePixelValues(AZStd::pair<uint32_t, uint32_t> topLeft, AZStd::pair<uint32_t, uint32_t> bottomRight, AZStd::array_view<AZ::s32> outValues, uint32_t componentIndex = 0, uint32_t mip = 0, uint32_t slice = 0);
//! Returns streaming image pool asset id of the pool that will be used to create the streaming image.
const Data::AssetId& GetPoolAssetId() const;
@@ -134,6 +140,9 @@ namespace AZ
uint32_t m_totalImageDataSize = 0;
StreamingImageFlags m_flags = StreamingImageFlags::None;
template<typename T>
T GetSubImagePixelValueInternal(uint32_t x, uint32_t y, uint32_t componentIndex = 0, uint32_t mip = 0, uint32_t slice = 0);
};
}
}
Gems/Atom/RPI/Code/Source/RPI.Reflect/Image/StreamingImageAsset.cpp
+100 -25
View File
@@ -45,6 +45,12 @@ namespace AZ
return 0;
}
template <>
AZ::s32 RetrieveIntValue<AZ::RHI::Format::Unknown>([[maybe_unused]] const AZ::u8* mem, [[maybe_unused]] size_t index)
{
return 0;
}
template <>
AZ::u32 RetrieveUintValue<AZ::RHI::Format::R8_UNORM>(const AZ::u8* mem, size_t index)
{
@@ -56,19 +62,27 @@ namespace AZ
{
// 16 bits per channel
auto actualMem = reinterpret_cast<const AZ::u16*>(mem);
actualMem += index;
return *actualMem / static_cast<AZ::u32>(std::numeric_limits<AZ::u16>::max());
return actualMem[index] / static_cast<AZ::u32>(std::numeric_limits<AZ::u16>::max());
}
template <>
AZ::u32 RetrieveUintValue<AZ::RHI::Format::R32_UINT>(const AZ::u8* mem, size_t index)
AZ::s32 RetrieveIntValue<AZ::RHI::Format::R16_SINT>(const AZ::u8* mem, size_t index)
{
// 16 bits per channel
auto actualMem = reinterpret_cast<const AZ::s16*>(mem);
return actualMem[index] / static_cast<AZ::s32>(std::numeric_limits<AZ::s16>::max());
}
template <>
float RetrieveFloatValue<AZ::RHI::Format::R32_UINT>(const AZ::u8* mem, size_t index)
{
// 32 bits per channel
auto actualMem = reinterpret_cast<const AZ::u32*>(mem);
auto actualMem = reinterpret_cast<const float*>(mem);
actualMem += index;
return *actualMem / static_cast<AZ::u32>(std::numeric_limits<AZ::u32>::max());
return *actualMem;
}
template <>
@@ -85,6 +99,8 @@ namespace AZ
{
switch (format)
{
case AZ::RHI::Format::R32_UINT:
return RetrieveFloatValue<AZ::RHI::Format::R32_UINT>(mem, index);
case AZ::RHI::Format::R32_FLOAT:
return RetrieveFloatValue<AZ::RHI::Format::R32_FLOAT>(mem, index);
default:
@@ -100,12 +116,21 @@ namespace AZ
return RetrieveUintValue<AZ::RHI::Format::R8_UNORM>(mem, index);
case AZ::RHI::Format::R16_UNORM:
return RetrieveUintValue<AZ::RHI::Format::R16_UNORM>(mem, index);
case AZ::RHI::Format::R32_UINT:
return RetrieveUintValue<AZ::RHI::Format::R32_UINT>(mem, index);
default:
return RetrieveUintValue<AZ::RHI::Format::Unknown>(mem, index);
}
}
AZ::s32 RetrieveIntValue(const AZ::u8* mem, size_t index, AZ::RHI::Format format)
{
switch (format)
{
case AZ::RHI::Format::R16_SINT:
return RetrieveIntValue<AZ::RHI::Format::R16_SINT>(mem, index);
default:
return RetrieveIntValue<AZ::RHI::Format::Unknown>(mem, index);
}
}
}
namespace RPI
@@ -220,10 +245,10 @@ namespace AZ
return mipChainAsset->GetSubImageData(mip - mipChain.m_mipOffset, slice);
}
template<>
float StreamingImageAsset::GetSubImagePixelValue<float>(uint32_t x, uint32_t y, uint32_t componentIndex, uint32_t mip, uint32_t slice)
template<typename T>
T StreamingImageAsset::GetSubImagePixelValueInternal(uint32_t x, uint32_t y, uint32_t componentIndex, uint32_t mip, uint32_t slice)
{
AZStd::vector<float> values;
AZStd::vector<T> values;
auto position = AZStd::make_pair(x, y);
GetSubImagePixelValues(position, position, values, componentIndex, mip, slice);
@@ -233,27 +258,25 @@ namespace AZ
return values[0];
}
return 0.0f;
return aznumeric_cast<T>(0);
}
template<>
float StreamingImageAsset::GetSubImagePixelValue<float>(uint32_t x, uint32_t y, uint32_t componentIndex, uint32_t mip, uint32_t slice)
{
return GetSubImagePixelValueInternal<float>(x, y, componentIndex, mip, slice);
}
template<>
AZ::u32 StreamingImageAsset::GetSubImagePixelValue<AZ::u32>(uint32_t x, uint32_t y, uint32_t componentIndex, uint32_t mip, uint32_t slice)
{
// TODO: Use the component index
(void)componentIndex;
return GetSubImagePixelValueInternal<AZ::u32>(x, y, componentIndex, mip, slice);
}
auto imageData = GetSubImageData(mip, slice);
if (!imageData.empty())
{
const AZ::RHI::ImageDescriptor imageDescriptor = GetImageDescriptor();
auto width = imageDescriptor.m_size.m_width;
size_t index = (y * width) + x;
return Internal::RetrieveUintValue(imageData.data(), index, imageDescriptor.m_format);
}
return 0;
template<>
AZ::s32 StreamingImageAsset::GetSubImagePixelValue<AZ::s32>(uint32_t x, uint32_t y, uint32_t componentIndex, uint32_t mip, uint32_t slice)
{
return GetSubImagePixelValueInternal<AZ::s32>(x, y, componentIndex, mip, slice);
}
void StreamingImageAsset::GetSubImagePixelValues(AZStd::pair<uint32_t, uint32_t> topLeft, AZStd::pair<uint32_t, uint32_t> bottomRight, AZStd::array_view<float> outValues, uint32_t componentIndex, uint32_t mip, uint32_t slice)
@@ -281,5 +304,57 @@ namespace AZ
}
}
}
void StreamingImageAsset::GetSubImagePixelValues(AZStd::pair<uint32_t, uint32_t> topLeft, AZStd::pair<uint32_t, uint32_t> bottomRight, AZStd::array_view<AZ::u32> outValues, uint32_t componentIndex, uint32_t mip, uint32_t slice)
{
// TODO: Use the component index
(void)componentIndex;
auto imageData = GetSubImageData(mip, slice);
if (!imageData.empty())
{
const AZ::RHI::ImageDescriptor imageDescriptor = GetImageDescriptor();
auto width = imageDescriptor.m_size.m_width;
size_t outValuesIndex = 0;
for (uint32_t x = topLeft.first; x < bottomRight.first; ++x)
{
for (uint32_t y = topLeft.second; y < bottomRight.second; ++y)
{
size_t imageDataIndex = (y * width) + x;
auto& outValue = const_cast<AZ::u32&>(outValues[outValuesIndex++]);
outValue = Internal::RetrieveUintValue(imageData.data(), imageDataIndex, imageDescriptor.m_format);
}
}
}
}
void StreamingImageAsset::GetSubImagePixelValues(AZStd::pair<uint32_t, uint32_t> topLeft, AZStd::pair<uint32_t, uint32_t> bottomRight, AZStd::array_view<AZ::s32> outValues, uint32_t componentIndex, uint32_t mip, uint32_t slice)
{
// TODO: Use the component index
(void)componentIndex;
auto imageData = GetSubImageData(mip, slice);
if (!imageData.empty())
{
const AZ::RHI::ImageDescriptor imageDescriptor = GetImageDescriptor();
auto width = imageDescriptor.m_size.m_width;
size_t outValuesIndex = 0;
for (uint32_t x = topLeft.first; x < bottomRight.first; ++x)
{
for (uint32_t y = topLeft.second; y < bottomRight.second; ++y)
{
size_t imageDataIndex = (y * width) + x;
auto& outValue = const_cast<AZ::s32&>(outValues[outValuesIndex++]);
outValue = Internal::RetrieveIntValue(imageData.data(), imageDataIndex, imageDescriptor.m_format);
}
}
}
}
}
}