Mesa (master): glsl/es: precision qualifier doesn't need to match in UBOs
Samuel Iglesias Gonsálvez
samuelig at kemper.freedesktop.org
Mon Dec 4 09:19:09 UTC 2017
Module: Mesa
Branch: master
Commit: fc6d55952d08ea03d133c1178871b0d4d289a0cf
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc6d55952d08ea03d133c1178871b0d4d289a0cf
Author: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
Date: Thu Nov 9 09:58:25 2017 +0100
glsl/es: precision qualifier doesn't need to match in UBOs
They might mismatch due to the two shaders using different GLSL
versions, and that's ok in desktop GL. In ES, precision qualifiers
don't need to match.
Signed-off-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
---
src/compiler/glsl/link_interface_blocks.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/glsl/link_interface_blocks.cpp b/src/compiler/glsl/link_interface_blocks.cpp
index 510d4f71bb..c2c3b58f82 100644
--- a/src/compiler/glsl/link_interface_blocks.cpp
+++ b/src/compiler/glsl/link_interface_blocks.cpp
@@ -114,7 +114,7 @@ intrastage_match(ir_variable *a,
*/
if ((a->data.how_declared != ir_var_declared_implicitly ||
b->data.how_declared != ir_var_declared_implicitly) &&
- (!prog->IsES || prog->data->Version != 310 ||
+ (!prog->IsES ||
interstage_member_mismatch(prog, a->get_interface_type(),
b->get_interface_type())))
return false;
More information about the mesa-commit
mailing list