v4games
/
v4k-git-backup
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shader uniform caching

main
Dominik Madarász 2024-03-21 08:13:47 +01:00
parent 2f49239a9f
commit 4fdc043677
3 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engine/joint/v4k.h
View File

@ -370547,12 +370547,28 @@ void ssbo_unbind(){
glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0); glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
} }
typedef map(unsigned,int) uniform_binding;
static __thread unsigned last_shader = -1; static __thread unsigned last_shader = -1;
static __thread quarks_db uniform_names;
static __thread map(handle, uniform_binding) uniforms;
static static
int shader_uniform(const char *name) { int shader_uniform(const char *name) {
int ret = glGetUniformLocation(last_shader, name); do_once map_init(uniforms, less_int, hash_int);
if (!map_find(uniforms, last_shader)) {
uniform_binding names_map = 0;
map_init(names_map, less_int, hash_int);
map_insert(uniforms, last_shader, names_map);
}
uniform_binding names = *map_find(uniforms, last_shader);
unsigned name_hash = quark_intern(&uniform_names, name);
if (!map_find(names, name_hash)) {
map_insert(names, name_hash, glGetUniformLocation(last_shader, name));
}
// int ret = glGetUniformLocation(last_shader, name);
// if( ret < 0 ) PRINTF("!cannot find uniform '%s' in shader program %d\n", name, (int)last_shader ); // if( ret < 0 ) PRINTF("!cannot find uniform '%s' in shader program %d\n", name, (int)last_shader );
return ret; return *map_find(names, name_hash);
} }
unsigned shader_get_active() { return last_shader; } unsigned shader_get_active() { return last_shader; }
unsigned shader_bind(unsigned program) { unsigned ret = last_shader; return glUseProgram(last_shader = program), ret; } unsigned shader_bind(unsigned program) { unsigned ret = last_shader; return glUseProgram(last_shader = program), ret; }

20
engine/split/v4k_render.c
View File

@ -520,12 +520,28 @@ void ssbo_unbind(){
glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0); glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
} }
typedef map(unsigned,int) uniform_binding;
static __thread unsigned last_shader = -1; static __thread unsigned last_shader = -1;
static __thread quarks_db uniform_names;
static __thread map(handle, uniform_binding) uniforms;
static static
int shader_uniform(const char *name) { int shader_uniform(const char *name) {
int ret = glGetUniformLocation(last_shader, name); do_once map_init(uniforms, less_int, hash_int);
if (!map_find(uniforms, last_shader)) {
uniform_binding names_map = 0;
map_init(names_map, less_int, hash_int);
map_insert(uniforms, last_shader, names_map);
}
uniform_binding names = *map_find(uniforms, last_shader);
unsigned name_hash = quark_intern(&uniform_names, name);
if (!map_find(names, name_hash)) {
map_insert(names, name_hash, glGetUniformLocation(last_shader, name));
}
// int ret = glGetUniformLocation(last_shader, name);
// if( ret < 0 ) PRINTF("!cannot find uniform '%s' in shader program %d\n", name, (int)last_shader ); // if( ret < 0 ) PRINTF("!cannot find uniform '%s' in shader program %d\n", name, (int)last_shader );
return ret; return *map_find(names, name_hash);
} }
unsigned shader_get_active() { return last_shader; } unsigned shader_get_active() { return last_shader; }
unsigned shader_bind(unsigned program) { unsigned ret = last_shader; return glUseProgram(last_shader = program), ret; } unsigned shader_bind(unsigned program) { unsigned ret = last_shader; return glUseProgram(last_shader = program), ret; }

20
engine/v4k.c
View File

@ -17694,12 +17694,28 @@ void ssbo_unbind(){
glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0); glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
} }
typedef map(unsigned,int) uniform_binding;
static __thread unsigned last_shader = -1; static __thread unsigned last_shader = -1;
static __thread quarks_db uniform_names;
static __thread map(handle, uniform_binding) uniforms;
static static
int shader_uniform(const char *name) { int shader_uniform(const char *name) {
int ret = glGetUniformLocation(last_shader, name); do_once map_init(uniforms, less_int, hash_int);
if (!map_find(uniforms, last_shader)) {
uniform_binding names_map = 0;
map_init(names_map, less_int, hash_int);
map_insert(uniforms, last_shader, names_map);
}
uniform_binding names = *map_find(uniforms, last_shader);
unsigned name_hash = quark_intern(&uniform_names, name);
if (!map_find(names, name_hash)) {
map_insert(names, name_hash, glGetUniformLocation(last_shader, name));
}
// int ret = glGetUniformLocation(last_shader, name);
// if( ret < 0 ) PRINTF("!cannot find uniform '%s' in shader program %d\n", name, (int)last_shader ); // if( ret < 0 ) PRINTF("!cannot find uniform '%s' in shader program %d\n", name, (int)last_shader );
return ret; return *map_find(names, name_hash);
} }
unsigned shader_get_active() { return last_shader; } unsigned shader_get_active() { return last_shader; }
unsigned shader_bind(unsigned program) { unsigned ret = last_shader; return glUseProgram(last_shader = program), ret; } unsigned shader_bind(unsigned program) { unsigned ret = last_shader; return glUseProgram(last_shader = program), ret; }