summaryrefslogtreecommitdiffstats
path: root/src/mesa/Android.libmesa_glsl_utils.mk
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2013-01-16 19:49:40 -0800
committerChad Versace <[email protected]>2013-01-24 21:24:07 -0800
commiteac030e38e3cdd4ed4534516e3d3a50c8a372719 (patch)
tree29b81f500914cd9371e10625809f4286048b6a96 /src/mesa/Android.libmesa_glsl_utils.mk
parent1fafd008392d5240dc36d0c72978cef62e21b4b1 (diff)
mesa,glsl: Move round_to_even() from glsl to mesa/main (v2)
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. v2: Fix Android build. Reviewed-by: Ian Romanick <[email protected]> Signed-off-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa/Android.libmesa_glsl_utils.mk')
-rw-r--r--src/mesa/Android.libmesa_glsl_utils.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk
index 9c5f3493cbd..47f2e151b40 100644
--- a/src/mesa/Android.libmesa_glsl_utils.mk
+++ b/src/mesa/Android.libmesa_glsl_utils.mk
@@ -35,10 +35,13 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_glsl_utils
-LOCAL_C_INCLUDES := $(MESA_TOP)/src/glsl
+LOCAL_C_INCLUDES := \
+ $(MESA_TOP)/src/glsl \
+ $(MESA_TOP)/src/mapi
LOCAL_SRC_FILES := \
main/hash_table.c \
+ main/imports.c \
program/prog_hash_table.c \
program/symbol_table.c
@@ -54,10 +57,13 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_glsl_utils
LOCAL_IS_HOST_MODULE := true
-LOCAL_C_INCLUDES := $(MESA_TOP)/src/glsl
+LOCAL_C_INCLUDES := \
+ $(MESA_TOP)/src/glsl \
+ $(MESA_TOP)/src/mapi
LOCAL_SRC_FILES := \
main/hash_table.c \
+ main/imports.c \
program/prog_hash_table.c \
program/symbol_table.c