diff options
| author | Rob Clark <[email protected]> | 2015-10-10 13:26:03 -0400 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2015-10-16 19:33:37 -0400 |
| commit | 183db3a64557d5d231ef58ab5666286f323ff333 (patch) | |
| tree | f3216746bf09ad9d42e381b8c623f902f7d41740 /src/glsl | |
| parent | 60690cb3b3082b7397c48769ec28b5570f6b7d7e (diff) | |
glsl: move half<->float convertion to util
Needed in NIR too, so move out of mesa/main/imports.c
Reviewed-by: Jason Ekstrand <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/Makefile.am | 1 | ||||
| -rw-r--r-- | src/glsl/ir_constant_expression.cpp | 1 | ||||
| -rw-r--r-- | src/glsl/nir/nir_constant_expressions.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am index 32653911f6c..347919b1d0a 100644 --- a/src/glsl/Makefile.am +++ b/src/glsl/Makefile.am @@ -160,6 +160,7 @@ glsl_compiler_SOURCES = \ glsl_compiler_LDADD = \ libglsl.la \ $(top_builddir)/src/libglsl_util.la \ + $(top_builddir)/src/util/libmesautil.la \ $(PTHREAD_LIBS) glsl_test_SOURCES = \ diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp index 309b6b72b5b..67ed3605a8c 100644 --- a/src/glsl/ir_constant_expression.cpp +++ b/src/glsl/ir_constant_expression.cpp @@ -36,6 +36,7 @@ #include <math.h> #include "main/core.h" /* for MAX2, MIN2, CLAMP */ #include "util/rounding.h" /* for _mesa_roundeven */ +#include "util/half_float.h" #include "ir.h" #include "glsl_types.h" #include "program/hash_table.h" diff --git a/src/glsl/nir/nir_constant_expressions.py b/src/glsl/nir/nir_constant_expressions.py index 8fd9b1039a7..2ba8554645d 100644 --- a/src/glsl/nir/nir_constant_expressions.py +++ b/src/glsl/nir/nir_constant_expressions.py @@ -29,6 +29,7 @@ template = """\ #include <math.h> #include "main/core.h" #include "util/rounding.h" /* for _mesa_roundeven */ +#include "util/half_float.h" #include "nir_constant_expressions.h" #if defined(__SUNPRO_CC) |