From: Vinson Lee <vlee@freedesktop.org>
Date: Tue, 19 Feb 2019 03:27:27 +0000 (-0800)
Subject: gallium/auxiliary/vl: Fix duplicate symbol build errors.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2bd08b8b9de9b10ecad5b808f56af2aa1bb8e007;p=mesa.git

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 <vlee@freedesktop.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: James Zhu <James.Zhu@amd.com>
---

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