diff options
| -rw-r--r-- | src/compiler/glsl/ir.h | 3 | ||||
| -rw-r--r-- | src/compiler/glsl/ir_print_visitor.cpp | 14 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_packed_varyings.cpp | 9 |
3 files changed, 24 insertions, 2 deletions
diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h index 24f510ea990..df3ccfd883f 100644 --- a/src/compiler/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -917,6 +917,9 @@ public: /** * Vertex stream output identifier. + * + * For packed outputs, bit 31 is set and bits [2*i+1,2*i] indicate the + * stream of the i-th component. */ unsigned stream; diff --git a/src/compiler/glsl/ir_print_visitor.cpp b/src/compiler/glsl/ir_print_visitor.cpp index 703169eb976..d4014265ef3 100644 --- a/src/compiler/glsl/ir_print_visitor.cpp +++ b/src/compiler/glsl/ir_print_visitor.cpp @@ -177,6 +177,17 @@ void ir_print_visitor::visit(ir_variable *ir) if (ir->data.explicit_component) snprintf(component, sizeof(component), "component=%i ", ir->data.location_frac); + char stream[32] = {0}; + if (ir->data.stream & (1u << 31)) { + if (ir->data.stream & ~(1u << 31)) { + snprintf(stream, sizeof(stream), "stream(%u,%u,%u,%u) ", + ir->data.stream & 3, (ir->data.stream >> 2) & 3, + (ir->data.stream >> 4) & 3, (ir->data.stream >> 6) & 3); + } + } else if (ir->data.stream) { + snprintf(stream, sizeof(stream), "stream%u ", ir->data.stream); + } + const char *const cent = (ir->data.centroid) ? "centroid " : ""; const char *const samp = (ir->data.sample) ? "sample " : ""; const char *const patc = (ir->data.patch) ? "patch " : ""; @@ -187,13 +198,12 @@ void ir_print_visitor::visit(ir_variable *ir) "in ", "out ", "inout ", "const_in ", "sys ", "temporary " }; STATIC_ASSERT(ARRAY_SIZE(mode) == ir_var_mode_count); - const char *const stream [] = {"", "stream1 ", "stream2 ", "stream3 "}; const char *const interp[] = { "", "smooth", "flat", "noperspective" }; STATIC_ASSERT(ARRAY_SIZE(interp) == INTERP_MODE_COUNT); fprintf(f, "(%s%s%s%s%s%s%s%s%s%s%s) ", binding, loc, component, cent, samp, patc, inv, prec, mode[ir->data.mode], - stream[ir->data.stream], + stream, interp[ir->data.interpolation]); print_type(f, ir->type); diff --git a/src/compiler/glsl/lower_packed_varyings.cpp b/src/compiler/glsl/lower_packed_varyings.cpp index b16f25fc93d..7a2f187229b 100644 --- a/src/compiler/glsl/lower_packed_varyings.cpp +++ b/src/compiler/glsl/lower_packed_varyings.cpp @@ -531,6 +531,14 @@ lower_packed_varyings_visitor::lower_rvalue(ir_rvalue *rvalue, ir_dereference *packed_deref = this->get_packed_varying_deref(location, unpacked_var, name, vertex_index); + if (unpacked_var->data.stream != 0) { + assert(unpacked_var->data.stream < 4); + ir_variable *packed_var = packed_deref->variable_referenced(); + for (unsigned i = 0; i < components; ++i) { + packed_var->data.stream |= + unpacked_var->data.stream << (2 * (location_frac + i)); + } + } ir_swizzle *swizzle = new(this->mem_ctx) ir_swizzle(packed_deref, swizzle_values, components); if (this->mode == ir_var_shader_out) { @@ -639,6 +647,7 @@ lower_packed_varyings_visitor::get_packed_varying_deref( packed_var->data.location = location; packed_var->data.precision = unpacked_var->data.precision; packed_var->data.always_active_io = unpacked_var->data.always_active_io; + packed_var->data.stream = 1u << 31; unpacked_var->insert_before(packed_var); this->packed_varyings[slot] = packed_var; } else { |