diff options
| -rw-r--r-- | src/glsl/ir_set_program_inouts.cpp | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/glsl/ir_set_program_inouts.cpp index 97ead750aee..e877a201957 100644 --- a/src/glsl/ir_set_program_inouts.cpp +++ b/src/glsl/ir_set_program_inouts.cpp @@ -81,6 +81,13 @@ is_shader_inout(ir_variable *var) var->data.mode == ir_var_system_value; } +static inline bool +is_dual_slot(ir_variable *var) +{ + const glsl_type *type = var->type->without_array(); + return type == glsl_type::dvec4_type || type == glsl_type::dvec3_type; +} + static void mark(struct gl_program *prog, ir_variable *var, int offset, int len, bool is_fragment_shader) @@ -94,19 +101,32 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len, */ for (int i = 0; i < len; i++) { - GLbitfield64 bitfield = - BITFIELD64_BIT(var->data.location + var->data.index + offset + i); + bool dual_slot = is_dual_slot(var); + int idx = var->data.location + var->data.index + offset + i; + GLbitfield64 bitfield = BITFIELD64_BIT(idx); + + /* dvec3 and dvec4 take up 2 slots */ + if (dual_slot) { + idx += i; + bitfield |= bitfield << 1; + } if (var->data.mode == ir_var_shader_in) { prog->InputsRead |= bitfield; if (is_fragment_shader) { gl_fragment_program *fprog = (gl_fragment_program *) prog; - fprog->InterpQualifier[var->data.location + - var->data.index + offset + i] = + fprog->InterpQualifier[idx] = (glsl_interp_qualifier) var->data.interpolation; if (var->data.centroid) fprog->IsCentroid |= bitfield; if (var->data.sample) fprog->IsSample |= bitfield; + + /* Set the InterpQualifier of the next slot to the same as the + * current one, since dvec3 and dvec4 spans 2 slots. + */ + if (dual_slot) + fprog->InterpQualifier[idx + 1] = + (glsl_interp_qualifier) var->data.interpolation; } } else if (var->data.mode == ir_var_system_value) { prog->SystemValuesRead |= bitfield; |