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

Slightly improved error messages when love.graphics.newShader fails

Browse Source
This commit is contained in:
Alex Szpakowski
2013-03-16 12:49:46 -03:00
parent f9d687cb65
commit e8c6a3f77c
1 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+39 -29
View File
@@ -505,40 +505,50 @@ int w_newShader(lua_State *L)
if (!Shader::isSupported()) if (!Shader::isSupported())
return luaL_error(L, "Sorry, your graphics card does not support shaders."); return luaL_error(L, "Sorry, your graphics card does not support shaders.");
// clamp stack to 2 elements
lua_settop(L, 2);
luax_getfunction(L, "graphics", "_shaderCodeToGLSL");
// push vertcode and fragcode strings to the top of the stack so they become arguments for the function
lua_pushvalue(L, 1);
lua_pushvalue(L, 2);
// call effectCodeToGLSL, returned values will be at the top of the stack
lua_pcall(L, 2, 2, 0);
Shader::ShaderSources sources;
// vertex shader code
if (lua_isstring(L, -2))
{
std::string vertcode(luaL_checkstring(L, -2));
sources[Shader::TYPE_VERTEX] = vertcode;
}
// fragment shader code
if (lua_isstring(L, -1))
{
std::string fragcode(luaL_checkstring(L, -1));
sources[Shader::TYPE_FRAGMENT] = fragcode;
}
if (sources.empty())
{
// Original args had source code, but effectCodeToGLSL couldn't translate it
for (int i = 1; i <= 2; i++)
{
if (lua_isstring(L, i))
return luaL_argerror(L, i, "invalid or incomplete shader code");
}
}
try try
{ {
// clamp stack to 2 elements
lua_settop(L, 2);
luax_getfunction(L, "graphics", "_shaderCodeToGLSL");
// push vertcode and fragcode strings to the top of the stack so they become arguments for the function
lua_pushvalue(L, 1);
lua_pushvalue(L, 2);
// call effectCodeToGLSL, returned values will be at the top of the stack
lua_pcall(L, 2, 2, 0);
Shader::ShaderSources sources;
// vertex shader code
if (lua_isstring(L, -2))
{
std::string vertcode(luaL_checkstring(L, -2));
sources[Shader::TYPE_VERTEX] = vertcode;
}
// fragment shader code
if (lua_isstring(L, -1))
{
std::string fragcode(luaL_checkstring(L, -1));
sources[Shader::TYPE_FRAGMENT] = fragcode;
}
Shader *shader = instance->newShader(sources); Shader *shader = instance->newShader(sources);
luax_newtype(L, "Shader", GRAPHICS_SHADER_T, (void *)shader); luax_newtype(L, "Shader", GRAPHICS_SHADER_T, (void *)shader);
} }
catch(const love::Exception &e) catch (const love::Exception &e)
{ {
// memory is freed in Graphics::newShader // memory is freed in Graphics::newShader
luax_getfunction(L, "graphics", "_transformGLSLErrorMessages"); luax_getfunction(L, "graphics", "_transformGLSLErrorMessages");