BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove implicit fallthrough (#3518)

Browse source 
This is intended so that downstream projects consuming glslang with FetchContent or similar means can use `-Wimplicit-fallthrough` without getting warning spam.

I've used my best judgement to determine whether the implicit fallthrough was desired, or was simply unreachable code.
`std::unreachable` is unavailable until C++23, but I saw places where `default: assert(0);` was used, so copied that.
There were a few places where some code might actually have been reachable and intended to return a value that represented an error, so someone should double check that kind of thing.
This commit is contained in:
Chris Djali 2024-02-19 22:45:45 +00:00 • committed by GitHub
parent 339552c5c3
commit 8ca24e7cf1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 30 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SPIRV/GlslangToSpv.cpp
View file

@ -8346,7 +8346,7 @@ spv::Id TGlslangToSpvTraverser::createSubgroupOperation(glslang::TOperator op, s
case glslang::EOpSubgroupQuadAny: case glslang::EOpSubgroupQuadAny:
builder.addExtension(spv::E_SPV_KHR_quad_control); builder.addExtension(spv::E_SPV_KHR_quad_control);
builder.addCapability(spv::CapabilityQuadControlKHR); builder.addCapability(spv::CapabilityQuadControlKHR);
// pass through [[fallthrough]];
case glslang::EOpSubgroupAll: case glslang::EOpSubgroupAll:
case glslang::EOpSubgroupAny: case glslang::EOpSubgroupAny:
case glslang::EOpSubgroupAllEqual: case glslang::EOpSubgroupAllEqual:

1
SPIRV/SpvPostProcess.cpp
View file

@ -181,6 +181,7 @@ void Builder::postProcessType(const Instruction& inst, Id typeId)
else if (width == 8) else if (width == 8)
addCapability(CapabilityInt8); addCapability(CapabilityInt8);
} }
break;
default: default:
if (basicTypeOp == OpTypeInt) { if (basicTypeOp == OpTypeInt) {
if (width == 16) if (width == 16)

1
glslang/MachineIndependent/Intermediate.cpp
View file

@ -1277,6 +1277,7 @@ void TIntermediate::addBiShapeConversion(TOperator op, TIntermTyped*& lhsNode, T
// matrix multiply does not change shapes // matrix multiply does not change shapes
if (lhsNode->isMatrix() && rhsNode->isMatrix()) if (lhsNode->isMatrix() && rhsNode->isMatrix())
return; return;
[[fallthrough]];
case EOpAdd: case EOpAdd:
case EOpSub: case EOpSub:
case EOpDiv: case EOpDiv:

2
glslang/MachineIndependent/ParseHelper.cpp
View file

@ -8434,6 +8434,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
intermediate.addBuiltInFunctionCall(node->getLoc(), EOpConstructUVec2, false, newSrcNode, type); intermediate.addBuiltInFunctionCall(node->getLoc(), EOpConstructUVec2, false, newSrcNode, type);
return newNode; return newNode;
} }
[[fallthrough]];
case EOpConstructUVec3: case EOpConstructUVec3:
case EOpConstructUVec4: case EOpConstructUVec4:
case EOpConstructUint: case EOpConstructUint:
@ -8455,6 +8456,7 @@ TIntermTyped* TParseContext::constructBuiltIn(const TType& type, TOperator op, T
intermediate.addBuiltInFunctionCall(node->getLoc(), EOpPackUint2x32, true, node, type); intermediate.addBuiltInFunctionCall(node->getLoc(), EOpPackUint2x32, true, node, type);
return newNode; return newNode;
} }
[[fallthrough]];
case EOpConstructDVec2: case EOpConstructDVec2:
case EOpConstructDVec3: case EOpConstructDVec3:
case EOpConstructDVec4: case EOpConstructDVec4:

25
glslang/MachineIndependent/reflection.cpp
View file

