NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

glsl: ignore interface precision qualifier on desktop GL

Browse source 
This fixes linking failures with new GL45 linkage tests, no
regressions spotted on existing tests.

v2: add spec reference (Samuel)

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10373>
This commit is contained in:
Tapani Pälli 2021-04-21 09:54:38 +03:00 • committed by Marge Bot
parent bc3625f5a2
commit d93153a564
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/compiler/glsl/link_interface_blocks.cpp
View file

@ -109,8 +109,19 @@ intrastage_match(ir_variable *a,
struct gl_shader_program *prog,
bool match_precision)
{
/* From section 4.7 "Precision and Precision Qualifiers" in GLSL 4.50:
*
* "For the purposes of determining if an output from one shader
* stage matches an input of the next stage, the precision qualifier
* need not match."
*/
bool interface_type_match =
(prog->IsES ?
a->get_interface_type() == b->get_interface_type() :
a->get_interface_type()->compare_no_precision(b->get_interface_type()));
/* Types must match. */
if (a->get_interface_type() != b->get_interface_type()) {
if (!interface_type_match) {
/* Exception: if both the interface blocks are implicitly declared,
* don't force their types to match. They might mismatch due to the two
* shaders using different GLSL versions, and that's ok.