diff options
| author | Vinson Lee <[email protected]> | 2019-02-18 19:27:27 -0800 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2019-02-22 23:07:26 -0800 |
| commit | 2bd08b8b9de9b10ecad5b808f56af2aa1bb8e007 (patch) | |
| tree | bb793fdcec4d75027a9af95026403f3878e0f3ba /src/gallium | |
| parent | 4c160b6bd8782a95516d78e039b0f070b4026b5d (diff) | |
gallium/auxiliary/vl: Fix duplicate symbol build errors.
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]>
Reviewed-by: Emil Velikov <[email protected]>
Reviewed-by: James Zhu <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_compositor_cs.c | 6 | ||||
| -rw-r--r-- | src/gallium/auxiliary/vl/vl_compositor_cs.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/vl/vl_compositor_cs.c b/src/gallium/auxiliary/vl/vl_compositor_cs.c index a3d416cc542..0e49c11c8bf 100644 --- a/src/gallium/auxiliary/vl/vl_compositor_cs.c +++ b/src/gallium/auxiliary/vl/vl_compositor_cs.c @@ -40,7 +40,7 @@ struct cs_viewport { int translate_y; }; -char *compute_shader_video_buffer = +const char *compute_shader_video_buffer = "COMP\n" "PROPERTY CS_FIXED_BLOCK_WIDTH 8\n" "PROPERTY CS_FIXED_BLOCK_HEIGHT 8\n" @@ -101,7 +101,7 @@ char *compute_shader_video_buffer = "END\n"; -char *compute_shader_weave = +const char *compute_shader_weave = "COMP\n" "PROPERTY CS_FIXED_BLOCK_WIDTH 8\n" "PROPERTY CS_FIXED_BLOCK_HEIGHT 8\n" @@ -173,7 +173,7 @@ char *compute_shader_weave = "END\n"; -char *compute_shader_rgba = +const char *compute_shader_rgba = "COMP\n" "PROPERTY CS_FIXED_BLOCK_WIDTH 8\n" "PROPERTY CS_FIXED_BLOCK_HEIGHT 8\n" diff --git a/src/gallium/auxiliary/vl/vl_compositor_cs.h b/src/gallium/auxiliary/vl/vl_compositor_cs.h index 7a203d327ed..8521add5613 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 const char *compute_shader_video_buffer; +extern const char *compute_shader_weave; +extern const char *compute_shader_rgba; /** * create compute shader |