diff options
| author | Timothy Arceri <tarceri@itsqueeze.com> | 2017-04-21 17:04:10 +1000 |
|---|---|---|
| committer | Andres Gomez <agomez@igalia.com> | 2017-04-26 12:34:27 +0300 |
| commit | b7916134a0102218d6b4ec0d482bfd0e3aeeba43 (patch) | |
| tree | a722ff895d71d773d467f1a46a115811cc48c484 /src/mesa/program/ir_to_mesa.cpp | |
| parent | e98c9af5598038dc8eaef6f654c9e1f752a83a35 (diff) | |
mesa: validate sampler type across the whole program
Currently we were only making sure types were the same within a
single stage. This looks to have regressed with 953a0af8e3f73.
Fixes: 953a0af8e3f73 ("mesa: validate sampler uniforms during gluniform calls")
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
https://bugs.freedesktop.org/show_bug.cgi?id=97524
(cherry picked from commit d682f8aa8e0edd166166f87fcd774dd2d57b4180)
[Andres Gomez: there was an intermediate cleanup but this commit
basically brings everything that was missing back]
Signed-off-by: Andres Gomez <agomez@igalia.com>
Conflicts:
src/mesa/main/uniforms.c
Diffstat (limited to 'src/mesa/program/ir_to_mesa.cpp')
| -rw-r--r-- | src/mesa/program/ir_to_mesa.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index f7797e28fa3..29320ddcb7c 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -3060,6 +3060,11 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog) } if (prog->data->LinkStatus) { + /* Reset sampler validated to true, validation happens via the + * LinkShader call below. + */ + prog->SamplersValidated = GL_TRUE; + if (!ctx->Driver.LinkShader(ctx, prog)) { prog->data->LinkStatus = GL_FALSE; } |