Module: Mesa
Branch: master
Commit: 9e3d66c1e58f14d9c5e8df2a5ba7fdcf04b3258e
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e3d66c1e58f14d9c5e8df2a5ba7fdcf04b3258e

Author: Mauro Rossi <issor.or...@gmail.com>
Date:   Sat Feb 18 22:23:18 2017 +0100

android: glsl: build shader cache sources

Fixes the following building errors:

external/mesa/src/compiler/glsl/linker.cpp:4642: error: undefined reference
 to 'shader_cache_read_program_metadata(gl_context*, gl_shader_program*)'
external/mesa/src/mesa/program/ir_to_mesa.cpp:3135: error: undefined reference
 to 'shader_cache_write_program_metadata(gl_context*, gl_shader_program*)'
clang++: error: linker command failed with exit code 1
...
external/mesa/src/mesa/program/ir_to_mesa.cpp:3135: error: undefined reference
 to 'shader_cache_write_program_metadata(gl_context*, gl_shader_program*)'
external/mesa/src/compiler/glsl/linker.cpp:4642: error: undefined reference
 to 'shader_cache_read_program_metadata(gl_context*, gl_shader_program*)'
clang++: error: linker command failed with exit code 1 (use -v to see 
invocation)
ninja: build stopped: subcommand failed.
build/core/ninja.mk:148: recipe for target 'ninja_wrapper' failed
make: *** [ninja_wrapper] Error 1

Fixes: 9f8dc3bf03e ("utils: build sha1/disk cache only with
Android/Autoconf")
Acked-by: Emil Velikov <emil.veli...@collabora.com>

---

 src/compiler/Android.glsl.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/compiler/Android.glsl.mk b/src/compiler/Android.glsl.mk
index dcc356f..0aabafa 100644
--- a/src/compiler/Android.glsl.mk
+++ b/src/compiler/Android.glsl.mk
@@ -36,6 +36,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
        $(LIBGLCPP_FILES) \
        $(LIBGLSL_FILES) \
+       $(LIBGLSL_SHADER_CACHE_FILES)
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to