LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Workaround for off-by-one line numbers in shader validation errors.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-08-19 17:20:03 -03:00
parent a42f27db47
commit 7fdad7c010
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Graphics.lua
+22 -7
View File
@@ -320,7 +320,7 @@ local function createShaderStageCode(stage, code, lang, gles, glsl1on3, gammacor
GLSL.FUNCTIONS, GLSL.FUNCTIONS,
GLSL[stage].FUNCTIONS, GLSL[stage].FUNCTIONS,
custom and GLSL[stage].MAIN_CUSTOM or GLSL[stage].MAIN, custom and GLSL[stage].MAIN_CUSTOM or GLSL[stage].MAIN,
(lang == "glsl3" or gles) and "#line 1" or "#line 0", ((lang == "glsl1" or glsl1on3) and not gles) and "#line 0" or "#line 1",
code, code,
} }
return table_concat(lines, "\n") return table_concat(lines, "\n")
@@ -403,9 +403,19 @@ function love.graphics._shaderCodeToGLSL(gles, arg1, arg2)
end end
function love.graphics._transformGLSLErrorMessages(message) function love.graphics._transformGLSLErrorMessages(message)
local compiling = true
local shadertype = message:match("Cannot compile (%a+) shader code") local shadertype = message:match("Cannot compile (%a+) shader code")
if not shadertype then
compiling = false
shadertype = message:match("Error validating (%a+) shader")
end
if not shadertype then return message end if not shadertype then return message end
local lines = {"Cannot compile "..shadertype.." shader code:"} local lines = {}
if compiling then
lines[#lines+1] = "Cannot compile "..shadertype.." shader code:"
else
lines[#lines+1] = "Error validating "..shadertype.." shader code:"
end
for l in message:gmatch("[^\n]+") do for l in message:gmatch("[^\n]+") do
-- nvidia compiler message: -- nvidia compiler message:
-- 0(<linenumber>) : error/warning [NUMBER]: <error message> -- 0(<linenumber>) : error/warning [NUMBER]: <error message>
@@ -414,14 +424,19 @@ function love.graphics._transformGLSLErrorMessages(message)
-- ati compiler message: -- ati compiler message:
-- ERROR 0:<linenumber>: error/warning(#[NUMBER]) [ERRORNAME]: <errormessage> -- ERROR 0:<linenumber>: error/warning(#[NUMBER]) [ERRORNAME]: <errormessage>
linenumber, what, message = l:match("^%w+: 0:(%d+):%s*(%w+)%([^%)]+%)%s*(.+)$") linenumber, what, message = l:match("^%w+: 0:(%d+):%s*(%w+)%([^%)]+%)%s*(.+)$")
if not linenumber then end
-- OSX compiler message (?): if not linenumber then
-- ERROR: 0:<linenumber>: <errormessage> -- OSX compiler message (?):
what, linenumber, message = l:match("^(%w+): %d+:(%d+): (.+)$") -- ERROR: 0:<linenumber>: <errormessage>
end what, linenumber, message = l:match("^(%w+): %d+:(%d+): (.+)$")
end
if not linenumber and l:match("^ERROR:") then
what = l
end end
if linenumber and what and message then if linenumber and what and message then
lines[#lines+1] = ("Line %d: %s: %s"):format(linenumber, what, message) lines[#lines+1] = ("Line %d: %s: %s"):format(linenumber, what, message)
elseif what then
lines[#lines+1] = what
end end
end end
-- did not match any known error messages -- did not match any known error messages