Revert "glsl: relax input->output validation for SSO programs"
This reverts commit1aa5738e66
. This patch incorrectly asumed that for SSOs no inner interface matching check was needed. From the ARB_separate_shader_objects spec v.25: " With separable program objects, interfaces between shader stages may involve the outputs from one program object and the inputs from a second program object. For such interfaces, it is not possible to detect mismatches at link time, because the programs are linked separately. When each such program is linked, all inputs or outputs interfacing with another program stage are treated as active. The linker will generate an executable that assumes the presence of a compatible program on the other side of the interface. If a mismatch between programs occurs, no GL error will be generated, but some or all of the inputs on the interface will be undefined." This completes the fix from commit:3be05dd267
("glsl/linker: don't fail non static used inputs without matching outputs") Fixes:1aa5738e66
("glsl: relax input->output validation for SSO programs") Cc: Tapani Pälli <tapani.palli@intel.com> Cc: Timothy Arceri <tarceri@itsqueeze.com> Cc: Ilia Mirkin <imirkin@alum.mit.edu> Cc: Samuel Iglesias Gonsálvez <siglesias@igalia.com> Cc: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
parent
422882e78f
commit
ab28dca033
|
@ -823,7 +823,7 @@ cross_validate_outputs_to_inputs(struct gl_context *ctx,
|
|||
*/
|
||||
assert(!input->data.assigned);
|
||||
if (input->data.used && !input->get_interface_type() &&
|
||||
!input->data.explicit_location && !prog->SeparateShader)
|
||||
!input->data.explicit_location)
|
||||
linker_error(prog,
|
||||
"%s shader input `%s' "
|
||||
"has no matching output in the previous stage\n",
|
||||
|
|
Loading…
Reference in New Issue