mirror of
https://github.com/love2d/love.git
synced 2026-08-12 00:20:52 +02:00
opengl: only populate Shader:getWarnings string when there are warnings.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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())
|
||||
|
||||
Reference in New Issue
Block a user