Mesa (glsl2): glsl2: Add ir_unop_fract as an expression type.
Eric Anholt
anholt at kemper.freedesktop.org
Thu Jul 1 18:27:50 UTC 2010
Module: Mesa
Branch: glsl2
Commit: d925c9173009e9e5d48df30b30aaef22753183aa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d925c9173009e9e5d48df30b30aaef22753183aa
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jul 1 10:37:11 2010 -0700
glsl2: Add ir_unop_fract as an expression type.
Most backends will prefer seeing this to seeing (a - floor(a)), so
represent it explicitly.
---
src/glsl/builtin_function.cpp | 8 ++++----
src/glsl/builtins/110/fract | 8 ++++----
src/glsl/ir.cpp | 2 ++
src/glsl/ir.h | 1 +
src/glsl/ir_constant_expression.cpp | 18 ++++++++++++++++++
src/mesa/shader/ir_to_mesa.cpp | 4 ++++
6 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index b7dbc6b..30ba6a5 100644
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -781,22 +781,22 @@ static const char *builtins_110_fract = {
" (signature float\n"
" (parameters\n"
" (declare (in) float x))\n"
- " ((return (expression float - (var_ref x) (expression float floor (var_ref x))))))\n"
+ " ((return (expression float fract (var_ref x)))))\n"
"\n"
" (signature vec2\n"
" (parameters\n"
" (declare (in) vec2 x))\n"
- " ((return (expression vec2 - (var_ref x) (expression vec2 floor (var_ref x))))))\n"
+ " ((return (expression vec2 fract (var_ref x)))))\n"
"\n"
" (signature vec3\n"
" (parameters\n"
" (declare (in) vec3 x))\n"
- " ((return (expression vec3 - (var_ref x) (expression vec3 floor (var_ref x))))))\n"
+ " ((return (expression vec3 fract (var_ref x)))))\n"
"\n"
" (signature vec4\n"
" (parameters\n"
" (declare (in) vec4 x))\n"
- " ((return (expression vec4 - (var_ref x) (expression vec4 floor (var_ref x))))))\n"
+ " ((return (expression vec4 fract (var_ref x)))))\n"
"))\n"
"\n"
};
diff --git a/src/glsl/builtins/110/fract b/src/glsl/builtins/110/fract
index 46741bb..3f0763d 100644
--- a/src/glsl/builtins/110/fract
+++ b/src/glsl/builtins/110/fract
@@ -2,21 +2,21 @@
(signature float
(parameters
(declare (in) float x))
- ((return (expression float - (var_ref x) (expression float floor (var_ref x))))))
+ ((return (expression float fract (var_ref x)))))
(signature vec2
(parameters
(declare (in) vec2 x))
- ((return (expression vec2 - (var_ref x) (expression vec2 floor (var_ref x))))))
+ ((return (expression vec2 fract (var_ref x)))))
(signature vec3
(parameters
(declare (in) vec3 x))
- ((return (expression vec3 - (var_ref x) (expression vec3 floor (var_ref x))))))
+ ((return (expression vec3 fract (var_ref x)))))
(signature vec4
(parameters
(declare (in) vec4 x))
- ((return (expression vec4 - (var_ref x) (expression vec4 floor (var_ref x))))))
+ ((return (expression vec4 fract (var_ref x)))))
))
diff --git a/src/glsl/ir.cpp b/src/glsl/ir.cpp
index 60ee36d..4257842 100644
--- a/src/glsl/ir.cpp
+++ b/src/glsl/ir.cpp
@@ -72,6 +72,7 @@ ir_expression::get_num_operands(ir_expression_operation op)
1, /* ir_unop_trunc */
1, /* ir_unop_ceil */
1, /* ir_unop_floor */
+ 1, /* ir_unop_fract */
1, /* ir_unop_sin */
1, /* ir_unop_cos */
@@ -137,6 +138,7 @@ static const char *const operator_strs[] = {
"trunc",
"ceil",
"floor",
+ "fract",
"sin",
"cos",
"dFdx",
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index 00b0076..f478137 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -528,6 +528,7 @@ enum ir_expression_operation {
ir_unop_trunc,
ir_unop_ceil,
ir_unop_floor,
+ ir_unop_fract,
/*@}*/
/**
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index c6348ac..548217c 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -187,6 +187,24 @@ ir_constant_visitor::visit(ir_expression *ir)
}
break;
+ case ir_unop_fract:
+ for (c = 0; c < ir->operands[0]->type->components(); c++) {
+ switch (ir->type->base_type) {
+ case GLSL_TYPE_UINT:
+ data.u[c] = 0;
+ break;
+ case GLSL_TYPE_INT:
+ data.i[c] = 0;
+ break;
+ case GLSL_TYPE_FLOAT:
+ data.f[c] = op[0]->value.f[c] - floor(op[0]->value.f[c]);
+ break;
+ default:
+ assert(0);
+ }
+ }
+ break;
+
case ir_unop_neg:
for (c = 0; c < ir->operands[0]->type->components(); c++) {
switch (ir->type->base_type) {
diff --git a/src/mesa/shader/ir_to_mesa.cpp b/src/mesa/shader/ir_to_mesa.cpp
index b270e2d..2f2096e 100644
--- a/src/mesa/shader/ir_to_mesa.cpp
+++ b/src/mesa/shader/ir_to_mesa.cpp
@@ -782,6 +782,10 @@ ir_to_mesa_visitor::visit(ir_expression *ir)
case ir_unop_floor:
ir_to_mesa_emit_op1(ir, OPCODE_FLR, result_dst, op[0]);
break;
+ case ir_unop_fract:
+ ir_to_mesa_emit_op1(ir, OPCODE_FRC, result_dst, op[0]);
+ break;
+
case ir_binop_min:
ir_to_mesa_emit_op2(ir, OPCODE_MIN, result_dst, op[0], op[1]);
break;
More information about the mesa-commit
mailing list