KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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: 9364d66cb7 ("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>
This commit is contained in:
Vinson Lee 2019-02-18 19:27:27 -08:00
parent 4c160b6bd8
commit 2bd08b8b9d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/auxiliary/vl/vl_compositor_cs.c
View File

@ -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"

6
src/gallium/auxiliary/vl/vl_compositor_cs.h
View File

@ -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