jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1521 from Andersama/patch-31

Browse Source 
libobs: Fix crash when pixel or vertex shader are missing
This commit is contained in:
Jim 2019-01-04 06:37:53 -08:00 committed by GitHub
commit 62935bfef9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libobs/graphics/effect-parser.c
View File

@ -1556,6 +1556,9 @@ static void ep_makeshaderstring(struct effect_parser *ep,
dstr_init(&call_str);
if (!token)
return;
while (token->type != CFTOKEN_NONE && is_whitespace(*token->str.array))
token++;
@ -1755,13 +1758,17 @@ static bool ep_compile_pass(struct effect_parser *ep,
pass->section = EFFECT_PASS;
if (!ep_compile_pass_shader(ep, tech, pass, pass_in, idx,
GS_SHADER_VERTEX))
GS_SHADER_VERTEX)) {
success = false;
blog(LOG_ERROR, "Pass (%i) <%s> missing vertex shader!",
idx, pass->name ? pass->name : "");
}
if (!ep_compile_pass_shader(ep, tech, pass, pass_in, idx,
GS_SHADER_PIXEL))
GS_SHADER_PIXEL)) {
success = false;
blog(LOG_ERROR, "Pass (%i) <%s> missing pixel shader!",
idx, pass->name ? pass->name : "");
}
return success;
}