projects
/
vg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e8b03af
)
int uniforms, fix race condition
author
hgn
<hgodden00@gmail.com>
Wed, 28 Feb 2024 00:27:45 +0000
(
00:27
+0000)
committer
hgn
<hgodden00@gmail.com>
Wed, 28 Feb 2024 00:27:45 +0000
(
00:27
+0000)
vg_build_utils_shader.h
patch
|
blob
|
history
vg_engine.c
patch
|
blob
|
history
diff --git
a/vg_build_utils_shader.h
b/vg_build_utils_shader.h
index cb4cc4b8894ef5f488f1e0430a4007ea470b9458..1e1c8b1c399f76ae31f3f1c91424773beae54003 100644
(file)
--- a/
vg_build_utils_shader.h
+++ b/
vg_build_utils_shader.h
@@
-226,6
+226,7
@@
int vg_build_shader( char *src_vert, /* path/to/vert.vs */
{
{ "float", "f32 f", "glUniform1f(%s,f);" },
{ "bool", "int b", "glUniform1i(%s,b);" },
+ { "int", "int b", "glUniform1i(%s,b);" },
{ "vec2", "v2f v", "glUniform2fv(%s,1,v);" },
{ "vec3", "v3f v", "glUniform3fv(%s,1,v);" },
{ "vec4", "v4f v", "glUniform4fv(%s,1,v);" },
diff --git
a/vg_engine.c
b/vg_engine.c
index 268594f915f7df4b6b51b038a61ac5ae8e8435ce..0e59528a47c61328ded87fe6703013905cd4722c 100644
(file)
--- a/
vg_engine.c
+++ b/
vg_engine.c
@@
-113,6
+113,7
@@
static void _vg_load_full( void *data )
{
vg_preload();
vg_tex2d_replace_with_error_async( &vg.tex_missing );
+ vg_async_stall();
vg_ui.tex_bg = vg.tex_missing;
/* internal */