fullscreen problems

[vg.git] / vg_loader.h

diff --git a/vg_loader.h b/vg_loader.h
index cdd29ebc302d80266e6041865d706571b296b68f..5d6d81a210ecbbd92553e6f992607a0714e6b07d 100644 (file)
--- a/vg_loader.h
+++ b/vg_loader.h
@@ -161,15 +161,16 @@ static void _vg_render_log(void)
 #endif
 }
 
-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 );
@@ -195,7 +196,7 @@ static int _vg_loader_thread( void *pfn ){
       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 );
 
@@ -219,17 +220,25 @@ 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
  */
-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;
@@ -243,4 +252,7 @@ static void vg_loader_step( void( *fn_load )(void), void( *fn_free )(void) )
    /* 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 */