Module: Mesa Branch: master Commit: 63345a359656246df83b416743031c1836457d23 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=63345a359656246df83b416743031c1836457d23
Author: Vinson Lee <[email protected]> Date: Fri Feb 7 13:25:12 2020 -0800 panfrost: Remove unused anonymous enum variables. This patch fix these build errors with GCC 10. /usr/bin/ld: src/gallium/drivers/panfrost/libpanfrost.a(pan_resource.c.o):src/panfrost/midgard/midgard_compile.h:52: multiple definition of `pan_sysval'; src/gallium/drivers/panfrost/libpanfrost.a(pan_screen.c.o):src/panfrost/midgard/midgard_compile.h:52: first defined here /usr/bin/ld: src/gallium/drivers/panfrost/libpanfrost.a(pan_resource.c.o):src/panfrost/midgard/midgard_compile.h:68: multiple definition of `pan_special_attributes'; src/gallium/drivers/panfrost/libpanfrost.a(pan_screen.c.o):src/panfrost/midgard/midgard_compile.h:68: first defined here Fixes: 7e8de5a707f7 ("panfrost: Implement system values") Fixes: 306800d747bc ("pan/midgard: Lower gl_VertexID/gl_InstanceID to attributes") Signed-off-by: Vinson Lee <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3752> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3752> --- src/panfrost/midgard/midgard_compile.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panfrost/midgard/midgard_compile.h b/src/panfrost/midgard/midgard_compile.h index 91086f1a0ef..016502b319e 100644 --- a/src/panfrost/midgard/midgard_compile.h +++ b/src/panfrost/midgard/midgard_compile.h @@ -49,7 +49,7 @@ enum { PAN_SYSVAL_SSBO = 4, PAN_SYSVAL_NUM_WORK_GROUPS = 5, PAN_SYSVAL_SAMPLER = 7, -} pan_sysval; +}; #define PAN_TXS_SYSVAL_ID(texidx, dim, is_array) \ ((texidx) | ((dim) << 7) | ((is_array) ? (1 << 9) : 0)) @@ -65,7 +65,7 @@ enum { PAN_VERTEX_ID = 16, PAN_INSTANCE_ID = 17, PAN_MAX_ATTRIBUTE -} pan_special_attributes; +}; typedef struct { int work_register_count; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
