aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/glsl
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2023-12-07 15:56:20 +0100
committerhjk <hjk@qt.io>2023-12-08 07:21:14 +0000
commit3e62f5d5222ea6de51b736a5dce86ed126b6d6e3 (patch)
tree1b2363006ba6e54c9521c1a82647d3b890e83434 /src/libs/glsl
parent960ac1adf4855ce73d36c265a6b08da0e478bd93 (diff)
Random warning cleanup
Clang16 in C++20 mode. Change-Id: I87801e362a3ba6e38cfebd319a7aee2ed4e45568 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/libs/glsl')
-rw-r--r--src/libs/glsl/glsllexer.h25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/libs/glsl/glsllexer.h b/src/libs/glsl/glsllexer.h
index b01c6a67a3..8c11514432 100644
--- a/src/libs/glsl/glsllexer.h
+++ b/src/libs/glsl/glsllexer.h
@@ -40,20 +40,17 @@ public:
Lexer(Engine *engine, const char *source, unsigned size);
~Lexer();
- enum
- {
- // Extra flag bits added to tokens by Lexer::classify() that
- // indicate which variant of GLSL the keyword belongs to.
- Variant_GLSL_120 = 0x00010000, // 1.20 and higher
- Variant_GLSL_150 = 0x00020000, // 1.50 and higher
- Variant_GLSL_400 = 0x00040000, // 4.00 and higher
- Variant_GLSL_ES_100 = 0x00080000, // ES 1.00 and higher
- Variant_VertexShader = 0x00200000,
- Variant_FragmentShader = 0x00400000,
- Variant_Reserved = 0x80000000,
- Variant_Mask = 0xFFFF0000,
- Variant_All = 0xFFFF0000
- };
+ // Extra flag bits added to tokens by Lexer::classify() that
+ // indicate which variant of GLSL the keyword belongs to.
+ static const int Variant_GLSL_120 = 0x00010000; // 1.20 and higher
+ static const int Variant_GLSL_150 = 0x00020000; // 1.50 and higher
+ static const int Variant_GLSL_400 = 0x00040000; // 4.00 and higher
+ static const int Variant_GLSL_ES_100 = 0x00080000; // ES 1.00 and higher
+ static const int Variant_VertexShader = 0x00200000;
+ static const int Variant_FragmentShader = 0x00400000;
+ static const int Variant_Reserved = 0x80000000;
+ static const int Variant_Mask = 0xFFFF0000;
+ static const int Variant_All = 0xFFFF0000;
union Value {
int i;