RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 15:42:44 +00:00
Code Issues Activity Actions

LibGfx/DDS: Prefer static constexpr Array over Vector<u32>

Browse source
This commit is contained in:
Lucas CHOLLET 2023-07-11 11:56:00 -04:00 • committed by Sam Atkins
parent 742897519d
commit aa9470880f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp
View file

@ -399,7 +399,7 @@ static ErrorOr<void> decode_dxt(Stream& stream, DDSLoadingContext& context, u64
} }
static ErrorOr<void> decode_bitmap(Stream& stream, DDSLoadingContext& context, u64 width, u64 height) static ErrorOr<void> decode_bitmap(Stream& stream, DDSLoadingContext& context, u64 width, u64 height)
{ {
Vector<u32> dxt_formats = { DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC3_UNORM }; static constexpr Array dxt_formats = { DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC3_UNORM };
if (dxt_formats.contains_slow(context.format)) { if (dxt_formats.contains_slow(context.format)) {
for (u64 y = 0; y < height; y += 4) { for (u64 y = 0; y < height; y += 4) {
TRY(decode_dxt(stream, context, width, y)); TRY(decode_dxt(stream, context, width, y));
@ -458,7 +458,7 @@ static ErrorOr<void> decode_header(DDSLoadingContext& context)
context.format = get_format(context.header.pixel_format); context.format = get_format(context.header.pixel_format);
Vector<u32> supported_formats = { DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC3_UNORM }; static constexpr Array supported_formats = { DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC2_UNORM, DXGI_FORMAT_BC3_UNORM };
if (!supported_formats.contains_slow(context.format)) { if (!supported_formats.contains_slow(context.format)) {
dbgln_if(DDS_DEBUG, "Format of type {} is not supported at the moment", to_underlying(context.format)); dbgln_if(DDS_DEBUG, "Format of type {} is not supported at the moment", to_underlying(context.format));
context.state = DDSLoadingContext::State::Error; context.state = DDSLoadingContext::State::Error;