X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_build_utils_shader.h;h=d1d2d05c9fd3cf242004ef4d7ab15a12cc6e3dee;hb=27b74ba6426c84c98ae777a095be31377e87037d;hp=72afd4e862de9449cbed2401a019ae58d9220b66;hpb=6d772a1e69860f4ae3e838e8c5c164754e6533ae;p=vg.git diff --git a/vg_build_utils_shader.h b/vg_build_utils_shader.h index 72afd4e..d1d2d05 100644 --- a/vg_build_utils_shader.h +++ b/vg_build_utils_shader.h @@ -148,7 +148,7 @@ int vg_build_shader( char *src_vert, /* path/to/vert.vs */ strcat( path, name ); strcat( path, ".h" ); - printf( "Compiling shader called '%s'\n", name ); + vg_low( "Compiling shader called '%s'\r", name ); FILE *header = fopen( path, "w" ); if( !header ) @@ -197,12 +197,15 @@ int vg_build_shader( char *src_vert, /* path/to/vert.vs */ types[] = { { "float", "float f", "glUniform1f(%s,f);" }, + { "bool", "int b", "glUniform1i(%s,b);" }, { "vec2", "v2f v", "glUniform2fv(%s,1,v);" }, { "vec3", "v3f v", "glUniform3fv(%s,1,v);" }, { "vec4", "v4f v", "glUniform4fv(%s,1,v);" }, { "sampler2D", "int i", "glUniform1i(%s,i);" }, + { "samplerCube", "int i", "glUniform1i(%s,i);" }, + { "mat2", "m2x2f m", "glUniformMatrix2fv(%s,1,GL_FALSE,(float*)m);" }, { "mat4x3", "m4x3f m", "glUniformMatrix4x3fv(%s,1,GL_FALSE,(float*)m);" }, { "mat3", "m3x3f m", "glUniformMatrix3fv(%s,1,GL_FALSE,(float*)m);" }, { "mat4", "m4x4f m", "glUniformMatrix4fv(%s,1,GL_FALSE,(float*)m);" },