- /* If this was a uniform block, then we're not going to actually use the
- * variable (we're only going to use it to compute offsets), so don't
- * declare it in the shader.
- */
- if (var->data.mode == nir_var_uniform && var->interface_type)
- break;
-
- /* Builtin blocks are lowered to individual variables during SPIR-V ->
- * NIR, so don't declare them either.
- */
- if (builtin_block)
+ /* Interface variables aren't actually going to be referenced by the
+ * generated NIR, so we don't put them in the list */
+ if (interface_type)