OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Generate code for constant ir_triop_fma and ir_triop_bitfield_extract expressions

Browse Source 
ir_triop_bitfield_extract is a little weird because the second and third
operand and aways int, so they may differ in type from the first
operand.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Acked-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Ian Romanick
2016-07-12 12:30:19 -07:00
parent da61c94db8
commit 8954a019f7
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/glsl/ir_expression_operation.py
View File

@@ -181,7 +181,7 @@ constant_template_vector_scalar = mako.template.Template("""\
switch (op[0]->type->base_type) { switch (op[0]->type->base_type) {
% for dst_type, src_types in op.signatures(): % for dst_type, src_types in op.signatures():
case ${src_types[0].glsl_type}: case ${src_types[0].glsl_type}:
data.${dst_type.union_field}[c] = ${op.get_c_expression(src_types, ("c0", "c1"))}; data.${dst_type.union_field}[c] = ${op.get_c_expression(src_types, ("c0", "c1", "c2"))};
break; break;
% endfor % endfor
default: default:
@@ -297,18 +297,22 @@ class operation(object):
return constant_template5.render(op=self) return constant_template5.render(op=self)
else: else:
return constant_template3.render(op=self) return constant_template3.render(op=self)
elif self.num_operands == 3:
return constant_template3.render(op=self)
return None return None
def get_c_expression(self, types, indices=("c", "c")): def get_c_expression(self, types, indices=("c", "c", "c")):
src0 = "op[0]->value.{}[{}]".format(types[0].union_field, indices[0]) src0 = "op[0]->value.{}[{}]".format(types[0].union_field, indices[0])
src1 = "op[1]->value.{}[{}]".format(types[1].union_field, indices[1]) if len(types) >= 2 else "ERROR" src1 = "op[1]->value.{}[{}]".format(types[1].union_field, indices[1]) if len(types) >= 2 else "ERROR"
src2 = "op[2]->value.{}[{}]".format(types[2].union_field, indices[2]) if len(types) >= 3 else "ERROR"
expr = self.c_expression[types[0].union_field] if types[0].union_field in self.c_expression else self.c_expression['default'] expr = self.c_expression[types[0].union_field] if types[0].union_field in self.c_expression else self.c_expression['default']
return expr.format(src0=src0, return expr.format(src0=src0,
src1=src1) src1=src1,
src2=src2)
def signatures(self): def signatures(self):
@@ -533,7 +537,7 @@ ir_expression_operation = [
operation("interpolate_at_sample", 2), operation("interpolate_at_sample", 2),
# Fused floating-point multiply-add, part of ARB_gpu_shader5. # Fused floating-point multiply-add, part of ARB_gpu_shader5.
operation("fma", 3), operation("fma", 3, source_types=real_types, c_expression="{src0} * {src1} + {src2}"),
operation("lrp", 3), operation("lrp", 3),
@@ -545,7 +549,11 @@ ir_expression_operation = [
# See also lower_instructions_visitor::ldexp_to_arith # See also lower_instructions_visitor::ldexp_to_arith
operation("csel", 3), operation("csel", 3),
operation("bitfield_extract", 3), operation("bitfield_extract", 3,
all_signatures=((int_type, (uint_type, int_type, int_type)),
(int_type, (int_type, int_type, int_type))),
c_expression={'u': "bitfield_extract_uint({src0}, {src1}, {src2})",
'i': "bitfield_extract_int({src0}, {src1}, {src2})"}),
# Generate a value with one field of a vector changed # Generate a value with one field of a vector changed
# #