thepigeongenerator/mcaselector-lite
1
0
Fork 0
mirror of https://github.com/thepigeongenerator/mcaselector-lite.git synced 2025-12-17 09:25:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup shader code

Browse Source 
added a cast to uintptr_t, since we're (pretty) certain that both array
pointers point to the same array.
Other than that, made the shader initialization code more consise
This commit is contained in:
Quinn
2025-06-16 13:12:00 +02:00
parent 87af7f293f
commit 38aa65942f
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/io/shader.c
View File

@@ -11,14 +11,16 @@
#define NAM_S(name) _binary_res_##name##_start // name of a start variable #define NAM_S(name) _binary_res_##name##_start // name of a start variable
#define NAM_E(name) _binary_res_##name##_end // name of an end variable #define NAM_E(name) _binary_res_##name##_end // name of an end variable
// macro for generating the variable declarations
#define DEF_GLSL(name) \
extern char const NAM_S(name)[]; \
extern char const NAM_E(name)[]
// NOTE: we are currently just sucking up the memory costs for ease. We can either include the source files themselves. Or use compression, where I'd prefer the latter for ease of installation. // NOTE: we are currently just sucking up the memory costs for ease. We can either include the source files themselves. Or use compression, where I'd prefer the latter for ease of installation.
// NOLINTBEGIN (bugprone-reserved-identifier) // NOLINTBEGIN (bugprone-reserved-identifier)
extern char const NAM_S(sh_vert_glsl)[]; DEF_GLSL(sh_vert_glsl);
extern char const NAM_E(sh_vert_glsl)[]; DEF_GLSL(sh_frag_glsl);
extern char const NAM_S(sh_frag_glsl)[]; DEF_GLSL(sh_geom_glsl);
extern char const NAM_E(sh_frag_glsl)[];
extern char const NAM_S(sh_geom_glsl)[];
extern char const NAM_E(sh_geom_glsl)[];
// NOLINTEND // NOLINTEND
/* compile a shader */ /* compile a shader */
@@ -34,13 +36,13 @@ static GLuint shader_compile(GLenum type, char const* src, size_t len) {
char log[ilen]; char log[ilen];
glGetShaderInfoLog(shader, ilen, &ilen, log); glGetShaderInfoLog(shader, ilen, &ilen, log);
log[ilen - 1] = '\0'; // terminate the string one character sooner since the log includes a newline log[ilen - 1] = '\0'; // terminate the string one character sooner since the log includes a newline
error("error whilst compiling shader type '0x%x': '%s'", type, log); error("error whilst compiling shader type '0X%X': '%s'", type, log);
} }
return shader; return shader;
} }
#define COMPILE_NAME(_type, _name) shader_compile(_type, NAM_S(_name), NAM_E(_name) - NAM_S(_name)) #define COMPILE_NAME(_type, _name) shader_compile(_type, NAM_S(_name), (uintptr_t)NAM_E(_name) - (uintptr_t)NAM_S(_name))
int shader_init(GLuint pipe) { int shader_init(GLuint pipe) {
GLuint vs = COMPILE_NAME(GL_VERTEX_SHADER, sh_vert_glsl); GLuint vs = COMPILE_NAME(GL_VERTEX_SHADER, sh_vert_glsl);
GLuint fs = COMPILE_NAME(GL_FRAGMENT_SHADER, sh_frag_glsl); GLuint fs = COMPILE_NAME(GL_FRAGMENT_SHADER, sh_frag_glsl);