| 1 | Patch-Source: https://github.com/Warzone2100/warzone2100/pull/4918
|
| 2 |
|
| 3 | From 8701c62ae68ca70da43ec915cbf6776c492e6656 Mon Sep 17 00:00:00 2001
|
| 4 | From: Dmitry Marakasov <[email protected]>
|
| 5 | Date: Tue, 12 May 2026 22:55:00 +0300
|
| 6 | Subject: [PATCH] Replace deprecated vulkan enum value
|
| 7 | MIME-Version: 1.0
|
| 8 | Content-Type: text/plain; charset=UTF-8
|
| 9 | Content-Transfer-Encoding: 8bit
|
| 10 |
|
| 11 | Replace `eVkColorspaceSrgbNonlinear` with `eSrgbNonlinear`, as the
|
| 12 | former was removed in vulkan 1.4.350, and was a legacy alias to the latter
|
| 13 | (more precisely, `eSrgbNonlinear` → `VK_COLORSPACE_SRGB_NONLINEAR_KHR` →
|
| 14 | [legacy alias to] `VK_COLOR_SPACE_SRGB_NONLINEAR_KHR` ← `eSrgbNonlinear`).
|
| 15 | ---
|
| 16 | lib/ivis_opengl/gfx_api_vk.cpp | 10 +++++-----
|
| 17 | 1 file changed, 5 insertions(+), 5 deletions(-)
|
| 18 |
|
| 19 | diff --git a/lib/ivis_opengl/gfx_api_vk.cpp b/lib/ivis_opengl/gfx_api_vk.cpp
|
| 20 | index f137f4965..dcedf473d 100644
|
| 21 | |
| 22 | |
| 23 | @@ -4255,10 +4255,10 @@ void VkRoot::createNewSwapchainAndSwapchainSpecificStuff(const vk::Result& reaso
|
| 24 | vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormatKHR>& availableFormats)
|
| 25 | {
|
| 26 | const auto desiredFormats = std::array<vk::SurfaceFormatKHR, 4> {
|
| 27 | - vk::SurfaceFormatKHR{ vk::Format::eA2B10G10R10UnormPack32, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear },
|
| 28 | - vk::SurfaceFormatKHR{ vk::Format::eA2R10G10B10UnormPack32, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear },
|
| 29 | - vk::SurfaceFormatKHR{ vk::Format::eB8G8R8A8Unorm, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear },
|
| 30 | - vk::SurfaceFormatKHR{ vk::Format::eR8G8B8A8Unorm, vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear }
|
| 31 | + vk::SurfaceFormatKHR{ vk::Format::eA2B10G10R10UnormPack32, vk::ColorSpaceKHR::eSrgbNonlinear },
|
| 32 | + vk::SurfaceFormatKHR{ vk::Format::eA2R10G10B10UnormPack32, vk::ColorSpaceKHR::eSrgbNonlinear },
|
| 33 | + vk::SurfaceFormatKHR{ vk::Format::eB8G8R8A8Unorm, vk::ColorSpaceKHR::eSrgbNonlinear },
|
| 34 | + vk::SurfaceFormatKHR{ vk::Format::eR8G8B8A8Unorm, vk::ColorSpaceKHR::eSrgbNonlinear }
|
| 35 | };
|
| 36 |
|
| 37 | if(availableFormats.size() == 1
|
| 38 | @@ -4266,7 +4266,7 @@ vk::SurfaceFormatKHR chooseSwapSurfaceFormat(const std::vector<vk::SurfaceFormat
|
| 39 | {
|
| 40 | // don't appear to be any preferred formats, so create one
|
| 41 | vk::SurfaceFormatKHR format;
|
| 42 | - format.colorSpace = vk::ColorSpaceKHR::eVkColorspaceSrgbNonlinear;
|
| 43 | + format.colorSpace = vk::ColorSpaceKHR::eSrgbNonlinear;
|
| 44 | format.format = vk::Format::eB8G8R8A8Unorm;
|
| 45 | return format;
|
| 46 | }
|
| 47 | --
|
| 48 | 2.55.0
|
| 49 |
|