mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2210 from Flakebi/ubsan

Browse Source 
Explicitly mark EShLanguageMask as unsigned
This commit is contained in:
John Kessenich 2020-05-11 10:43:58 -06:00 committed by GitHub
commit 5d88edf13a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glslang/MachineIndependent/Versions.h
View File

@ -52,7 +52,7 @@
// Don't maintain an ordinal set of enums (0,1,2,3...) to avoid all possible // Don't maintain an ordinal set of enums (0,1,2,3...) to avoid all possible
// defects from mixing the two different forms. // defects from mixing the two different forms.
// //
typedef enum { typedef enum : unsigned {
EBadProfile = 0, EBadProfile = 0,
ENoProfile = (1 << 0), // only for desktop, before profiles showed up ENoProfile = (1 << 0), // only for desktop, before profiles showed up
ECoreProfile = (1 << 1), ECoreProfile = (1 << 1),

4
glslang/Public/ShaderLang.h
View File

@ -109,7 +109,7 @@ typedef enum {
LAST_ELEMENT_MARKER(EShLangCount), LAST_ELEMENT_MARKER(EShLangCount),
} EShLanguage; // would be better as stage, but this is ancient now } EShLanguage; // would be better as stage, but this is ancient now
typedef enum { typedef enum : unsigned {
EShLangVertexMask = (1 << EShLangVertex), EShLangVertexMask = (1 << EShLangVertex),
EShLangTessControlMask = (1 << EShLangTessControl), EShLangTessControlMask = (1 << EShLangTessControl),
EShLangTessEvaluationMask = (1 << EShLangTessEvaluation), EShLangTessEvaluationMask = (1 << EShLangTessEvaluation),
@ -240,7 +240,7 @@ typedef enum {
// //
// Message choices for what errors and warnings are given. // Message choices for what errors and warnings are given.
// //
enum EShMessages { enum EShMessages : unsigned {
EShMsgDefault = 0, // default is to give all required errors and extra warnings EShMsgDefault = 0, // default is to give all required errors and extra warnings
EShMsgRelaxedErrors = (1 << 0), // be liberal in accepting input EShMsgRelaxedErrors = (1 << 0), // be liberal in accepting input
EShMsgSuppressWarnings = (1 << 1), // suppress all warnings, except those required by the specification EShMsgSuppressWarnings = (1 << 1), // suppress all warnings, except those required by the specification