From 0b2fa0eec697732817b08392e35879bb98da38a2 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Sat, 6 Apr 2013 10:33:25 -0700 Subject: [PATCH] glsl: Document lower_packed_varyings' "flat" requirement with an assert. To minimize the variety of type conversions that lower_packed_varyings needs to perform, it assumes that integral varyings are always qualified as "flat". link_varyings.cpp takes care of ensuring that this is the case (even in the circumstances where GLSL doesn't require it). This patch documents the assumption with an assertion, for ease in future debugging. Reviewed-by: Jordan Justen (cherry picked from commit 8687c40c2dde6cd64f67396333765f6aa9c82f6a) --- src/glsl/lower_packed_varyings.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/glsl/lower_packed_varyings.cpp b/src/glsl/lower_packed_varyings.cpp index 8a40f5e72e5..b64e896d922 100644 --- a/src/glsl/lower_packed_varyings.cpp +++ b/src/glsl/lower_packed_varyings.cpp @@ -178,6 +178,14 @@ lower_packed_varyings_visitor::run(exec_list *instructions) !this->needs_lowering(var)) continue; + /* This lowering pass is only capable of packing floats and ints + * together when their interpolation mode is "flat". Therefore, to be + * safe, caller should ensure that integral varyings always use flat + * interpolation, even when this is not required by GLSL. + */ + assert(var->interpolation == INTERP_QUALIFIER_FLAT || + !var->type->contains_integer()); + /* Change the old varying into an ordinary global. */ var->mode = ir_var_auto;