From 32c6e76ab901e3df1e6e9083c442516003f439fe Mon Sep 17 00:00:00 2001
From: GPUCode <geoster3d@gmail.com>
Date: Sun, 6 Nov 2022 21:57:30 +0200
Subject: [PATCH] renderer_vulkan: Move fragment shader microprofile to a
 better place

---
 src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 2 --
 src/video_core/renderer_vulkan/vk_shader_gen_spv.cpp | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index 5cb7f4909..ee64fbf0b 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -244,12 +244,10 @@ void PipelineCache::UseTrivialGeometryShader() {
     });
 }
 
-MICROPROFILE_DEFINE(Vulkan_FragmentGeneration, "Vulkan", "Fragment Shader Compilation", MP_RGB(255, 100, 100));
 void PipelineCache::UseFragmentShader(const Pica::Regs& regs) {
     const PicaFSConfig config{regs, instance};
 
     scheduler.Record([this, config](vk::CommandBuffer, vk::CommandBuffer) {
-        MICROPROFILE_SCOPE(Vulkan_FragmentGeneration);
         vk::ShaderModule handle = fragment_shaders.Get(config, vk::ShaderStageFlagBits::eFragment,
                                                        instance.GetDevice(), ShaderOptimization::Debug);
         current_shaders[ProgramType::FS] = handle;
diff --git a/src/video_core/renderer_vulkan/vk_shader_gen_spv.cpp b/src/video_core/renderer_vulkan/vk_shader_gen_spv.cpp
index d195bcde8..8b9076a2e 100644
--- a/src/video_core/renderer_vulkan/vk_shader_gen_spv.cpp
+++ b/src/video_core/renderer_vulkan/vk_shader_gen_spv.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <fstream>
+#include "common/microprofile.h"
 #include "video_core/regs.h"
 #include "video_core/renderer_vulkan/vk_shader_gen_spv.h"
 #include "video_core/shader/shader_uniforms.h"
@@ -893,7 +893,9 @@ void FragmentModule::DefineInterface() {
     Decorate(gl_frag_depth_id, spv::Decoration::BuiltIn, spv::BuiltIn::FragDepth);
 }
 
+MICROPROFILE_DEFINE(Vulkan_FragmentGenerationSPV, "Vulkan", "SPIRV Fragment Shader Compilation", MP_RGB(255, 100, 100));
 std::vector<u32> GenerateFragmentShaderSPV(const PicaFSConfig& config) {
+    MICROPROFILE_SCOPE(Vulkan_FragmentGenerationSPV)
     FragmentModule module{config};
     module.Generate();
     return module.Assemble();