panfrost: Remove unused anonymous enum variables.
authorVinson Lee <vlee@freedesktop.org>
Fri, 7 Feb 2020 21:25:12 +0000 (13:25 -0800)
committerMarge Bot <eric+marge@anholt.net>
Tue, 11 Feb 2020 03:26:04 +0000 (03:26 +0000)
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 <vlee@freedesktop.org>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
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

index 91086f1a0efa913e9581d380c9547bdb09c91c29..016502b319e1449952a48246d41f15c9dbc3385f 100644 (file)
@@ -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;