GitHub/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-06-06 20:10:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vo_gpu: fix possible segfault on shader miscompile

Browse Source 
Iterations after the first time will fail to realize that the pass was
never created. This function's logic and control flow is so annoying...
This commit is contained in:
Niklas Haas
2017-09-23 16:36:58 +02:00
parent 365b1d4f3d
commit 89cdccfa6c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/out/gpu/shader_cache.c
+6 -5
View File
@@ -571,10 +571,6 @@ static bool create_pass(struct gl_shader_cache *sc, struct sc_entry *entry)
MP_TARRAY_APPEND(sc, params.inputs, params.num_inputs, ubo_input);
}
entry->pass = sc->ra->fns->renderpass_create(sc->ra, &params);
if (!entry->pass)
goto error;
if (sc->ubo_size) {
struct ra_buf_params ubo_params = {
.type = RA_BUF_TYPE_UNIFORM,
@@ -589,6 +585,10 @@ static bool create_pass(struct gl_shader_cache *sc, struct sc_entry *entry)
}
}
entry->pass = sc->ra->fns->renderpass_create(sc->ra, &params);
if (!entry->pass)
goto error;
if (entry->pass && cache_filename) {
bstr nc = entry->pass->params.cached_program;
if (nc.len && !bstr_equals(params.cached_program, nc)) {
@@ -869,7 +869,8 @@ static void gl_sc_generate(struct gl_shader_cache *sc,
sc->error_state = true;
MP_TARRAY_APPEND(sc, sc->entries, sc->num_entries, entry);
}
if (sc->error_state) {
if (!entry->pass) {
sc->current_shader = NULL;
return;
}