util: reinstate ENUM_PACKED

gets rid of warning: 'gcc_struct' attribute ignored [-Wattributes] introduced by !23338

Fixes: 86532fa21d ("util: Use the gcc_struct attribute for packed structures in mingw")
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23478>
This commit is contained in:
Michel Zou
2023-06-06 21:18:17 +02:00
committed by Marge Bot
parent 4b48d377ba
commit badb85edb8
12 changed files with 41 additions and 38 deletions
+1 -1
View File
@@ -41,7 +41,7 @@
extern "C" {
#endif
enum PACKED gl_uniform_driver_format {
enum ENUM_PACKED gl_uniform_driver_format {
uniform_native = 0, /**< Store data in the native format. */
uniform_int_float, /**< Store integer data as floats. */
};
+3 -3
View File
@@ -902,7 +902,7 @@ typedef struct nir_register {
#define nir_foreach_register_safe(reg, reg_list) \
foreach_list_typed_safe(nir_register, reg, node, reg_list)
typedef enum PACKED {
typedef enum ENUM_PACKED {
nir_instr_type_alu,
nir_instr_type_deref,
nir_instr_type_call,
@@ -1265,7 +1265,7 @@ typedef struct {
* The values in this enum are carefully chosen so that the sized type is
* just the unsized type OR the number of bits.
*/
typedef enum PACKED {
typedef enum ENUM_PACKED {
nir_type_invalid = 0, /* Not a valid type */
nir_type_int = 2,
nir_type_uint = 4,
@@ -5300,7 +5300,7 @@ bool
nir_lower_sysvals_to_varyings(nir_shader *shader,
const struct nir_lower_sysvals_to_varyings_options *options);
enum PACKED nir_lower_tex_packing {
enum ENUM_PACKED nir_lower_tex_packing {
/** No packing */
nir_lower_tex_packing_none = 0,
/**
+1 -1
View File
@@ -25,7 +25,7 @@
#include "nir.h"
enum PACKED ssa_ranges {
enum ENUM_PACKED ssa_ranges {
unknown = 0,
lt_zero,
le_zero,
+1 -1
View File
@@ -32,7 +32,7 @@
struct nir_builder;
typedef enum PACKED {
typedef enum ENUM_PACKED {
nir_search_value_expression,
nir_search_value_variable,
nir_search_value_constant,
+2 -2
View File
@@ -1157,7 +1157,7 @@ enum tess_primitive_mode
/**
* Mesa primitive types for both GL and Vulkan:
*/
enum PACKED mesa_prim
enum ENUM_PACKED mesa_prim
{
MESA_PRIM_POINTS,
MESA_PRIM_LINES,
@@ -1318,7 +1318,7 @@ enum cl_sampler_filter_mode {
#define MAT_BIT_BACK_INDEXES (1<<MAT_ATTRIB_BACK_INDEXES)
/** An enum representing what kind of input gl_SubgroupSize is. */
enum PACKED gl_subgroup_size
enum ENUM_PACKED gl_subgroup_size
{
/** Actual subgroup size, whatever that happens to be */
SUBGROUP_SIZE_VARYING = 0,