From 548cf3e965b54617a9578b03567df3053d3ab3ed Mon Sep 17 00:00:00 2001 From: goeiecool9999 <7033575+goeiecool9999@users.noreply.github.com> Date: Tue, 2 Sep 2025 20:43:18 +0200 Subject: [PATCH] change sRGB encoding to uniform and push constants, never rely on hardware sRGB decoding/encoding --- .../Latte/Renderer/OpenGL/OpenGLRenderer.cpp | 14 ++---- .../Renderer/OpenGL/RendererShaderGL.cpp | 5 +++ .../Latte/Renderer/OpenGL/RendererShaderGL.h | 2 + .../HW/Latte/Renderer/RendererOuputShader.cpp | 43 +++++++++++++++++-- .../HW/Latte/Renderer/RendererOuputShader.h | 3 +- src/Cafe/HW/Latte/Renderer/RendererShader.h | 1 + .../Renderer/Vulkan/RendererShaderVk.cpp | 5 +++ .../Latte/Renderer/Vulkan/RendererShaderVk.h | 1 + .../Latte/Renderer/Vulkan/SwapchainInfoVk.cpp | 14 +----- .../Latte/Renderer/Vulkan/VulkanRenderer.cpp | 20 ++++++--- 10 files changed, 75 insertions(+), 33 deletions(-) diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp index 63c344ca..5dd559a3 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/OpenGLRenderer.cpp @@ -205,7 +205,7 @@ ImTextureID OpenGLRenderer::GenerateTexture(const std::vector& data, cons glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); glActiveTexture(GL_TEXTURE0); - glTexImage2D(GL_TEXTURE_2D, 0, GL_SRGB, size.x, size.y, 0, GL_RGB, GL_UNSIGNED_BYTE, data.data()); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, size.x, size.y, 0, GL_RGB, GL_UNSIGNED_BYTE, data.data()); return (ImTextureID)(uintptr_t)textureId; } @@ -318,8 +318,8 @@ void OpenGLRenderer::Initialize() cemuLog_log(LogType::Force, "ARB_copy_image: {}", (glCopyImageSubData != NULL) ? "available" : "not supported"); cemuLog_log(LogType::Force, "NV_depth_buffer_float: {}", (glDepthRangedNV != NULL) ? "available" : "not supported"); - // enable framebuffer SRGB support - glEnable(GL_FRAMEBUFFER_SRGB); + // display raw fragment shader output, we handle gamma encoding manually. + glDisable(GL_FRAMEBUFFER_SRGB); if (this->m_vendor != GfxVendor::AMD) { @@ -603,7 +603,7 @@ void OpenGLRenderer::DrawBackbufferQuad(LatteTextureView* texView, RendererOutpu shader_unbind(RendererShader::ShaderType::kGeometry); shader_bind(shader->GetVertexShader()); shader_bind(shader->GetFragmentShader()); - shader->SetUniformParameters(*texView, {imageWidth, imageHeight}); + shader->SetUniformParameters(*texView, {imageWidth, imageHeight}, padView); // set viewport glViewportIndexedf(0, imageX, imageY, imageWidth, imageHeight); @@ -620,15 +620,9 @@ void OpenGLRenderer::DrawBackbufferQuad(LatteTextureView* texView, RendererOutpu glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, useLinearTexFilter ? GL_LINEAR : GL_NEAREST); texViewGL->samplerState.filterMag = 0xFFFFFFFF; - if ((!padView && !LatteGPUState.tvBufferUsesSRGB) || (padView && !LatteGPUState.drcBufferUsesSRGB)) - glDisable(GL_FRAMEBUFFER_SRGB); - uint16 indexData[6] = { 0,1,2,3,4,5 }; glDrawRangeElements(GL_TRIANGLES, 0, 5, 6, GL_UNSIGNED_SHORT, indexData); - if ((!padView && !LatteGPUState.tvBufferUsesSRGB) || (padView && !LatteGPUState.drcBufferUsesSRGB)) - glEnable(GL_FRAMEBUFFER_SRGB); - // unbind texture texture_bindAndActivate(nullptr, 0); diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp index cae53140..e5273ab1 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.cpp @@ -227,6 +227,11 @@ sint32 RendererShaderGL::GetUniformLocation(const char* name) return glGetUniformLocation(m_program, name); } +void RendererShaderGL::SetUniform1i(sint32 location, sint32 value) +{ + glProgramUniform1i(m_program, location, value); +} + void RendererShaderGL::SetUniform2fv(sint32 location, void* data, sint32 count) { glProgramUniform2fv(m_program, location, count, (const GLfloat*)data); diff --git a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h index 60c51cc1..1959797d 100644 --- a/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h +++ b/src/Cafe/HW/Latte/Renderer/OpenGL/RendererShaderGL.h @@ -18,6 +18,8 @@ public: GLuint GetShaderObject() const { cemu_assert_debug(m_isCompiled); return m_shader_object; } sint32 GetUniformLocation(const char* name) override; + + void SetUniform1i(sint32 location, sint32 value) override; void SetUniform2fv(sint32 location, void* data, sint32 count) override; void SetUniform4iv(sint32 location, void* data, sint32 count) override; diff --git a/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp b/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp index afe53a16..4859d79b 100644 --- a/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp +++ b/src/Cafe/HW/Latte/Renderer/RendererOuputShader.cpp @@ -3,7 +3,7 @@ const std::string RendererOutputShader::s_copy_shader_source = R"( -void main() +void outputShader() { colorOut0 = vec4(texture(textureSrc, passUV).rgb,1.0); } @@ -49,7 +49,7 @@ vec4 bcFilter(vec2 uv, vec4 texelSize) mix(sample1, sample0, sx), sy); } -void main(){ +void outputShader(){ vec4 texelSize = vec4( 1.0 / textureSrcResolution.xy, textureSrcResolution.xy); colorOut0 = vec4(bcFilter(passUV, texelSize).rgb,1.0); } @@ -108,7 +108,7 @@ vec3 BicubicHermiteTexture(vec2 uv, vec4 texelSize) return CubicHermite(CP0X, CP1X, CP2X, CP3X, frac.y); } -void main(){ +void outputShader(){ vec4 texelSize = vec4( 1.0 / textureSrcResolution.xy, textureSrcResolution.xy); colorOut0 = vec4(BicubicHermiteTexture(passUV, texelSize), 1.0); } @@ -135,14 +135,16 @@ RendererOutputShader::RendererOutputShader(const std::string& vertex_source, con m_uniformLocations[0].m_loc_textureSrcResolution = m_vertex_shader->GetUniformLocation("textureSrcResolution"); m_uniformLocations[0].m_loc_nativeResolution = m_vertex_shader->GetUniformLocation("nativeResolution"); m_uniformLocations[0].m_loc_outputResolution = m_vertex_shader->GetUniformLocation("outputResolution"); + m_uniformLocations[0].m_loc_applySRGBEncoding = m_vertex_shader->GetUniformLocation("applySRGBEncoding"); m_uniformLocations[1].m_loc_textureSrcResolution = m_fragment_shader->GetUniformLocation("textureSrcResolution"); m_uniformLocations[1].m_loc_nativeResolution = m_fragment_shader->GetUniformLocation("nativeResolution"); m_uniformLocations[1].m_loc_outputResolution = m_fragment_shader->GetUniformLocation("outputResolution"); + m_uniformLocations[1].m_loc_applySRGBEncoding = m_fragment_shader->GetUniformLocation("applySRGBEncoding"); } } -void RendererOutputShader::SetUniformParameters(const LatteTextureView& texture_view, const Vector2i& output_res) const +void RendererOutputShader::SetUniformParameters(const LatteTextureView& texture_view, const Vector2i& output_res, const bool padView) const { sint32 effectiveWidth, effectiveHeight; texture_view.baseTexture->GetEffectiveSize(effectiveWidth, effectiveHeight, 0); @@ -168,6 +170,11 @@ void RendererOutputShader::SetUniformParameters(const LatteTextureView& texture_ res[1] = (float)output_res.y; shader->SetUniform2fv(locations.m_loc_outputResolution, res, 1); } + + if (locations.m_loc_applySRGBEncoding != -1) + { + shader->SetUniform1i(locations.m_loc_applySRGBEncoding, padView ? LatteGPUState.drcBufferUsesSRGB : LatteGPUState.tvBufferUsesSRGB); + } }; setUniforms(m_vertex_shader.get(), m_uniformLocations[0]); setUniforms(m_fragment_shader.get(), m_uniformLocations[1]); @@ -290,16 +297,44 @@ layout(push_constant) uniform pc { vec2 textureSrcResolution; vec2 nativeResolution; vec2 outputResolution; + bool applySRGBEncoding; // true = app requested sRGB encoding }; #else uniform vec2 textureSrcResolution; uniform vec2 nativeResolution; uniform vec2 outputResolution; +uniform bool applySRGBEncoding; #endif layout(location = 0) smooth in vec2 passUV; layout(binding = 0) uniform sampler2D textureSrc; layout(location = 0) out vec4 colorOut0; + +float sRGBEncode(float linear) +{ + if(linear <= 0.0031308) + return 12.92f * linear; + else + return 1.055f * pow(linear, 1.0f / 2.4f) - 0.055f; + +} + +vec3 sRGBEncode(vec3 linear) +{ + return vec3(sRGBEncode(linear.r), sRGBEncode(linear.g), sRGBEncode(linear.b)); +} + +// fwd. declaration +void outputShader(); +void main() +{ + outputShader(); // sets colorOut0 + if(applySRGBEncoding) + { + colorOut0 = vec4(sRGBEncode(colorOut0.xyz), 1.0f); + } +} + )" + shaderSrc; } void RendererOutputShader::InitializeStatic() diff --git a/src/Cafe/HW/Latte/Renderer/RendererOuputShader.h b/src/Cafe/HW/Latte/Renderer/RendererOuputShader.h index b12edf8b..afab76c0 100644 --- a/src/Cafe/HW/Latte/Renderer/RendererOuputShader.h +++ b/src/Cafe/HW/Latte/Renderer/RendererOuputShader.h @@ -17,7 +17,7 @@ public: RendererOutputShader(const std::string& vertex_source, const std::string& fragment_source); virtual ~RendererOutputShader() = default; - void SetUniformParameters(const LatteTextureView& texture_view, const Vector2i& output_res) const; + void SetUniformParameters(const LatteTextureView& texture_view, const Vector2i& output_res, const bool padView) const; RendererShader* GetVertexShader() const { @@ -55,6 +55,7 @@ protected: sint32 m_loc_textureSrcResolution = -1; sint32 m_loc_nativeResolution = -1; sint32 m_loc_outputResolution = -1; + sint32 m_loc_applySRGBEncoding = -1; } m_uniformLocations[2]{}; private: diff --git a/src/Cafe/HW/Latte/Renderer/RendererShader.h b/src/Cafe/HW/Latte/Renderer/RendererShader.h index e3f254c6..8d678151 100644 --- a/src/Cafe/HW/Latte/Renderer/RendererShader.h +++ b/src/Cafe/HW/Latte/Renderer/RendererShader.h @@ -20,6 +20,7 @@ public: virtual sint32 GetUniformLocation(const char* name) = 0; + virtual void SetUniform1i(sint32 location, sint32 value) = 0; virtual void SetUniform2fv(sint32 location, void* data, sint32 count) = 0; virtual void SetUniform4iv(sint32 location, void* data, sint32 count) = 0; diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp index 665a5da3..48c0d30f 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.cpp @@ -232,6 +232,11 @@ sint32 RendererShaderVk::GetUniformLocation(const char* name) return 0; } +void RendererShaderVk::SetUniform1i(sint32 location, sint32 value) +{ + cemu_assert_suspicious(); +} + void RendererShaderVk::SetUniform2fv(sint32 location, void* data, sint32 count) { cemu_assert_suspicious(); diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h index f9c3ede1..00186058 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/RendererShaderVk.h @@ -32,6 +32,7 @@ public: static void Shutdown(); sint32 GetUniformLocation(const char* name) override; + void SetUniform1i(sint32 location, sint32 value) override; void SetUniform2fv(sint32 location, void* data, sint32 count) override; void SetUniform4iv(sint32 location, void* data, sint32 count) override; VkShaderModule& GetShaderModule() { return m_shader_module; } diff --git a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp index 79bdffd1..b27aae0e 100644 --- a/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp +++ b/src/Cafe/HW/Latte/Renderer/Vulkan/SwapchainInfoVk.cpp @@ -319,18 +319,8 @@ VkSurfaceFormatKHR SwapchainInfoVk::ChooseSurfaceFormat(const std::vectorbaseTexture->GetEffectiveSize(effectiveWidth, effectiveHeight, 0); - pushData[0] = {(float)effectiveWidth, (float)effectiveHeight}; + pushData.vecs[0] = {(float)effectiveWidth, (float)effectiveHeight}; // nativeResolution - pushData[1] = { + pushData.vecs[1] = { (float)texViewVk->baseTexture->width, (float)texViewVk->baseTexture->height, }; // outputResolution - pushData[2] = {(float)imageWidth,(float)imageHeight}; + pushData.vecs[2] = {(float)imageWidth,(float)imageHeight}; - vkCmdPushConstants(m_state.currentCommandBuffer, m_pipelineLayout, VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(float) * 2 * 3, &pushData); + // applySRGBEncoding + pushData.applySRGBEncoding = padView ? LatteGPUState.drcBufferUsesSRGB : LatteGPUState.tvBufferUsesSRGB; + + vkCmdPushConstants(m_state.currentCommandBuffer, m_pipelineLayout, VK_SHADER_STAGE_FRAGMENT_BIT, 0, sizeof(pushData), &pushData); vkCmdDraw(m_state.currentCommandBuffer, 6, 1, 0, 0);