projects
/
vg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace VG_STATIC -> static
[vg.git]
/
vg_loader.h
diff --git
a/vg_loader.h
b/vg_loader.h
index e93926c835116df743f97fd0ce1756544656ec59..cdd29ebc302d80266e6041865d706571b296b68f 100644
(file)
--- a/
vg_loader.h
+++ b/
vg_loader.h
@@
-14,8
+14,8
@@
#include "vg/vg.h"
#include "vg/vg_shader.h"
#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 =
{
static struct vg_shader _shader_loader =
{
@@
-90,7
+90,7
@@
static struct vg_loader
}
vg_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 };
{
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 };
@@
-110,7
+110,7
@@
VG_STATIC void _vg_loader_init(void)
vg_fatal_error( "failed to compile shader" );
}
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_info( "vg_loader_free\n" );
glDeleteVertexArrays( 1, &vg_loader.vao );
@@
-126,7
+126,7
@@
VG_STATIC void _vg_loader_free(void)
}
}
}
}
-
VG_STATIC
void _vg_render_log(void)
+
static
void _vg_render_log(void)
{
#if 0
ui_begin( vg.window_x, vg.window_y );
{
#if 0
ui_begin( vg.window_x, vg.window_y );
@@
-161,7
+161,7
@@
VG_STATIC void _vg_render_log(void)
#endif
}
#endif
}
-
VG_STATIC
void _vg_loader_render_ring( float opacity )
+
static
void _vg_loader_render_ring( float opacity )
{
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
{
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@
-176,7
+176,7
@@
VG_STATIC void _vg_loader_render_ring( float opacity )
glDrawArrays( GL_TRIANGLES, 0, 6 );
}
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 );
{
glViewport( 0,0, vg.window_x, vg.window_y );
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
@@
-188,10
+188,9
@@
VG_STATIC void _vg_loader_render(void)
}
}
-
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;
if( setjmp( vg.env_loader_exit ) )
return 0;
@@
-207,10
+206,15
@@
VG_STATIC int _vg_loader_thread( void *pfn )
}
static int vg_loader_availible(void){
}
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 );
{
SDL_SemWait( vg.sem_loader );
@@
-221,7
+225,7
@@
VG_STATIC void vg_loader_start( void(*pfn)(void *data), void *data )
/*
* Schedule something to be ran now, freed later. Checks in with engine status
*/
/*
* 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) )
{
if( fn_load )
fn_load();
{
if( fn_load )
fn_load();