OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl/linker: fix bug when checking precision qualifier

Browse Source 
According to GLSL ES 3.2 spec, see table in 9.2.1 "Linked Shaders"
section, the precision qualifier should match for uniform variables.
This also applies to previous GLSL ES 3.x specs.

This 'if' checks the condition for uniform variables, while for UBOs
it is checked in link_interface_blocks.cpp.

Fixes: b50b82b8a5
("glsl/es31: precision qualifier doesn't need to match in shader interface block members")

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Samuel Iglesias Gonsálvez
2018-01-29 13:46:28 +01:00
parent c757c9dc03
commit e207b2e2c8
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/glsl/linker.cpp
View File

@@ -1111,15 +1111,10 @@ cross_validate_globals(struct gl_shader_program *prog,
return; return;
} }
/* Only in GLSL ES 3.10, the precision qualifier should not match /* Check the precision qualifier matches for uniform variables on
* between block members defined in matched block names within a * GLSL ES.
* shader interface.
*
* In GLSL ES 3.00 and ES 3.20, precision qualifier for each block
* member should match.
*/ */
if (prog->IsES && (prog->data->Version != 310 || if (prog->IsES && !var->get_interface_type() &&
!var->get_interface_type()) &&
existing->data.precision != var->data.precision) { existing->data.precision != var->data.precision) {
if ((existing->data.used && var->data.used) || prog->data->Version >= 300) { if ((existing->data.used && var->data.used) || prog->data->Version >= 300) {
linker_error(prog, "declarations for %s `%s` have " linker_error(prog, "declarations for %s `%s` have "