From d0852812cc9ba727b5e2436980950aa78130b995 Mon Sep 17 00:00:00 2001 From: goeiecool9999 <7033575+goeiecool9999@users.noreply.github.com> Date: Tue, 21 Apr 2026 13:20:52 +0200 Subject: [PATCH] fix linux build without openGL --- src/Cafe/CMakeLists.txt | 2 +- src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp | 2 +- src/Cafe/HW/Latte/Core/LatteShader.cpp | 2 ++ src/Cafe/HW/Latte/Core/LatteShaderGL.cpp | 2 -- src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Cafe/CMakeLists.txt b/src/Cafe/CMakeLists.txt index dc4f8ae8..5de8a085 100644 --- a/src/Cafe/CMakeLists.txt +++ b/src/Cafe/CMakeLists.txt @@ -125,7 +125,6 @@ add_library(CemuCafe HW/Latte/Core/LatteShaderCache.cpp HW/Latte/Core/LatteShaderCache.h HW/Latte/Core/LatteShader.cpp - HW/Latte/Core/LatteShaderGL.cpp HW/Latte/Core/LatteShader.h HW/Latte/Core/LatteSoftware.cpp HW/Latte/Core/LatteSoftware.h @@ -497,6 +496,7 @@ if (ENABLE_OPENGL) target_sources(CemuCafe PRIVATE HW/Latte/Core/LatteDefaultShaders.cpp HW/Latte/Core/LatteDefaultShaders.h + HW/Latte/Core/LatteShaderGL.cpp HW/Latte/Renderer/OpenGL/CachedFBOGL.h HW/Latte/Renderer/OpenGL/LatteTextureGL.cpp HW/Latte/Renderer/OpenGL/LatteTextureGL.h diff --git a/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp b/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp index b5053df8..96b7316b 100644 --- a/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp +++ b/src/Cafe/HW/Latte/Core/LatteRenderTarget.cpp @@ -10,7 +10,7 @@ #include "Cafe/HW/Latte/Renderer/Renderer.h" #include "Cafe/HW/Latte/Core/LattePerformanceMonitor.h" #include "Cafe/GraphicPack/GraphicPack2.h" -#include "HW/Latte/Renderer/Common/CommonRendererCore.h" +#include "HW/Latte/Renderer/RendererCore.h" #include "config/ActiveSettings.h" #include "WindowSystem.h" #include "Cafe/OS/libs/erreula/erreula.h" diff --git a/src/Cafe/HW/Latte/Core/LatteShader.cpp b/src/Cafe/HW/Latte/Core/LatteShader.cpp index 4f916619..bc379659 100644 --- a/src/Cafe/HW/Latte/Core/LatteShader.cpp +++ b/src/Cafe/HW/Latte/Core/LatteShader.cpp @@ -378,7 +378,9 @@ void LatteShader_FinishCompilation(LatteDecompilerShader* shader) } shader->shader->WaitForCompiled(); +#ifdef ENABLE_OPENGL LatteShader_prepareSeparableUniforms(shader); +#endif LatteShader_CleanupAfterCompile(shader); } diff --git a/src/Cafe/HW/Latte/Core/LatteShaderGL.cpp b/src/Cafe/HW/Latte/Core/LatteShaderGL.cpp index f708f53a..09c484e6 100644 --- a/src/Cafe/HW/Latte/Core/LatteShaderGL.cpp +++ b/src/Cafe/HW/Latte/Core/LatteShaderGL.cpp @@ -26,7 +26,6 @@ bool gxShader_checkIfSuccessfullyLinked(GLuint glProgram) void LatteShader_prepareSeparableUniforms(LatteDecompilerShader* shader) { -#ifdef ENABLE_OPENGL if (g_renderer->GetType() != RendererAPI::OpenGL) return; @@ -66,7 +65,6 @@ void LatteShader_prepareSeparableUniforms(LatteDecompilerShader* shader) shader->uniform.list_ufTexRescale.push_back(entry); } } -#endif } GLuint gpu7ShaderGLDepr_compileShader(const std::string& source, uint32_t type) { diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp index bcac9199..8e190743 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRendererCore.cpp @@ -13,7 +13,7 @@ #include "Cafe/HW/Latte/Renderer/OpenGL/CachedFBOGL.h" #include "Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h" -#include "Cafe/HW/Latte/Renderer/Common/CommonRendererCore.h" +#include "Cafe/HW/Latte/Renderer/RendererCore.h" #include "Cafe/HW/Latte/ISA/RegDefines.h" #include "Cafe/OS/libs/gx2/GX2.h"