From 4fd3af995ea062880d1cb4e717e73dbcb1ac83af Mon Sep 17 00:00:00 2001 From: squidbus <175574877+squidbus@users.noreply.github.com> Date: Mon, 15 Jul 2024 03:14:42 -0700 Subject: [PATCH] Change format list from vector to array/span. --- src/video_core/renderer_vulkan/liverpool_to_vk.cpp | 4 ++-- src/video_core/renderer_vulkan/liverpool_to_vk.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp index 7adeebdc..754e417c 100644 --- a/src/video_core/renderer_vulkan/liverpool_to_vk.cpp +++ b/src/video_core/renderer_vulkan/liverpool_to_vk.cpp @@ -281,8 +281,8 @@ vk::BorderColor BorderColor(AmdGpu::BorderColor color) { } } -const std::vector& GetAllFormats() { - static const std::vector formats{ +std::span GetAllFormats() { + static constexpr std::array formats{ vk::Format::eR32G32B32A32Sfloat, vk::Format::eR32G32B32Uint, vk::Format::eR8G8B8A8Unorm, diff --git a/src/video_core/renderer_vulkan/liverpool_to_vk.h b/src/video_core/renderer_vulkan/liverpool_to_vk.h index dbdaf088..94f9073d 100644 --- a/src/video_core/renderer_vulkan/liverpool_to_vk.h +++ b/src/video_core/renderer_vulkan/liverpool_to_vk.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include "video_core/amdgpu/liverpool.h" #include "video_core/amdgpu/pixel_format.h" #include "video_core/amdgpu/resource.h" @@ -39,7 +39,7 @@ vk::SamplerMipmapMode MipFilter(AmdGpu::MipFilter filter); vk::BorderColor BorderColor(AmdGpu::BorderColor color); -const std::vector& GetAllFormats(); +std::span GetAllFormats(); vk::Format SurfaceFormat(AmdGpu::DataFormat data_format, AmdGpu::NumberFormat num_format);