From aa9470880f6babf6aa3fdab341e4e1d3a5b83edc Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Tue, 11 Jul 2023 11:56:00 -0400 Subject: [PATCH] LibGfx/DDS: Prefer `static constexpr Array` over `Vector` --- Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp index 7f70079ebf..d6714661d6 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp @@ -399,7 +399,7 @@ static ErrorOr decode_dxt(Stream& stream, DDSLoadingContext& context, u64 } static ErrorOr decode_bitmap(Stream& stream, DDSLoadingContext& context, u64 width, u64 height) { - Vector 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)) { for (u64 y = 0; y < height; y += 4) { TRY(decode_dxt(stream, context, width, y)); @@ -458,7 +458,7 @@ static ErrorOr decode_header(DDSLoadingContext& context) context.format = get_format(context.header.pixel_format); - Vector 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)) { dbgln_if(DDS_DEBUG, "Format of type {} is not supported at the moment", to_underlying(context.format)); context.state = DDSLoadingContext::State::Error;