LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 16:40:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved error messages when sending bad values to a shader (also issue #587)

Browse Source
This commit is contained in:
Alex Szpakowski
2013-04-24 23:19:37 -07:00
parent 4e9050216f
commit 0130b726de
4 changed files with 212 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scripts/graphics.lua
+11 -1
View File
@@ -1496,6 +1496,16 @@ void main() {
end
end
local function shader_send_protected(self, name, value, ...)
local success, err = pcall(shader_dispatch_send, self, name, value, ...)
if not success then
if err and type(err) == "string" then
err = err:gsub("^(.-):(%d+): ", "")
end
error(err, 2)
end
end
local newShader = love.graphics.newShader
function love.graphics.newShader(vertexcode, pixelcode)
love.graphics.newShader = newShader
@@ -1503,7 +1513,7 @@ void main() {
local success, shader = pcall(love.graphics.newShader, vertexcode, pixelcode)
if success then
local meta = getmetatable(shader)
meta.send = shader_dispatch_send
meta.send = shader_send_protected
meta.sendBoolean = meta.sendFloat
return shader
else