fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 05:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

util/bitset: Make C++ wrapper trivially constructible.

Browse source 
In order to fix a build failure on compilers not implementing
unrestricted unions, which is a C++11 feature.

v2: Provide signed integer comparison and assignment operators instead
    of BITSET_WORD ones to avoid spurious ambiguity warnings on
    comparisons with a signed integer literal.

Fixes: ba79a90fb5 "glsl: Switch ast_type_qualifier to a 128-bit bitset."
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105238
Tested-by: Roland Scheidegger <sroland@vmware.com>
Tested-By: George Kyriazis <george.kyriazis@intel.com>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Francisco Jerez 2018-02-24 18:37:34 -08:00
parent 9f223d860b
commit 69b4a9d21d
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/glsl/ast.h
View file

@ -477,8 +477,6 @@ struct ast_type_qualifier {
DECLARE_BITSET_T(bitset_t, 128);
union flags {
flags() : i(0) {}
struct {
unsigned invariant:1;
unsigned precise:1;

1
src/compiler/glsl/glsl_parser.yy
View file

@ -96,7 +96,6 @@ static bool match_layout_qualifier(const char *s1, const char *s2,
%parse-param {struct _mesa_glsl_parse_state *state}
%union {
YYSTYPE() {}
int n;
int64_t n64;
float real;

37
src/util/bitset.h
View file

@ -142,23 +142,6 @@ __bitset_next_set(unsigned i, BITSET_WORD *tmp,
* it as, and N is the number of bits in the bitset.
*/
#define DECLARE_BITSET_T(T, N) struct T { \
/* XXX - Replace this with an implicitly-defined \
* constructor when support for C++11 defaulted \
* constructors can be assumed (available on GCC 4.4 and \
* later) in order to make the object trivially \
* constructible like a fundamental integer type for \
* convenience. \
*/ \
T() \
{ \
} \
\
T(BITSET_WORD x) \
{ \
for (unsigned i = 0; i < BITSET_WORDS(N); i++, x = 0) \
words[i] = x; \
} \
\
EXPLICIT_CONVERSION \
operator bool() const \
{ \
@ -168,6 +151,13 @@ __bitset_next_set(unsigned i, BITSET_WORD *tmp,
return false; \
} \
\
T & \
operator=(int x) \
{ \
const T c = {{ (BITSET_WORD)x }}; \
return *this = c; \
} \
\
friend bool \
operator==(const T &b, const T &c) \
{ \
@ -180,6 +170,19 @@ __bitset_next_set(unsigned i, BITSET_WORD *tmp,
return !(b == c); \
} \
\
friend bool \
operator==(const T &b, int x) \
{ \
const T c = {{ (BITSET_WORD)x }}; \
return b == c; \
} \
\
friend bool \
operator!=(const T &b, int x) \
{ \
return !(b == x); \
} \
\
friend T \
operator~(const T &b) \
{ \