From ff06718f8a7bdfcc48b1fc8af3111402a84d2d5a Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Tue, 27 Feb 2024 23:17:24 -0400 Subject: [PATCH] opengl: only populate Shader:getWarnings string when there are warnings. --- src/modules/graphics/opengl/Shader.cpp | 2 +- testing/tests/graphics.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/opengl/Shader.cpp b/src/modules/graphics/opengl/Shader.cpp index d9f7343e8..eeca919c9 100644 --- a/src/modules/graphics/opengl/Shader.cpp +++ b/src/modules/graphics/opengl/Shader.cpp @@ -600,7 +600,7 @@ std::string Shader::getWarnings() const const std::string &stagewarnings = stage->getWarnings(); - if (ShaderStage::getConstant(stage->getStageType(), stagestr)) + if (!stagewarnings.empty() && ShaderStage::getConstant(stage->getStageType(), stagestr)) warnings += std::string(stagestr) + std::string(" shader:\n") + stagewarnings; } diff --git a/testing/tests/graphics.lua b/testing/tests/graphics.lua index 1c4f3cee3..da473da87 100644 --- a/testing/tests/graphics.lua +++ b/testing/tests/graphics.lua @@ -803,7 +803,7 @@ love.test.graphics.Shader = function(test) ]] local shader1 = love.graphics.newShader(pixelcode1, vertexcode1, {debugname = 'testshader'}) test:assertObject(shader1) - test:assertEquals('vertex shader:\npixel shader:\n', shader1:getWarnings(), 'check shader valid') + test:assertEquals('', shader1:getWarnings(), 'check shader valid') test:assertFalse(shader1:hasUniform('tex1'), 'check invalid uniform') test:assertTrue(shader1:hasUniform('tex2'), 'check valid uniform') test:assertEquals('testshader', shader1:getDebugName())