@ -707,6 +707,7 @@ public:
switch ((int)sampler.shadow) { switch ((int)sampler.shadow) {
case false: return sampler.arrayed ? GL_SAMPLER_1D_ARRAY : GL_SAMPLER_1D; case false: return sampler.arrayed ? GL_SAMPLER_1D_ARRAY : GL_SAMPLER_1D;
case true: return sampler.arrayed ? GL_SAMPLER_1D_ARRAY_SHADOW : GL_SAMPLER_1D_SHADOW; case true: return sampler.arrayed ? GL_SAMPLER_1D_ARRAY_SHADOW : GL_SAMPLER_1D_SHADOW;
default: assert(0);
} }
case Esd2D: case Esd2D:
switch ((int)sampler.ms) { switch ((int)sampler.ms) {
@ -714,8 +715,10 @@ public:
switch ((int)sampler.shadow) { switch ((int)sampler.shadow) {
case false: return sampler.arrayed ? GL_SAMPLER_2D_ARRAY : GL_SAMPLER_2D; case false: return sampler.arrayed ? GL_SAMPLER_2D_ARRAY : GL_SAMPLER_2D;
case true: return sampler.arrayed ? GL_SAMPLER_2D_ARRAY_SHADOW : GL_SAMPLER_2D_SHADOW; case true: return sampler.arrayed ? GL_SAMPLER_2D_ARRAY_SHADOW : GL_SAMPLER_2D_SHADOW;
default: assert(0);
} }
case true: return sampler.arrayed ? GL_SAMPLER_2D_MULTISAMPLE_ARRAY : GL_SAMPLER_2D_MULTISAMPLE; case true: return sampler.arrayed ? GL_SAMPLER_2D_MULTISAMPLE_ARRAY : GL_SAMPLER_2D_MULTISAMPLE;
default: assert(0);
} }
case Esd3D: case Esd3D:
return GL_SAMPLER_3D; return GL_SAMPLER_3D;
@ -723,11 +726,13 @@ public:
switch ((int)sampler.shadow) { switch ((int)sampler.shadow) {
case false: return sampler.arrayed ? GL_SAMPLER_CUBE_MAP_ARRAY : GL_SAMPLER_CUBE; case false: return sampler.arrayed ? GL_SAMPLER_CUBE_MAP_ARRAY : GL_SAMPLER_CUBE;
case true: return sampler.arrayed ? GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW : GL_SAMPLER_CUBE_SHADOW; case true: return sampler.arrayed ? GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW : GL_SAMPLER_CUBE_SHADOW;
default: assert(0);
} }
case EsdRect: case EsdRect:
return sampler.shadow ? GL_SAMPLER_2D_RECT_SHADOW : GL_SAMPLER_2D_RECT; return sampler.shadow ? GL_SAMPLER_2D_RECT_SHADOW : GL_SAMPLER_2D_RECT;
case EsdBuffer: case EsdBuffer:
return GL_SAMPLER_BUFFER; return GL_SAMPLER_BUFFER;
default: assert(0);
} }
case EbtFloat16: case EbtFloat16:
switch ((int)sampler.dim) { switch ((int)sampler.dim) {
@ -735,6 +740,7 @@ public:
switch ((int)sampler.shadow) { switch ((int)sampler.shadow) {
case false: return sampler.arrayed ? GL_FLOAT16_SAMPLER_1D_ARRAY_AMD : GL_FLOAT16_SAMPLER_1D_AMD; case false: return sampler.arrayed ? GL_FLOAT16_SAMPLER_1D_ARRAY_AMD : GL_FLOAT16_SAMPLER_1D_AMD;
case true: return sampler.arrayed ? GL_FLOAT16_SAMPLER_1D_ARRAY_SHADOW_AMD : GL_FLOAT16_SAMPLER_1D_SHADOW_AMD; case true: return sampler.arrayed ? GL_FLOAT16_SAMPLER_1D_ARRAY_SHADOW_AMD : GL_FLOAT16_SAMPLER_1D_SHADOW_AMD;
default: assert(0);
} }
case Esd2D: case Esd2D:
switch ((int)sampler.ms) { switch ((int)sampler.ms) {
@ -742,8 +748,10 @@ public:
switch ((int)sampler.shadow) { switch ((int)sampler.shadow) {
case false: return sampler.arrayed ? GL_FLOAT16_SAMPLER_2D_ARRAY_AMD : GL_FLOAT16_SAMPLER_2D_AMD; case false: return sampler.arrayed ? GL_FLOAT16_SAMPLER_2D_ARRAY_AMD : GL_FLOAT16_SAMPLER_2D_AMD;
case true: return sampler.arrayed ? GL_FLOAT16_SAMPLER_2D_ARRAY_SHADOW_AMD : GL_FLOAT16_SAMPLER_2D_SHADOW_AMD; case true: return sampler.arrayed ? GL_FLOAT16_SAMPLER_2D_ARRAY_SHADOW_AMD : GL_FLOAT16_SAMPLER_2D_SHADOW_AMD;
default: assert(0);
} }
case true: return sampler.arrayed ? GL_FLOAT16_SAMPLER_2D_MULTISAMPLE_ARRAY_AMD : GL_FLOAT16_SAMPLER_2D_MULTISAMPLE_AMD; case true: return sampler.arrayed ? GL_FLOAT16_SAMPLER_2D_MULTISAMPLE_ARRAY_AMD : GL_FLOAT16_SAMPLER_2D_MULTISAMPLE_AMD;
default: assert(0);
} }
case Esd3D: case Esd3D:
return GL_FLOAT16_SAMPLER_3D_AMD; return GL_FLOAT16_SAMPLER_3D_AMD;
@ -751,11 +759,13 @@ public:
switch ((int)sampler.shadow) { switch ((int)sampler.shadow) {
case false: return sampler.arrayed ? GL_FLOAT16_SAMPLER_CUBE_MAP_ARRAY_AMD : GL_FLOAT16_SAMPLER_CUBE_AMD; case false: return sampler.arrayed ? GL_FLOAT16_SAMPLER_CUBE_MAP_ARRAY_AMD : GL_FLOAT16_SAMPLER_CUBE_AMD;
case true: return sampler.arrayed ? GL_FLOAT16_SAMPLER_CUBE_MAP_ARRAY_SHADOW_AMD : GL_FLOAT16_SAMPLER_CUBE_SHADOW_AMD; case true: return sampler.arrayed ? GL_FLOAT16_SAMPLER_CUBE_MAP_ARRAY_SHADOW_AMD : GL_FLOAT16_SAMPLER_CUBE_SHADOW_AMD;
default: assert(0);
} }
case EsdRect: case EsdRect:
return sampler.shadow ? GL_FLOAT16_SAMPLER_2D_RECT_SHADOW_AMD : GL_FLOAT16_SAMPLER_2D_RECT_AMD; return sampler.shadow ? GL_FLOAT16_SAMPLER_2D_RECT_SHADOW_AMD : GL_FLOAT16_SAMPLER_2D_RECT_AMD;
case EsdBuffer: case EsdBuffer:
return GL_FLOAT16_SAMPLER_BUFFER_AMD; return GL_FLOAT16_SAMPLER_BUFFER_AMD;
default: assert(0);
} }
case EbtInt: case EbtInt:
switch ((int)sampler.dim) { switch ((int)sampler.dim) {
@ -766,6 +776,7 @@ public:
case false: return sampler.arrayed ? GL_INT_SAMPLER_2D_ARRAY : GL_INT_SAMPLER_2D; case false: return sampler.arrayed ? GL_INT_SAMPLER_2D_ARRAY : GL_INT_SAMPLER_2D;
case true: return sampler.arrayed ? GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY case true: return sampler.arrayed ? GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY
: GL_INT_SAMPLER_2D_MULTISAMPLE; : GL_INT_SAMPLER_2D_MULTISAMPLE;
default: assert(0);
} }
case Esd3D: case Esd3D:
return GL_INT_SAMPLER_3D; return GL_INT_SAMPLER_3D;
@ -775,6 +786,7 @@ public:
return GL_INT_SAMPLER_2D_RECT; return GL_INT_SAMPLER_2D_RECT;
case EsdBuffer: case EsdBuffer:
return GL_INT_SAMPLER_BUFFER; return GL_INT_SAMPLER_BUFFER;
default: assert(0);
} }
case EbtUint: case EbtUint:
switch ((int)sampler.dim) { switch ((int)sampler.dim) {
@ -785,6 +797,7 @@ public:
case false: return sampler.arrayed ? GL_UNSIGNED_INT_SAMPLER_2D_ARRAY : GL_UNSIGNED_INT_SAMPLER_2D; case false: return sampler.arrayed ? GL_UNSIGNED_INT_SAMPLER_2D_ARRAY : GL_UNSIGNED_INT_SAMPLER_2D;
case true: return sampler.arrayed ? GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY case true: return sampler.arrayed ? GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY
: GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE; : GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE;
default: assert(0);
} }
case Esd3D: case Esd3D:
return GL_UNSIGNED_INT_SAMPLER_3D; return GL_UNSIGNED_INT_SAMPLER_3D;
@ -794,6 +807,7 @@ public:
return GL_UNSIGNED_INT_SAMPLER_2D_RECT; return GL_UNSIGNED_INT_SAMPLER_2D_RECT;
case EsdBuffer: case EsdBuffer:
return GL_UNSIGNED_INT_SAMPLER_BUFFER; return GL_UNSIGNED_INT_SAMPLER_BUFFER;
default: assert(0);
} }
default: default:
return 0; return 0;
@ -809,6 +823,7 @@ public:
switch ((int)sampler.ms) { switch ((int)sampler.ms) {
case false: return sampler.arrayed ? GL_IMAGE_2D_ARRAY : GL_IMAGE_2D; case false: return sampler.arrayed ? GL_IMAGE_2D_ARRAY : GL_IMAGE_2D;
case true: return sampler.arrayed ? GL_IMAGE_2D_MULTISAMPLE_ARRAY : GL_IMAGE_2D_MULTISAMPLE; case true: return sampler.arrayed ? GL_IMAGE_2D_MULTISAMPLE_ARRAY : GL_IMAGE_2D_MULTISAMPLE;
default: assert(0);
} }
case Esd3D: case Esd3D:
return GL_IMAGE_3D; return GL_IMAGE_3D;
@ -818,6 +833,7 @@ public:
return GL_IMAGE_2D_RECT; return GL_IMAGE_2D_RECT;
case EsdBuffer: case EsdBuffer:
return GL_IMAGE_BUFFER; return GL_IMAGE_BUFFER;
default: assert(0);
} }
case EbtFloat16: case EbtFloat16:
switch ((int)sampler.dim) { switch ((int)sampler.dim) {
@ -827,6 +843,7 @@ public:
switch ((int)sampler.ms) { switch ((int)sampler.ms) {
case false: return sampler.arrayed ? GL_FLOAT16_IMAGE_2D_ARRAY_AMD : GL_FLOAT16_IMAGE_2D_AMD; case false: return sampler.arrayed ? GL_FLOAT16_IMAGE_2D_ARRAY_AMD : GL_FLOAT16_IMAGE_2D_AMD;
case true: return sampler.arrayed ? GL_FLOAT16_IMAGE_2D_MULTISAMPLE_ARRAY_AMD : GL_FLOAT16_IMAGE_2D_MULTISAMPLE_AMD; case true: return sampler.arrayed ? GL_FLOAT16_IMAGE_2D_MULTISAMPLE_ARRAY_AMD : GL_FLOAT16_IMAGE_2D_MULTISAMPLE_AMD;
default: assert(0);
} }
case Esd3D: case Esd3D:
return GL_FLOAT16_IMAGE_3D_AMD; return GL_FLOAT16_IMAGE_3D_AMD;
@ -836,6 +853,7 @@ public:
return GL_FLOAT16_IMAGE_2D_RECT_AMD; return GL_FLOAT16_IMAGE_2D_RECT_AMD;
case EsdBuffer: case EsdBuffer:
return GL_FLOAT16_IMAGE_BUFFER_AMD; return GL_FLOAT16_IMAGE_BUFFER_AMD;
default: assert(0);
} }
case EbtInt: case EbtInt:
switch ((int)sampler.dim) { switch ((int)sampler.dim) {
@ -845,6 +863,7 @@ public:
switch ((int)sampler.ms) { switch ((int)sampler.ms) {
case false: return sampler.arrayed ? GL_INT_IMAGE_2D_ARRAY : GL_INT_IMAGE_2D; case false: return sampler.arrayed ? GL_INT_IMAGE_2D_ARRAY : GL_INT_IMAGE_2D;
case true: return sampler.arrayed ? GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY : GL_INT_IMAGE_2D_MULTISAMPLE; case true: return sampler.arrayed ? GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY : GL_INT_IMAGE_2D_MULTISAMPLE;
default: assert(0);
} }
case Esd3D: case Esd3D:
return GL_INT_IMAGE_3D; return GL_INT_IMAGE_3D;
@ -854,6 +873,7 @@ public:
return GL_INT_IMAGE_2D_RECT; return GL_INT_IMAGE_2D_RECT;
case EsdBuffer: case EsdBuffer:
return GL_INT_IMAGE_BUFFER; return GL_INT_IMAGE_BUFFER;
default: assert(0);
} }
case EbtUint: case EbtUint:
switch ((int)sampler.dim) { switch ((int)sampler.dim) {
@ -864,6 +884,7 @@ public:
case false: return sampler.arrayed ? GL_UNSIGNED_INT_IMAGE_2D_ARRAY : GL_UNSIGNED_INT_IMAGE_2D; case false: return sampler.arrayed ? GL_UNSIGNED_INT_IMAGE_2D_ARRAY : GL_UNSIGNED_INT_IMAGE_2D;
case true: return sampler.arrayed ? GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY case true: return sampler.arrayed ? GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY
: GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE; : GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE;
default: assert(0);
} }
case Esd3D: case Esd3D:
return GL_UNSIGNED_INT_IMAGE_3D; return GL_UNSIGNED_INT_IMAGE_3D;
@ -873,6 +894,7 @@ public:
return GL_UNSIGNED_INT_IMAGE_2D_RECT; return GL_UNSIGNED_INT_IMAGE_2D_RECT;
case EsdBuffer: case EsdBuffer:
return GL_UNSIGNED_INT_IMAGE_BUFFER; return GL_UNSIGNED_INT_IMAGE_BUFFER;
default: assert(0);
} }
default: default:
return 0; return 0;
@ -937,6 +959,7 @@ public:
case 4: return GL_FLOAT_MAT4; case 4: return GL_FLOAT_MAT4;
default: return 0; default: return 0;
} }
default: assert(0);
} }
case EbtDouble: case EbtDouble:
switch (type.getMatrixCols()) { switch (type.getMatrixCols()) {
@ -961,6 +984,7 @@ public:
case 4: return GL_DOUBLE_MAT4; case 4: return GL_DOUBLE_MAT4;
default: return 0; default: return 0;
} }
default: assert(0);
} }
case EbtFloat16: case EbtFloat16:
switch (type.getMatrixCols()) { switch (type.getMatrixCols()) {
@ -985,6 +1009,7 @@ public:
case 4: return GL_FLOAT16_MAT4_AMD; case 4: return GL_FLOAT16_MAT4_AMD;
default: return 0; default: return 0;
} }
default: assert(0);
} }
default: default:
return 0; return 0;