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

Shader:send now returns false if the uniform doesn't exist

Browse Source 
It also returns false if the uniform exists but was optimized out by the shader compiler. Previously it would cause a Lua error in both situations.
This commit is contained in:
Alex Szpakowski
2020-02-27 20:19:55 -04:00
parent 9425c9224b
commit b95788c104
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/wrap_Shader.cpp
+19 -9
View File
@@ -411,14 +411,18 @@ int w_Shader_send(lua_State *L)
const Shader::UniformInfo *info = shader->getUniformInfo(name);
if (info == nullptr)
return luaL_error(L, "Shader uniform '%s' does not exist.\nA common error is to define but not use the variable.", name);
{
luax_pushboolean(L, false);
return 1;
}
int startidx = 3;
if (luax_istype(L, startidx, Data::type))
return w_Shader_sendData(L, startidx, shader, info, false);
if (luax_istype(L, 3, Data::type))
w_Shader_sendData(L, 3, shader, info, false);
else
return w_Shader_sendLuaValues(L, startidx, shader, info, name);
w_Shader_sendLuaValues(L, 3, shader, info, name);
luax_pushboolean(L, true);
return 1;
}
int w_Shader_sendColors(lua_State *L)
@@ -428,15 +432,21 @@ int w_Shader_sendColors(lua_State *L)
const Shader::UniformInfo *info = shader->getUniformInfo(name);
if (info == nullptr)
return luaL_error(L, "Shader uniform '%s' does not exist.\nA common error is to define but not use the variable.", name);
{
luax_pushboolean(L, false);
return 1;
}
if (info->baseType != Shader::UNIFORM_FLOAT || info->components < 3)
return luaL_error(L, "sendColor can only be used on vec3 or vec4 uniforms.");
if (luax_istype(L, 3, Data::type))
return w_Shader_sendData(L, 3, shader, info, true);
w_Shader_sendData(L, 3, shader, info, true);
else
return w_Shader_sendFloats(L, 3, shader, info, true);
w_Shader_sendFloats(L, 3, shader, info, true);
luax_pushboolean(L, true);
return 1;
}
int w_Shader_hasUniform(lua_State *L)