Move round_to_even's definition to mesa/main so that _mesa_float_to_half()
can use it in order to eliminate rounding bias.
In additon to moving the fuction definition, prefix its name with "_mesa",
just as all other functions in mesa/main are prefixed.
Signed-off-by: Chad Versace <chad.vers...@linux.intel.com>
---
src/glsl/Makefile.am | 2 ++
src/glsl/builtin_compiler/Makefile.am | 1 +
src/glsl/ir_constant_expression.cpp | 21 +--------------------
src/mesa/main/imports.c | 20 ++++++++++++++++++++
src/mesa/main/imports.h | 3 +++
5 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 0f545d5..cf84f0e 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -50,6 +50,7 @@ libglsl_la_LDFLAGS =
glsl_compiler_SOURCES = \
$(top_srcdir)/src/mesa/main/hash_table.c \
+ $(top_srcdir)/src/mesa/main/imports.c \
$(top_srcdir)/src/mesa/program/prog_hash_table.c \
$(top_srcdir)/src/mesa/program/symbol_table.c \
$(GLSL_COMPILER_CXX_FILES)
@@ -58,6 +59,7 @@ glsl_compiler_LDADD = libglsl.la
glsl_test_SOURCES = \
$(top_srcdir)/src/mesa/main/hash_table.c \
+ $(top_srcdir)/src/mesa/main/imports.c \
$(top_srcdir)/src/mesa/program/prog_hash_table.c \
$(top_srcdir)/src/mesa/program/symbol_table.c \
$(GLSL_SRCDIR)/standalone_scaffolding.cpp \
diff --git a/src/glsl/builtin_compiler/Makefile.am
b/src/glsl/builtin_compiler/Makefile.am
index d27aca5..700bc98 100644
--- a/src/glsl/builtin_compiler/Makefile.am
+++ b/src/glsl/builtin_compiler/Makefile.am
@@ -56,6 +56,7 @@ builtin_compiler_SOURCES = \
$(LIBGLSL_FILES) \
$(LIBGLSL_CXX_FILES) \
$(top_srcdir)/src/mesa/main/hash_table.c \
+ $(top_srcdir)/src/mesa/main/imports.c \
$(top_srcdir)/src/mesa/program/prog_hash_table.c \
$(top_srcdir)/src/mesa/program/symbol_table.c \
$(GLSL_COMPILER_CXX_FILES) \
diff --git a/src/glsl/ir_constant_expression.cpp
b/src/glsl/ir_constant_expression.cpp
index 17b54b9..7678090 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -40,25 +40,6 @@
#include "glsl_types.h"
#include "program/hash_table.h"
-/* Using C99 rounding functions for roundToEven() implementation is
- * difficult, because round(), rint, and nearbyint() are affected by
- * fesetenv(), which the application may have done for its own
- * purposes. Mesa's IROUND macro is close to what we want, but it
- * rounds away from 0 on n + 0.5.
- */
-static int
-round_to_even(float val)
-{
- int rounded = IROUND(val);
-
- if (val - floor(val) == 0.5) {
- if (rounded % 2 != 0)
- rounded += val > 0 ? -1 : 1;
- }
-
- return rounded;
-}
-
static float
dot(ir_constant *op0, ir_constant *op1)
{
@@ -279,7 +260,7 @@ ir_expression::constant_expression_value(struct hash_table
*variable_context)
case ir_unop_round_even:
assert(op[0]->type->base_type == GLSL_TYPE_FLOAT);
for (unsigned c = 0; c < op[0]->type->components(); c++) {
- data.f[c] = round_to_even(op[0]->value.f[c]);
+ data.f[c] = _mesa_round_to_even(op[0]->value.f[c]);
}
break;
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 76f835e..26c91dc 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -314,6 +314,26 @@ _mesa_bitcount_64(uint64_t n)
#endif
+/* Using C99 rounding functions for roundToEven() implementation is
+ * difficult, because round(), rint, and nearbyint() are affected by
+ * fesetenv(), which the application may have done for its own
+ * purposes. Mesa's IROUND macro is close to what we want, but it
+ * rounds away from 0 on n + 0.5.
+ */
+int
+_mesa_round_to_even(float val)
+{
+ int rounded = IROUND(val);
+
+ if (val - floor(val) == 0.5) {
+ if (rounded % 2 != 0)
+ rounded += val > 0 ? -1 : 1;
+ }
+
+ return rounded;
+}
+
+
/**
* Convert a 4-byte float to a 2-byte half float.
* Based on code from:
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 8446ea2..4b78381 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -548,6 +548,9 @@ _mesa_fls(unsigned int n)
#endif
}
+extern int
+_mesa_round_to_even(float val);
+
extern GLhalfARB
_mesa_float_to_half(float f);
--
1.8.1.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
