On 2019-02-19 10:58 a.m., Emil Velikov wrote: > On Tue, 19 Feb 2019 at 03:32, Vinson Lee <[email protected]> wrote: >> CXXLD gallium_dri.la >> duplicate symbol _compute_shader_video_buffer in: >> >> ../../../../src/gallium/auxiliary/.libs/libgalliumvl.a(libgalliumvl_la-vl_compositor.o) >> >> ../../../../src/gallium/auxiliary/.libs/libgalliumvl.a(libgalliumvl_la-vl_compositor_cs.o) >> duplicate symbol _compute_shader_weave in: >> >> ../../../../src/gallium/auxiliary/.libs/libgalliumvl.a(libgalliumvl_la-vl_compositor.o) >> >> ../../../../src/gallium/auxiliary/.libs/libgalliumvl.a(libgalliumvl_la-vl_compositor_cs.o) >> duplicate symbol _compute_shader_rgba in: >> >> ../../../../src/gallium/auxiliary/.libs/libgalliumvl.a(libgalliumvl_la-vl_compositor.o) >> >> ../../../../src/gallium/auxiliary/.libs/libgalliumvl.a(libgalliumvl_la-vl_compositor_cs.o) >> >> Fixes: 9364d66cb7f7 ("gallium/auxiliary/vl: Add video compositor compute >> shader render") >> Signed-off-by: Vinson Lee <[email protected]> >> --- >> src/gallium/auxiliary/vl/vl_compositor_cs.h | 6 +++--- >> 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/src/gallium/auxiliary/vl/vl_compositor_cs.h >> b/src/gallium/auxiliary/vl/vl_compositor_cs.h >> index 7a203d327eda..a73a8755fc2a 100644 >> --- a/src/gallium/auxiliary/vl/vl_compositor_cs.h >> +++ b/src/gallium/auxiliary/vl/vl_compositor_cs.h >> @@ -32,9 +32,9 @@ >> >> #include "vl_compositor.h" >> >> -char *compute_shader_video_buffer; >> -char *compute_shader_weave; >> -char *compute_shader_rgba; >> +extern char *compute_shader_video_buffer; >> +extern char *compute_shader_weave; >> +extern char *compute_shader_rgba; >> > Please make them also "const" - in both here and C file. > > With that the patch is > Reviewed-by: Emil Velikov <[email protected]>
Agreed! This patch is Reviewed-by: James Zhu <[email protected]> James > > Thanks > Emil _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
