X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_shader.h;h=8e17da33e22d8c60baa0dbf49ac7d3b97d3c92c7;hb=180732e57e4e684034a3b2df624dfb539707d892;hp=19c1fc2644023a3108f0e68233023fe92c859f3b;hpb=79c56f6fa4b07352dd7cce8627246f04508955a7;p=fishladder.git

diff --git a/vg/vg_shader.h b/vg/vg_shader.h
index 19c1fc2..8e17da3 100644
--- a/vg/vg_shader.h
+++ b/vg/vg_shader.h
@@ -19,8 +19,11 @@ static inline int static_str_index( const char *list[], int len, const char *str
 }
 #pragma GCC diagnostic pop
 
-#define SHADER_UNIFORM( NAME, U ) NAME##_auto_uniforms[ STR_STATIC_INDEX( NAME##_auto_names, U ) ]
-#define SHADER_UNIFORM_NAME( NAME, UID ) NAME##_auto_names[ UID ]
+#define SHADER_NAME( NAME ) (NAME##_static_shader.program)
+#define SHADER_USE( NAME ) glUseProgram( NAME##_static_shader.program )
+
+#define SHADER_UNIFORM( NAME, U ) NAME##_shader_uniforms[ STR_STATIC_INDEX( NAME##_shader_names, U ) ]
+#define SHADER_UNIFORM_NAME( NAME, UID ) NAME##_shader_names[ UID ]
 #define STR_STATIC_INDEX( LIST, STR ) static_str_index( LIST, vg_list_size(LIST), STR )
 
 #define UNIFORMS(...) __VA_ARGS__