#include "vg/vg.h"
#include "vg/vg_shader.h"
-VG_STATIC void vg_loader_start( void(*pfn)(void *data), void *data );
-VG_STATIC void vg_loader_step( void( *fn_load )(void), void( *fn_free )(void) );
+static void vg_loader_start( void(*pfn)(void *data), void *data );
+static void vg_loader_step( void( *fn_load )(void), void( *fn_free )(void) );
static struct vg_shader _shader_loader =
{
}
vg_loader;
-VG_STATIC void _vg_loader_init(void)
+static void _vg_loader_init(void)
{
float quad[] = { 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f,
0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 1.0f };
vg_fatal_error( "failed to compile shader" );
}
-VG_STATIC void _vg_loader_free(void)
+static void _vg_loader_free(void)
{
vg_info( "vg_loader_free\n" );
glDeleteVertexArrays( 1, &vg_loader.vao );
}
}
-VG_STATIC void _vg_render_log(void)
+static void _vg_render_log(void)
{
#if 0
ui_begin( vg.window_x, vg.window_y );
#endif
}
-VG_STATIC void _vg_loader_render_ring( float opacity )
-{
+static void _vg_loader_render_ring( f32 opacity ){
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBlendEquation(GL_FUNC_ADD);
+ opacity *= opacity;
+
glUseProgram( _shader_loader.id );
glUniform1f( glGetUniformLocation( _shader_loader.id, "uTime" ), vg.time );
- float ratio = (float)vg.window_x / (float)vg.window_y;
+ f32 ratio = (f32)vg.window_x / (f32)vg.window_y;
glUniform1f( glGetUniformLocation( _shader_loader.id, "uRatio"), ratio );
glUniform1f( glGetUniformLocation( _shader_loader.id, "uOpacity"), opacity );
glBindVertexArray( vg_loader.vao );
glDrawArrays( GL_TRIANGLES, 0, 6 );
}
-VG_STATIC void _vg_loader_render(void)
+static void _vg_loader_render(void)
{
glViewport( 0,0, vg.window_x, vg.window_y );
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
}
-VG_STATIC void vg_load_full(void);
+static void vg_load_full(void);
-VG_STATIC int _vg_loader_thread( void *pfn )
-{
+static int _vg_loader_thread( void *pfn ){
if( setjmp( vg.env_loader_exit ) )
return 0;
/* Run client loader */
- vg_info( "Starting client loader thread @%p\n", pfn );
+ //vg_info( "Starting client loader thread @%p\n", pfn );
void (*call_func)(void *data) = pfn;
call_func( vg.thread_data );
}
static int vg_loader_availible(void){
- return SDL_SemValue( vg.sem_loader );
+ if( SDL_SemValue( vg.sem_loader ) ){
+ if( !(vg_async.start) )
+ return 1;
+ }
+
+ return 0;
}
-VG_STATIC void vg_loader_start( void(*pfn)(void *data), void *data )
+static void vg_loader_start( void(*pfn)(void *data), void *data )
{
SDL_SemWait( vg.sem_loader );
vg.thread_data = data;
- SDL_CreateThread( _vg_loader_thread, "Loader thread", pfn );
+ SDL_CreateThread( _vg_loader_thread, "vg: loader", pfn );
}
/*
* Schedule something to be ran now, freed later. Checks in with engine status
*/
-VG_STATIC void vg_loader_step( void( *fn_load )(void), void( *fn_free )(void) )
-{
+static void _vg_loader_step( void( *fn_load )(void), void( *fn_free )(void),
+ const char *alias ){
+
+ u64 t0 = SDL_GetPerformanceCounter();
+ vg.time_hp_last = vg.time_hp;
+
if( fn_load )
fn_load();
+ u64 udt = SDL_GetPerformanceCounter() - t0;
+ double dt = (double)udt / (double)SDL_GetPerformanceFrequency();
+ vg_info( "ltime [%p] %s: %fs\n", fn_load, alias, dt );
+
if( fn_free ){
struct loader_free_step step;
step.fn_free = fn_free;
/* TODO: There was a quit checker here, re-add this? */
}
+#define vg_loader_step( FN, FN_FREE )\
+ _vg_loader_step( FN, FN_FREE, #FN )
+
#endif /* VG_LOADER_H */