diff options
| author | Andrii Simiklit <asimiklit.work@gmail.com> | 2020-04-30 12:44:32 +0300 |
|---|---|---|
| committer | andrii simiklit <asimiklit.work@gmail.com> | 2020-05-06 10:38:50 +0000 |
| commit | 91ffbd13abdeed46578ebce3f3fa45d574b9952a (patch) | |
| tree | 09bd5fa38972897c7edc0ad538a06a41df49aa0b | |
| parent | 1ce683181a1d5bd2da143c545071806e1bc3d612 (diff) | |
shader_runner: fix conditional jump depends on glsl_version
Check 'parse_results->found_glsl' value before 'parse_results->glsl_version' usage
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Andrii Simiklit <asimiklit.work@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/272>
| -rw-r--r-- | tests/shaders/shader_runner.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c index e8b7b9f30..eb34c5a0a 100644 --- a/tests/shaders/shader_runner.c +++ b/tests/shaders/shader_runner.c @@ -2051,7 +2051,8 @@ choose_required_gl_version(struct requirement_parse_results *parse_results, return; /* Possibly promote the GL version. */ - if (gl_version->num < required_gl_version_from_glsl_version( + if (parse_results->found_glsl + && gl_version->num < required_gl_version_from_glsl_version( parse_results->glsl_version.num)) { gl_version->num = required_gl_version_from_glsl_version( parse_results->glsl_version.num); |