Skip to content

Commit b118451

Browse files
expipiplus1csyonghe
expipiplus1
and
csyonghe
authored
Move switch statement bodies to their own lines (shader-slang#5493)
* Move switch statement bodies to their own lines * format --------- Co-authored-by: Yong He <yonghe@outlook.com>
1 parent 53dd592 commit b118451

File tree

290 files changed

+10374
-4556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+10374
-4556
lines changed

‎.clang-format

-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ AccessModifierOffset: -4
3232

3333
# Switch statements
3434
IndentCaseBlocks: true
35-
AllowShortCaseLabelsOnASingleLine: true
36-
AlignConsecutiveShortCaseStatements:
37-
Enabled: true
3835

3936
# Templates
4037
SpaceAfterTemplateKeyword: false

‎examples/example-base/example-base.cpp

+17-6
Original file line numberDiff line numberDiff line change
@@ -332,16 +332,27 @@ class DebugCallback : public IDebugCallback
332332
const char* typeStr = "";
333333
switch (type)
334334
{
335-
case DebugMessageType::Info: typeStr = "INFO: "; break;
336-
case DebugMessageType::Warning: typeStr = "WARNING: "; break;
337-
case DebugMessageType::Error: typeStr = "ERROR: "; break;
338-
default: break;
335+
case DebugMessageType::Info:
336+
typeStr = "INFO: ";
337+
break;
338+
case DebugMessageType::Warning:
339+
typeStr = "WARNING: ";
340+
break;
341+
case DebugMessageType::Error:
342+
typeStr = "ERROR: ";
343+
break;
344+
default:
345+
break;
339346
}
340347
const char* sourceStr = "[GraphicsLayer]: ";
341348
switch (source)
342349
{
343-
case DebugMessageSource::Slang: sourceStr = "[Slang]: "; break;
344-
case DebugMessageSource::Driver: sourceStr = "[Driver]: "; break;
350+
case DebugMessageSource::Slang:
351+
sourceStr = "[Slang]: ";
352+
break;
353+
case DebugMessageSource::Driver:
354+
sourceStr = "[Driver]: ";
355+
break;
345356
}
346357
printf("%s%s%s\n", sourceStr, typeStr, message);
347358
#ifdef _WIN32

‎examples/model-viewer/main.cpp

+14-5
Original file line numberDiff line numberDiff line change
@@ -691,11 +691,20 @@ struct ModelViewer : WindowedAppBase
691691
{
692692
switch (key)
693693
{
694-
default: break;
695-
case platform::KeyCode::W: wPressed = state; break;
696-
case platform::KeyCode::A: aPressed = state; break;
697-
case platform::KeyCode::S: sPressed = state; break;
698-
case platform::KeyCode::D: dPressed = state; break;
694+
default:
695+
break;
696+
case platform::KeyCode::W:
697+
wPressed = state;
698+
break;
699+
case platform::KeyCode::A:
700+
aPressed = state;
701+
break;
702+
case platform::KeyCode::S:
703+
sPressed = state;
704+
break;
705+
case platform::KeyCode::D:
706+
dPressed = state;
707+
break;
699708
}
700709
}
701710
void onKeyDown(platform::KeyEventArgs args) { setKeyState(args.key, true); }

‎examples/ray-tracing-pipeline/main.cpp

+14-5
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,20 @@ struct RayTracing : public WindowedAppBase
255255
{
256256
switch (key)
257257
{
258-
default: break;
259-
case platform::KeyCode::W: wPressed = state; break;
260-
case platform::KeyCode::A: aPressed = state; break;
261-
case platform::KeyCode::S: sPressed = state; break;
262-
case platform::KeyCode::D: dPressed = state; break;
258+
default:
259+
break;
260+
case platform::KeyCode::W:
261+
wPressed = state;
262+
break;
263+
case platform::KeyCode::A:
264+
aPressed = state;
265+
break;
266+
case platform::KeyCode::S:
267+
sPressed = state;
268+
break;
269+
case platform::KeyCode::D:
270+
dPressed = state;
271+
break;
263272
}
264273
}
265274
void onKeyDown(platform::KeyEventArgs args) { setKeyState(args.key, true); }

‎examples/ray-tracing/main.cpp

+14-5
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,20 @@ struct RayTracing : public WindowedAppBase
246246
{
247247
switch (key)
248248
{
249-
default: break;
250-
case platform::KeyCode::W: wPressed = state; break;
251-
case platform::KeyCode::A: aPressed = state; break;
252-
case platform::KeyCode::S: sPressed = state; break;
253-
case platform::KeyCode::D: dPressed = state; break;
249+
default:
250+
break;
251+
case platform::KeyCode::W:
252+
wPressed = state;
253+
break;
254+
case platform::KeyCode::A:
255+
aPressed = state;
256+
break;
257+
case platform::KeyCode::S:
258+
sPressed = state;
259+
break;
260+
case platform::KeyCode::D:
261+
dPressed = state;
262+
break;
254263
}
255264
}
256265
void onKeyDown(platform::KeyEventArgs args) { setKeyState(args.key, true); }

‎source/compiler-core/slang-artifact-associated-impl.cpp

+8-4
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,14 @@ void ArtifactDiagnostics::requireErrorDiagnostic()
196196
typedef ArtifactDiagnostic::Severity Severity;
197197
switch (severity)
198198
{
199-
default: return UnownedStringSlice::fromLiteral("Unknown");
200-
case Severity::Info: return UnownedStringSlice::fromLiteral("Info");
201-
case Severity::Warning: return UnownedStringSlice::fromLiteral("Warning");
202-
case Severity::Error: return UnownedStringSlice::fromLiteral("Error");
199+
default:
200+
return UnownedStringSlice::fromLiteral("Unknown");
201+
case Severity::Info:
202+
return UnownedStringSlice::fromLiteral("Info");
203+
case Severity::Warning:
204+
return UnownedStringSlice::fromLiteral("Warning");
205+
case Severity::Error:
206+
return UnownedStringSlice::fromLiteral("Error");
203207
}
204208
}
205209

‎source/compiler-core/slang-artifact-associated-impl.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,10 @@ struct ShaderBindingRange
162162
case slang::ShaderResource:
163163
case slang::UnorderedAccess:
164164
case slang::SamplerState:
165-
case slang::DescriptorTableSlot: return true;
166-
default: return false;
165+
case slang::DescriptorTableSlot:
166+
return true;
167+
default:
168+
return false;
167169
}
168170
}
169171
};

‎source/compiler-core/slang-artifact-container-util.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,12 @@ SlangResult ArtifactContainerReader::_readContainerDirectory(
677677
case IArtifact::ContainedKind::Associated:
678678
containerArtifact->addAssociated(artifact);
679679
break;
680-
case IArtifact::ContainedKind::Children: containerArtifact->addChild(artifact); break;
681-
default: SLANG_ASSERT(!"Can't add artifact to this kind"); return SLANG_FAIL;
680+
case IArtifact::ContainedKind::Children:
681+
containerArtifact->addChild(artifact);
682+
break;
683+
default:
684+
SLANG_ASSERT(!"Can't add artifact to this kind");
685+
return SLANG_FAIL;
682686
}
683687
}
684688
}

0 commit comments

Comments
 (0)