[Mesa-dev] [PATCH] 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 --- 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 \ -- 2.9.3 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: glsl: build shader cache sources
I would have thought this commit [1] should have fixed it for android as weel as scons. [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=172c48cc15e2a7b42a7de8ff9164ad8733155667 On 19/02/17 08:23, Mauro Rossi wrote: 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 --- 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-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: glsl: build shader cache sources
On 02/19/2017 03:06 AM, Timothy Arceri wrote: I would have thought this commit [1] should have fixed it for android as weel as scons. [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=172c48cc15e2a7b42a7de8ff9164ad8733155667 Problem is that we have ENABLE_SHADER_CACHE on because it is linked to having SHA1 available, see following commit: 9f8dc3bf03ec825bae7041858dda6ca2e9a34363 not sure how we should deal with shader cache on Android, it will probably require some custom location to write to, otherwise I guess it should work similar as on desktop. On 19/02/17 08:23, Mauro Rossi wrote: 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 --- 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-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: glsl: build shader cache sources
On 19 February 2017 at 01:06, Timothy Arceri wrote: > I would have thought this commit [1] should have fixed it for android as > weel as scons. > As Tapani mentioned - I've opted to disable the code for scons (since it doesn't build) and enable it for everyone else... but I've missed this hunk. Plan is to a) ensure if builds for everyone and b) runs (I've poked distros to run make check). Such that you get less bugs as we start using it. I might have been too selfish and asked first :-] Mauro, I've pulled and updated your patches [1]. I believe all we need for those: 10/12 - seems like a hack, but it's a small one so please add a comment what/why we need libz ( 11/12 - leaning towards dropping it - makes things more obvious for non Android experts 12/12 - needs the piglit/deqp/other test results summary in the commit message -Emil [1] https://patchwork.freedesktop.org/project/mesa/patches/?submitter=mauro&state=&q=&archive=&delegate= ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: glsl: build shader cache sources
On 20 February 2017 at 09:31, Tapani Pälli wrote: > On 02/19/2017 03:06 AM, Timothy Arceri wrote: >> >> I would have thought this commit [1] should have fixed it for android as >> weel as scons. >> >> [1] >> >> https://cgit.freedesktop.org/mesa/mesa/commit/?id=172c48cc15e2a7b42a7de8ff9164ad8733155667 > > > Problem is that we have ENABLE_SHADER_CACHE on because it is linked to > having SHA1 available, see following commit: > > 9f8dc3bf03ec825bae7041858dda6ca2e9a34363 > > not sure how we should deal with shader cache on Android, it will probably > require some custom location to write to, otherwise I guess it should work > similar as on desktop. > Until 'the correct' place is established one can use MESA_GLSL_CACHE_DIR envvar ;-) -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [PATCH] android: glsl: build shader cache sources
On 02/20/2017 07:10 PM, Emil Velikov wrote: On 20 February 2017 at 09:31, Tapani Pälli wrote: On 02/19/2017 03:06 AM, Timothy Arceri wrote: I would have thought this commit [1] should have fixed it for android as weel as scons. [1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=172c48cc15e2a7b42a7de8ff9164ad8733155667 Problem is that we have ENABLE_SHADER_CACHE on because it is linked to having SHA1 available, see following commit: 9f8dc3bf03ec825bae7041858dda6ca2e9a34363 not sure how we should deal with shader cache on Android, it will probably require some custom location to write to, otherwise I guess it should work similar as on desktop. Until 'the correct' place is established one can use MESA_GLSL_CACHE_DIR envvar ;-) That's true, we can have some testing done with this to figure out a good place. Thanks; // Tapani ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev