AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: swizzle argument when there's a vector size mismatch

Browse Source 
GLSL IR operation arguments can sometimes have an implicit swizzle as a
result of a vector arg and a scalar arg, where the scalar argument is
implicitly expanded to the size of the vector argument.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103955
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Ilia Mirkin
2017-12-02 11:20:46 -05:00
parent 84c363fb09
commit 0332c7484b
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+24 -1
View File
@@ -1341,10 +1341,33 @@ glsl_to_tgsi_visitor::visit_expression(ir_expression* ir, st_src_reg *op)
st_dst_reg result_dst;
int vector_elements = ir->operands[0]->type->vector_elements;
if (ir->operands[1]) {
if (ir->operands[1] &&
ir->operation != ir_binop_interpolate_at_offset &&
ir->operation != ir_binop_interpolate_at_sample) {
st_src_reg *swz_op = NULL;
if (vector_elements > ir->operands[1]->type->vector_elements) {
assert(ir->operands[1]->type->vector_elements == 1);
swz_op = &op[1];
} else if (vector_elements < ir->operands[1]->type->vector_elements) {
assert(ir->operands[0]->type->vector_elements == 1);
swz_op = &op[0];
}
if (swz_op) {
uint16_t swizzle_x = GET_SWZ(swz_op->swizzle, 0);
swz_op->swizzle = MAKE_SWIZZLE4(swizzle_x, swizzle_x,
swizzle_x, swizzle_x);
}
vector_elements = MAX2(vector_elements,
ir->operands[1]->type->vector_elements);
}
if (ir->operands[2] &&
ir->operands[2]->type->vector_elements != vector_elements) {
/* This can happen with ir_triop_lrp, i.e. glsl mix */
assert(ir->operands[2]->type->vector_elements == 1);
uint16_t swizzle_x = GET_SWZ(op[2].swizzle, 0);
op[2].swizzle = MAKE_SWIZZLE4(swizzle_x, swizzle_x,
swizzle_x, swizzle_x);
}
this->result.file = PROGRAM_UNDEFINED;