diff options
| -rw-r--r-- | src/shader.c | 166 | ||||
| -rw-r--r-- | src/shader.h | 1 |
2 files changed, 97 insertions, 70 deletions
diff --git a/src/shader.c b/src/shader.c index 048cf87..eb16929 100644 --- a/src/shader.c +++ b/src/shader.c @@ -5,19 +5,19 @@ int honey_shader_mt_ref = LUA_NOREF; void honey_setup_shader(lua_State* L) { honey_lua_create_table - (L, 2, - HONEY_TABLE, "__index", 7, + (L, 2, + HONEY_TABLE, "__index", 7, - /* honey.shader.prototype */ - HONEY_FUNCTION, "use", honey_shader_use, - HONEY_FUNCTION, "setInteger", honey_shader_set_int, - HONEY_FUNCTION, "setFloat", honey_shader_set_float, - HONEY_FUNCTION, "setVec3", honey_shader_set_vec3, - HONEY_FUNCTION, "setVec4", honey_shader_set_vec4, - HONEY_FUNCTION, "setMat3", honey_shader_set_mat3, - HONEY_FUNCTION, "setMat4", honey_shader_set_mat4, + /* honey.shader.prototype */ + HONEY_FUNCTION, "use", honey_shader_use, + HONEY_FUNCTION, "setInteger", honey_shader_set_int, + HONEY_FUNCTION, "setFloat", honey_shader_set_float, + HONEY_FUNCTION, "setVec3", honey_shader_set_vec3, + HONEY_FUNCTION, "setVec4", honey_shader_set_vec4, + HONEY_FUNCTION, "setMat3", honey_shader_set_mat3, + HONEY_FUNCTION, "setMat4", honey_shader_set_mat4, - HONEY_FUNCTION, "__gc", honey_shader_delete); + HONEY_FUNCTION, "__gc", honey_shader_delete); honey_shader_mt_ref = luaL_ref(L, LUA_REGISTRYINDEX); @@ -32,58 +32,84 @@ void honey_setup_shader(lua_State* L) int honey_shader_new(lua_State* L) { - char* vertex_shader_source, *fragment_shader_source; - honey_lua_parse_arguments - (L, 1, - 2, HONEY_STRING, &vertex_shader_source, HONEY_STRING, &fragment_shader_source); + char* vertex_shader_source, *geometry_shader_source, *fragment_shader_source; + int choice = honey_lua_parse_arguments + (L, 2, + 2, HONEY_STRING, &vertex_shader_source, HONEY_STRING, &fragment_shader_source, + 3, + HONEY_STRING, &vertex_shader_source, + HONEY_STRING, &geometry_shader_source, + HONEY_STRING, &fragment_shader_source); int success; char error[1024]; - int vertex_shader = glCreateShader(GL_VERTEX_SHADER); + int vertex_shader, geometry_shader, fragment_shader; + + /* vertex shader */ + vertex_shader = glCreateShader(GL_VERTEX_SHADER); glShaderSource(vertex_shader, 1, (const char* const*) &vertex_shader_source, NULL); glCompileShader(vertex_shader); glGetShaderiv(vertex_shader, GL_COMPILE_STATUS, &success); if (!success) { glGetShaderInfoLog(vertex_shader, 1024, NULL, error); - honey_lua_throw_error(L, "error compiling vertex shader: %s", - error); + honey_lua_throw_error(L, "error compiling vertex shader: %s", + error); } - int fragment_shader = glCreateShader(GL_FRAGMENT_SHADER); + /* geometry shader */ + if (choice == 1) { + geometry_shader = glCreateShader(GL_GEOMETRY_SHADER); + glShaderSource(geometry_shader_source, 1, + (const char* const*) &geometry_shader_source, NULL); + glCompileShader(geometry_shader); + glGetShaderiv(geometry_shader, GL_COMPILE_STATUS, &success); + if (!success) { + glGetShaderInfoLog(geometry_shader, 1024, NULL, error); + honey_lua_throw_error(L, "error compiling geometry shader: %s", + error); + } + } + + /* fragment shader */ + fragment_shader = glCreateShader(GL_FRAGMENT_SHADER); glShaderSource(fragment_shader, 1, (const char* const*) &fragment_shader_source, NULL); glCompileShader(fragment_shader); glGetShaderiv(fragment_shader, GL_COMPILE_STATUS, &success); if (!success) { glGetShaderInfoLog(fragment_shader, 1024, NULL, error); - honey_lua_throw_error(L, "error compiling fragment shader: %s", - error); + honey_lua_throw_error(L, "error compiling fragment shader: %s", + error); } int program = glCreateProgram(); glAttachShader(program, vertex_shader); + if (choice == 1) + glAttachShader(program, geometry_shader); glAttachShader(program, fragment_shader); glLinkProgram(program); glGetShaderiv(program, GL_LINK_STATUS, &success); if (!success) { glGetShaderInfoLog(program, 1024, NULL, error); - honey_lua_throw_error(L, "error linking shader program: %s", - error); + honey_lua_throw_error(L, "error linking shader program: %s", + error); } glDeleteShader(vertex_shader); + if (choice == 1) + glDeleteShader(geometry_shader); glDeleteShader(fragment_shader); int* shader = lua_newuserdata(L, sizeof(int)); *shader = program; if (honey_shader_mt_ref == LUA_NOREF || - honey_shader_mt_ref == LUA_REFNIL) - honey_lua_throw_error - (L, "cannot create shader as there is no shader metatable set up."); + honey_shader_mt_ref == LUA_REFNIL) + honey_lua_throw_error + (L, "cannot create shader as there is no shader metatable set up."); lua_rawgeti(L, LUA_REGISTRYINDEX, honey_shader_mt_ref); lua_setmetatable(L, -2); @@ -97,8 +123,8 @@ int honey_shader_use(lua_State* L) { int *shader; honey_lua_parse_arguments - (L, 1, - 1, HONEY_USERDATA, &shader); + (L, 1, + 1, HONEY_USERDATA, &shader); glUseProgram(*shader); return 0; @@ -112,11 +138,11 @@ int honey_shader_set_int(lua_State* L) char* name; honey_lua_parse_arguments - (L, 1, - 3, - HONEY_USERDATA, &shader, - HONEY_STRING, &name, - HONEY_INTEGER, &value); + (L, 1, + 3, + HONEY_USERDATA, &shader, + HONEY_STRING, &name, + HONEY_INTEGER, &value); glUseProgram(*shader); unsigned int location = glGetUniformLocation(*shader, name); @@ -131,10 +157,10 @@ int honey_shader_set_float(lua_State* L) { int *shader; char* name; float value; honey_lua_parse_arguments - (L, 1, 3, - HONEY_USERDATA, &shader, - HONEY_STRING, &name, - HONEY_NUMBER, &value); + (L, 1, 3, + HONEY_USERDATA, &shader, + HONEY_STRING, &name, + HONEY_NUMBER, &value); glUseProgram(*shader); unsigned int location = glGetUniformLocation(*shader, name); @@ -149,16 +175,16 @@ int honey_shader_set_vec3(lua_State* L) { int *shader; char* name; honey_glm_array* array; honey_lua_parse_arguments - (L, 1, 3, - HONEY_USERDATA, &shader, - HONEY_STRING, &name, - HONEY_USERDATA, &array); + (L, 1, 3, + HONEY_USERDATA, &shader, + HONEY_STRING, &name, + HONEY_USERDATA, &array); if (array->type != VEC3) - honey_lua_throw_error(L, - "expected glm array of type VEC3 (%d), but got %d instead", - VEC3, - array->type); + honey_lua_throw_error(L, + "expected glm array of type VEC3 (%d), but got %d instead", + VEC3, + array->type); glUseProgram(*shader); unsigned int location = glGetUniformLocation(*shader, name); @@ -172,16 +198,16 @@ int honey_shader_set_vec4(lua_State* L) { int *shader; char* name; honey_glm_array* array; honey_lua_parse_arguments - (L, 1, 3, - HONEY_USERDATA, &shader, - HONEY_STRING, &name, - HONEY_USERDATA, &array); + (L, 1, 3, + HONEY_USERDATA, &shader, + HONEY_STRING, &name, + HONEY_USERDATA, &array); if (array->type != VEC4) - honey_lua_throw_error(L, - "expected glm array of type VEC4 (%d), but got %d instead", - VEC4, - array->type); + honey_lua_throw_error(L, + "expected glm array of type VEC4 (%d), but got %d instead", + VEC4, + array->type); glUseProgram(*shader); unsigned int location = glGetUniformLocation(*shader, name); @@ -195,17 +221,17 @@ int honey_shader_set_mat3(lua_State* L) { int *shader; char* name; honey_glm_array* array; honey_lua_parse_arguments - (L, 1, 3, - HONEY_USERDATA, &shader, - HONEY_STRING, &name, - HONEY_USERDATA, &array); + (L, 1, 3, + HONEY_USERDATA, &shader, + HONEY_STRING, &name, + HONEY_USERDATA, &array); if (array->type != MAT3) - honey_lua_throw_error(L, - "expected glm array of type MAT3 (%d), but got %d instead", - MAT3, - array->type); + honey_lua_throw_error(L, + "expected glm array of type MAT3 (%d), but got %d instead", + MAT3, + array->type); glUseProgram(*shader); unsigned int location = glGetUniformLocation(*shader, name); @@ -219,17 +245,17 @@ int honey_shader_set_mat4(lua_State* L) { int *shader; char* name; honey_glm_array* array; honey_lua_parse_arguments - (L, 1, 3, - HONEY_USERDATA, &shader, - HONEY_STRING, &name, - HONEY_USERDATA, &array); + (L, 1, 3, + HONEY_USERDATA, &shader, + HONEY_STRING, &name, + HONEY_USERDATA, &array); if (array->type != MAT4) - honey_lua_throw_error(L, - "expected glm array of type MAT4 (%d), but got %d instead", - MAT4, - array->type); + honey_lua_throw_error(L, + "expected glm array of type MAT4 (%d), but got %d instead", + MAT4, + array->type); glUseProgram(*shader); unsigned int location = glGetUniformLocation(*shader, name); @@ -243,7 +269,7 @@ int honey_shader_delete(lua_State* L) { int *shader; honey_lua_parse_arguments - (L, 1, 1, HONEY_USERDATA, &shader); + (L, 1, 1, HONEY_USERDATA, &shader); glDeleteProgram(*shader); return 0; diff --git a/src/shader.h b/src/shader.h index e1c97b7..ff00954 100644 --- a/src/shader.h +++ b/src/shader.h @@ -17,6 +17,7 @@ void honey_setup_shader(lua_State* L); /** @brief Create a new shader from source. * * @param[in] vertex_source The GLSL code for the vertex shader. + * @param[in, optional] geometry_source The GLSL code for the geometry shader. * @param[in] fragment_source The GLSL code for the fragment shader. * * @returns OpenGL handle for the compiled shader. |