[gl, vk] Corroborating new helpers order

src/video_core/renderer_vulkan/vk_compute_pipeline.cpp

@@ -18,6 +18,7 @@
 #include "video_core/renderer_vulkan/vk_scheduler.h"
 #include "video_core/renderer_vulkan/vk_update_descriptor.h"
 #include "video_core/shader_notify.h"
+#include "video_core/surface.h"
 #include "video_core/vulkan_common/vulkan_device.h"
 #include "video_core/vulkan_common/vulkan_wrapper.h"
 #include <optional>
@@ -27,23 +28,11 @@ namespace Vulkan {
 using Shader::ImageBufferDescriptor;
 using Shader::Backend::SPIRV::RESCALING_LAYOUT_WORDS_OFFSET;
 using Tegra::Texture::TexturePair;
+using VideoCore::Surface::PixelFormat;
+using VideoCore::Surface::PixelFormatNumeric;
 
-ComputePipeline::ComputePipeline(const Device& device_, vk::PipelineCache& pipeline_cache_,
-                                 DescriptorPool& descriptor_pool,
-                                 GuestDescriptorQueue& guest_descriptor_queue_,
-                                 Common::ThreadWorker* thread_worker,
-                                 PipelineStatistics* pipeline_statistics,
-                                 VideoCore::ShaderNotify* shader_notify, const Shader::Info& info_,
-                                 vk::ShaderModule spv_module_)
-    : device{device_},
-      pipeline_cache(pipeline_cache_), guest_descriptor_queue{guest_descriptor_queue_}, info{info_},
-      spv_module(std::move(spv_module_)) {
-    if (shader_notify) {
-        shader_notify->MarkShaderBuilding();
-    }
-    std::optional<VideoCore::Surface::PixelFormatNumeric>
-    NumericFromComponentType(Shader::SamplerComponentType component_type) {
-        using VideoCore::Surface::PixelFormatNumeric;
+std::optional<PixelFormatNumeric> NumericFromComponentType(
+    Shader::SamplerComponentType component_type) {
     switch (component_type) {
     case Shader::SamplerComponentType::Float:
         return PixelFormatNumeric::Float;
@@ -54,10 +43,10 @@ ComputePipeline::ComputePipeline(const Device& device_, vk::PipelineCache& pipel
     default:
         return std::nullopt;
     }
-    }
+}
 
-    VideoCore::Surface::PixelFormat ResolveTexelBufferFormat(
-        VideoCore::Surface::PixelFormat format, Shader::SamplerComponentType component_type) {
+PixelFormat ResolveTexelBufferFormat(PixelFormat format,
+                                     Shader::SamplerComponentType component_type) {
     const auto desired_numeric = NumericFromComponentType(component_type);
     if (!desired_numeric) {
         return format;
@@ -66,13 +55,25 @@ ComputePipeline::ComputePipeline(const Device& device_, vk::PipelineCache& pipel
     if (*desired_numeric == current_numeric) {
         return format;
     }
-        if (const auto variant =
-                VideoCore::Surface::FindPixelFormatVariant(format, *desired_numeric)) {
+    if (const auto variant = VideoCore::Surface::FindPixelFormatVariant(format, *desired_numeric)) {
         return *variant;
     }
     return format;
-    }
+}
 
+ComputePipeline::ComputePipeline(const Device& device_, vk::PipelineCache& pipeline_cache_,
+                                 DescriptorPool& descriptor_pool,
+                                 GuestDescriptorQueue& guest_descriptor_queue_,
+                                 Common::ThreadWorker* thread_worker,
+                                 PipelineStatistics* pipeline_statistics,
+                                 VideoCore::ShaderNotify* shader_notify, const Shader::Info& info_,
+                                 vk::ShaderModule spv_module_)
+    : device{device_},
+      pipeline_cache(pipeline_cache_), guest_descriptor_queue{guest_descriptor_queue_}, info{info_},
+      spv_module(std::move(spv_module_)) {
+    if (shader_notify) {
+        shader_notify->MarkShaderBuilding();
+    }
     std::copy_n(info.constant_buffer_used_sizes.begin(), uniform_buffer_sizes.size(),
                 uniform_buffer_sizes.begin());
 

src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp

@@ -29,6 +29,7 @@
 #include "video_core/shader_notify.h"
 #include "video_core/texture_cache/samples_helper.h"
 #include "video_core/texture_cache/texture_cache.h"
+#include "video_core/surface.h"
 #include "video_core/vulkan_common/vulkan_device.h"
 
 #if defined(_MSC_VER) && defined(NDEBUG)
@@ -49,25 +50,13 @@ using Tegra::Texture::TexturePair;
 using VideoCore::Surface::PixelFormat;
 using VideoCore::Surface::PixelFormatFromDepthFormat;
 using VideoCore::Surface::PixelFormatFromRenderTargetFormat;
+using VideoCore::Surface::PixelFormatNumeric;
 
 constexpr size_t NUM_STAGES = Maxwell::MaxShaderStage;
 constexpr size_t MAX_IMAGE_ELEMENTS = 64;
 
-DescriptorLayoutBuilder MakeBuilder(const Device& device, std::span<const Shader::Info> infos) {
-    DescriptorLayoutBuilder builder{device};
-    for (size_t index = 0; index < infos.size(); ++index) {
-        static constexpr std::array stages{
-            VK_SHADER_STAGE_VERTEX_BIT,
-            VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT,
-            VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT,
-            VK_SHADER_STAGE_GEOMETRY_BIT,
-            VK_SHADER_STAGE_FRAGMENT_BIT,
-        };
-        builder.Add(infos[index], stages.at(index));
-    }
-    std::optional<VideoCore::Surface::PixelFormatNumeric>
-    NumericFromComponentType(Shader::SamplerComponentType component_type) {
-        using VideoCore::Surface::PixelFormatNumeric;
+std::optional<PixelFormatNumeric> NumericFromComponentType(
+    Shader::SamplerComponentType component_type) {
     switch (component_type) {
     case Shader::SamplerComponentType::Float:
         return PixelFormatNumeric::Float;
@@ -78,10 +67,10 @@ DescriptorLayoutBuilder MakeBuilder(const Device& device, std::span<const Shader
     default:
         return std::nullopt;
     }
-    }
+}
 
-    VideoCore::Surface::PixelFormat ResolveTexelBufferFormat(
-        VideoCore::Surface::PixelFormat format, Shader::SamplerComponentType component_type) {
+PixelFormat ResolveTexelBufferFormat(PixelFormat format,
+                                     Shader::SamplerComponentType component_type) {
     const auto desired_numeric = NumericFromComponentType(component_type);
     if (!desired_numeric) {
         return format;
@@ -90,11 +79,23 @@ DescriptorLayoutBuilder MakeBuilder(const Device& device, std::span<const Shader
     if (*desired_numeric == current_numeric) {
         return format;
     }
-        if (const auto variant =
-                VideoCore::Surface::FindPixelFormatVariant(format, *desired_numeric)) {
+    if (const auto variant = VideoCore::Surface::FindPixelFormatVariant(format, *desired_numeric)) {
         return *variant;
     }
     return format;
+}
+
+DescriptorLayoutBuilder MakeBuilder(const Device& device, std::span<const Shader::Info> infos) {
+    DescriptorLayoutBuilder builder{device};
+    for (size_t index = 0; index < infos.size(); ++index) {
+        static constexpr std::array stages{
+            VK_SHADER_STAGE_VERTEX_BIT,
+            VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT,
+            VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT,
+            VK_SHADER_STAGE_GEOMETRY_BIT,
+            VK_SHADER_STAGE_FRAGMENT_BIT,
+        };
+        builder.Add(infos[index], stages.at(index));
     }
     return builder;
 }