projects
/
vg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revision 2
[vg.git]
/
vg_shader.c
diff --git
a/vg_shader.c
b/vg_shader.c
index 4b41c2e697cbc5ca19297a81cde52718fc3419a3..c12495c9dc93cf1909b3c45bcdb46390d3975ffe 100644
(file)
--- a/
vg_shader.c
+++ b/
vg_shader.c
@@
-138,8
+138,6
@@
int vg_shader_compile( struct vg_shader *shader )
shader->id = program;
shader->compiled = 1;
shader->id = program;
shader->compiled = 1;
- if( shader->link )
- shader->link();
return 1;
}
return 1;
}
@@
-152,6
+150,10
@@
static void vg_free_shader( struct vg_shader *shader )
}
}
}
}
+#ifdef VG_CUSTOM_SHADERS
+void vg_auto_shader_link(void);
+#endif
+
void vg_shaders_compile(void)
{
vg_info( "Compiling shaders\n" );
void vg_shaders_compile(void)
{
vg_info( "Compiling shaders\n" );
@@
-162,6
+164,10
@@
void vg_shaders_compile(void)
if( !vg_shader_compile( shader ) )
vg_fatal_error( "Failed to compile shader" );
}
if( !vg_shader_compile( shader ) )
vg_fatal_error( "Failed to compile shader" );
}
+
+#ifdef VG_CUSTOM_SHADERS
+ vg_auto_shader_link();
+#endif
}
int vg_shaders_live_recompile(int argc, const char *argv[])
}
int vg_shaders_live_recompile(int argc, const char *argv[])