From 25c8f0a5ff6824e61e6be7e0d22a47f0e1e29fe9 Mon Sep 17 00:00:00 2001 From: goeiecool9999 <7033575+goeiecool9999@users.noreply.github.com> Date: Thu, 24 Jul 2025 09:15:50 +0200 Subject: [PATCH] Remove unused isRendererThread argument from PreponeCompilation --- src/Cafe/HW/Latte/Core/LatteShader.cpp | 6 +++--- src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp | 2 +- src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp | 2 +- src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h | 2 +- src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp | 4 ++-- src/Cafe/HW/Latte/Renderer/RendererShader.h | 2 +- src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp | 8 ++++---- src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h | 4 ++-- .../HW/Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp | 8 ++++---- src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp | 6 +++--- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Cafe/HW/Latte/Core/LatteShader.cpp b/src/Cafe/HW/Latte/Core/LatteShader.cpp index d9f0a5dd..3e6bf41e 100644 --- a/src/Cafe/HW/Latte/Core/LatteShader.cpp +++ b/src/Cafe/HW/Latte/Core/LatteShader.cpp @@ -767,7 +767,7 @@ LatteDecompilerShader* LatteShader_CompileSeparableVertexShader(uint64 baseHash, if (g_renderer->GetType() == RendererAPI::OpenGL) { if (vertexShader->shader) - vertexShader->shader->PreponeCompilation(true); + vertexShader->shader->PreponeCompilation(); LatteShader_FinishCompilation(vertexShader); } @@ -796,7 +796,7 @@ LatteDecompilerShader* LatteShader_CompileSeparableGeometryShader(uint64 baseHas if (g_renderer->GetType() == RendererAPI::OpenGL) { if (geometryShader->shader) - geometryShader->shader->PreponeCompilation(true); + geometryShader->shader->PreponeCompilation(); LatteShader_FinishCompilation(geometryShader); } @@ -825,7 +825,7 @@ LatteDecompilerShader* LatteShader_CompileSeparablePixelShader(uint64 baseHash, if (g_renderer->GetType() == RendererAPI::OpenGL) { if (pixelShader->shader) - pixelShader->shader->PreponeCompilation(true); + pixelShader->shader->PreponeCompilation(); LatteShader_FinishCompilation(pixelShader); } diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp index 571961f4..030dfbfe 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp @@ -868,7 +868,7 @@ RendererShaderGL* rectsEmulationGS_generateShaderGL(LatteDecompilerShader* verte gsSrc.append("}\r\n"); auto glShader = new RendererShaderGL(RendererShader::ShaderType::kGeometry, 0, 0, false, false, gsSrc); - glShader->PreponeCompilation(true); + glShader->PreponeCompilation(); return glShader; } diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp index 3c8ccb24..60a1830d 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp @@ -157,7 +157,7 @@ RendererShaderGL::~RendererShaderGL() glDeleteProgram(m_program); } -void RendererShaderGL::PreponeCompilation(bool isRenderThread) +void RendererShaderGL::PreponeCompilation() { // the logic for initiating compilation is currently in the constructor // here we only guarantee that it is finished before we return diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h index a5a24ca5..3238b423 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h @@ -10,7 +10,7 @@ public: virtual ~RendererShaderGL(); - void PreponeCompilation(bool isRenderThread) override; + void PreponeCompilation() override; bool IsCompiled() override; bool WaitForCompiled() override; diff --git a/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp b/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp index afe53a16..e37e054c 100644 --- a/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp +++ b/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp @@ -121,8 +121,8 @@ RendererOutputShader::RendererOutputShader(const std::string& vertex_source, con m_vertex_shader.reset(g_renderer->shader_create(RendererShader::ShaderType::kVertex, 0, 0, vertex_source, false, false)); m_fragment_shader.reset(g_renderer->shader_create(RendererShader::ShaderType::kFragment, 0, 0, finalFragmentSrc, false, false)); - m_vertex_shader->PreponeCompilation(true); - m_fragment_shader->PreponeCompilation(true); + m_vertex_shader->PreponeCompilation(); + m_fragment_shader->PreponeCompilation(); if (!m_vertex_shader->WaitForCompiled()) throw std::exception(); diff --git a/src/Cafe/HW/Latte/Renderer/RendererShader.h b/src/Cafe/HW/Latte/Renderer/RendererShader.h index e3f254c6..9906eff6 100644 --- a/src/Cafe/HW/Latte/Renderer/RendererShader.h +++ b/src/Cafe/HW/Latte/Renderer/RendererShader.h @@ -14,7 +14,7 @@ public: ShaderType GetType() const { return m_type; } - virtual void PreponeCompilation(bool isRenderThread) = 0; // if shader not yet compiled, compile it synchronously (if possible) or alternatively wait for compilation. After this function IsCompiled() is guaranteed to be true + virtual void PreponeCompilation() = 0; // if shader not yet compiled, compile it synchronously (if possible) or alternatively wait for compilation. After this function IsCompiled() is guaranteed to be true virtual bool IsCompiled() = 0; virtual bool WaitForCompiled() = 0; diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp index 665a5da3..558aa0e2 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp @@ -174,7 +174,7 @@ public: job->m_compilationState.setValue(RendererShaderVk::COMPILATION_STATE::COMPILING); s_compilationQueueMutex.unlock(); // compile - job->CompileInternal(false); + job->CompileInternal(); ++g_compiled_shaders_async; // mark as compiled cemu_assert_debug(job->m_compilationState.getValue() == RendererShaderVk::COMPILATION_STATE::COMPILING); @@ -280,7 +280,7 @@ void RendererShaderVk::FinishCompilation() m_glslCode.shrink_to_fit(); } -void RendererShaderVk::CompileInternal(bool isRenderThread) +void RendererShaderVk::CompileInternal() { // try to retrieve SPIR-V module from cache if (s_isLoadingShadersVk && (m_isGameShader && !m_isGfxPackShader) && s_spirvCache) @@ -412,7 +412,7 @@ void RendererShaderVk::CompileInternal(bool isRenderThread) FinishCompilation(); } -void RendererShaderVk::PreponeCompilation(bool isRenderThread) +void RendererShaderVk::PreponeCompilation() { ShaderVkThreadPool.s_compilationQueueMutex.lock(); bool isStillQueued = m_compilationState.hasState(COMPILATION_STATE::QUEUED); @@ -432,7 +432,7 @@ void RendererShaderVk::PreponeCompilation(bool isRenderThread) else { // compile synchronously - CompileInternal(isRenderThread); + CompileInternal(); m_compilationState.setValue(COMPILATION_STATE::DONE); } } diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h index f9c3ede1..b9ece7ed 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h @@ -52,12 +52,12 @@ public: s_dependencyLock.unlock(); } - void PreponeCompilation(bool isRenderThread) override; + void PreponeCompilation() override; bool IsCompiled() override; bool WaitForCompiled() override; private: - void CompileInternal(bool isRenderThread); + void CompileInternal(); void FinishCompilation(); diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp index 7555c03a..bdc4ffa5 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanPipelineCompiler.cpp @@ -159,7 +159,7 @@ RendererShaderVk* rectsEmulationGS_generate(LatteDecompilerShader* vertexShader, gsSrc.append("}\r\n"); auto vkShader = new RendererShaderVk(RendererShader::ShaderType::kGeometry, 0, 0, false, false, gsSrc); - vkShader->PreponeCompilation(true); + vkShader->PreponeCompilation(); return vkShader; } @@ -966,11 +966,11 @@ bool PipelineCompiler::Compile(bool forceCompile, bool isRenderThread, bool show { // if some shader stages are not compiled yet, compile them now if (m_vkVertexShader && m_vkVertexShader->IsCompiled() == false) - m_vkVertexShader->PreponeCompilation(isRenderThread); + m_vkVertexShader->PreponeCompilation(); if (m_vkPixelShader && m_vkPixelShader->IsCompiled() == false) - m_vkPixelShader->PreponeCompilation(isRenderThread); + m_vkPixelShader->PreponeCompilation(); if (m_vkGeometryShader && m_vkGeometryShader->IsCompiled() == false) - m_vkGeometryShader->PreponeCompilation(isRenderThread); + m_vkGeometryShader->PreponeCompilation(); } if (shaderStages.empty()) diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp index e3e42012..33386399 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/VulkanSurfaceCopy.cpp @@ -181,7 +181,7 @@ RendererShaderVk* _vkGenSurfaceCopyShader_vs() std::string shaderStr(vsShaderSrc); auto vkShader = new RendererShaderVk(RendererShader::ShaderType::kVertex, 0, 0, false, false, shaderStr); - vkShader->PreponeCompilation(true); + vkShader->PreponeCompilation(); return vkShader; } @@ -199,7 +199,7 @@ RendererShaderVk* _vkGenSurfaceCopyShader_ps_colorToDepth() std::string shaderStr(psShaderSrc); auto vkShader = new RendererShaderVk(RendererShader::ShaderType::kFragment, 0, 0, false, false, shaderStr); - vkShader->PreponeCompilation(true); + vkShader->PreponeCompilation(); return vkShader; } @@ -218,7 +218,7 @@ RendererShaderVk* _vkGenSurfaceCopyShader_ps_depthToColor() std::string shaderStr(psShaderSrc); auto vkShader = new RendererShaderVk(RendererShader::ShaderType::kFragment, 0, 0, false, false, shaderStr); - vkShader->PreponeCompilation(true); + vkShader->PreponeCompilation(); return vkShader; }