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

glsl2: Make cross() be an expression operation.

Browse Source 
ARB_fp, ARB_vp, Mesa IR, and the 965 vertex shader all have
instructions for cross.  Shaves 12 Mesa instructions off of a
66-instruction shader I have.
This commit is contained in:
Eric Anholt
2010-07-13 15:37:57 -07:00
parent 87a2ee8db6
commit 9be7f63813
6 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/glsl/builtin_function.cpp
View File

@@ -486,17 +486,7 @@ static const char *builtins_110_cross = {
" (parameters\n" " (parameters\n"
" (declare (in) vec3 arg0)\n" " (declare (in) vec3 arg0)\n"
" (declare (in) vec3 arg1))\n" " (declare (in) vec3 arg1))\n"
" ((declare () vec3 t)\n" " ((return (expression vec3 cross (var_ref arg0) (var_ref arg1)))))\n"
" (assign (constant bool (1)) (swiz x (var_ref t))\n"
" (expression float - (expression float * (swiz y (var_ref arg0)) (swiz z (var_ref arg1)))\n"
" (expression float * (swiz y (var_ref arg1)) (swiz z (var_ref arg0)))))\n"
" (assign (constant bool (1)) (swiz y (var_ref t))\n"
" (expression float - (expression float * (swiz z (var_ref arg0)) (swiz x (var_ref arg1)))\n"
" (expression float * (swiz z (var_ref arg1)) (swiz x (var_ref arg0)))))\n"
" (assign (constant bool (1)) (swiz z (var_ref t))\n"
" (expression float - (expression float * (swiz x (var_ref arg0)) (swiz y (var_ref arg1)))\n"
" (expression float * (swiz x (var_ref arg1)) (swiz y (var_ref arg0)))))\n"
" (return (var_ref t))))\n"
"))\n" "))\n"
}; };

12
src/glsl/builtins/110/cross
View File

@@ -3,15 +3,5 @@
(parameters (parameters
(declare (in) vec3 arg0) (declare (in) vec3 arg0)
(declare (in) vec3 arg1)) (declare (in) vec3 arg1))
((declare () vec3 t) ((return (expression vec3 cross (var_ref arg0) (var_ref arg1)))))
(assign (constant bool (1)) (swiz x (var_ref t))
(expression float - (expression float * (swiz y (var_ref arg0)) (swiz z (var_ref arg1)))
(expression float * (swiz y (var_ref arg1)) (swiz z (var_ref arg0)))))
(assign (constant bool (1)) (swiz y (var_ref t))
(expression float - (expression float * (swiz z (var_ref arg0)) (swiz x (var_ref arg1)))
(expression float * (swiz z (var_ref arg1)) (swiz x (var_ref arg0)))))
(assign (constant bool (1)) (swiz z (var_ref t))
(expression float - (expression float * (swiz x (var_ref arg0)) (swiz y (var_ref arg1)))
(expression float * (swiz x (var_ref arg1)) (swiz y (var_ref arg0)))))
(return (var_ref t))))
)) ))

2
src/glsl/ir.cpp
View File

@@ -104,6 +104,7 @@ ir_expression::get_num_operands(ir_expression_operation op)
2, /* ir_binop_logic_or */ 2, /* ir_binop_logic_or */
2, /* ir_binop_dot */ 2, /* ir_binop_dot */
2, /* ir_binop_cross */
2, /* ir_binop_min */ 2, /* ir_binop_min */
2, /* ir_binop_max */ 2, /* ir_binop_max */
@@ -163,6 +164,7 @@ static const char *const operator_strs[] = {
"^^", "^^",
"||", "||",
"dot", "dot",
"cross",
"min", "min",
"max", "max",
"pow", "pow",

1
src/glsl/ir.h
View File

@@ -609,6 +609,7 @@ enum ir_expression_operation {
ir_binop_logic_or, ir_binop_logic_or,
ir_binop_dot, ir_binop_dot,
ir_binop_cross,
ir_binop_min, ir_binop_min,
ir_binop_max, ir_binop_max,

13
src/glsl/ir_constant_expression.cpp
View File

@@ -459,8 +459,19 @@ ir_constant_visitor::visit(ir_expression *ir)
assert(0); assert(0);
} }
} }
break; break;
case ir_binop_cross:
assert(op[0]->type == glsl_type::vec3_type);
assert(op[1]->type == glsl_type::vec3_type);
data.f[0] = (op[0]->value.f[1] * op[1]->value.f[2] -
op[1]->value.f[1] * op[0]->value.f[2]);
data.f[1] = (op[0]->value.f[2] * op[1]->value.f[0] -
op[1]->value.f[2] * op[0]->value.f[0]);
data.f[2] = (op[0]->value.f[0] * op[1]->value.f[1] -
op[1]->value.f[0] * op[0]->value.f[1]);
break;
case ir_binop_add: case ir_binop_add:
assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar); assert(op[0]->type == op[1]->type || op0_scalar || op1_scalar);
for (unsigned c = 0, c0 = 0, c1 = 0; for (unsigned c = 0, c0 = 0, c1 = 0;

5
src/mesa/shader/ir_to_mesa.cpp
View File

@@ -781,6 +781,11 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
op[0], op[1]); op[0], op[1]);
} }
break; break;
case ir_binop_cross:
ir_to_mesa_emit_op2(ir, OPCODE_XPD, result_dst, op[0], op[1]);
break;
case ir_unop_sqrt: case ir_unop_sqrt:
ir_to_mesa_emit_scalar_op1(ir, OPCODE_RSQ, result_dst, op[0]); ir_to_mesa_emit_scalar_op1(ir, OPCODE_RSQ, result_dst, op[0]);
ir_to_mesa_emit_scalar_op1(ir, OPCODE_RCP, result_dst, result_src); ir_to_mesa_emit_scalar_op1(ir, OPCODE_RCP, result_dst, result_src);