Skip to content

Format code for PR #6595 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
szihs merged 1 commit into from
Mar 18, 2025
Merged

Format code for PR #6595 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions source/slang/slang-check-modifier.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1424,7 +1424,7 @@ bool isModifierAllowedOnDecl(bool isGLSLInput, ASTNodeType modifierType, Decl* d
case ASTNodeType::GLSLBufferModifier:
case ASTNodeType::GLSLPatchModifier:
return (as<VarDeclBase>(decl) && isGlobalDecl(decl)) || as<ParamDecl>(decl) ||
as<GLSLInterfaceBlockDecl>(decl);
as<GLSLInterfaceBlockDecl>(decl);
case ASTNodeType::RayPayloadAccessSemantic:
case ASTNodeType::RayPayloadReadSemantic:
case ASTNodeType::RayPayloadWriteSemantic:
Expand Down Expand Up @@ -2207,9 +2207,9 @@ void SemanticsVisitor::checkRayPayloadStructFields(StructDecl* structDecl)
{
return;
}

bool anyFieldMissingQualifiers = false;

// Check each field in the struct
for (auto member : structDecl->members)
{
Expand All @@ -2218,18 +2218,18 @@ void SemanticsVisitor::checkRayPayloadStructFields(StructDecl* structDecl)
{
continue;
}

bool hasReadModifier = fieldVarDecl->findModifier<RayPayloadReadSemantic>() != nullptr;
bool hasWriteModifier = fieldVarDecl->findModifier<RayPayloadWriteSemantic>() != nullptr;

if (!hasReadModifier && !hasWriteModifier)
{
// Emit the diagnostic error
getSink()->diagnose(
fieldVarDecl,
Diagnostics::rayPayloadFieldMissingAccessQualifiers,
fieldVarDecl->getName());

anyFieldMissingQualifiers = true;
}
}
Expand Down
6 changes: 5 additions & 1 deletion source/slang/slang-diagnostic-defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2699,6 +2699,10 @@ DIAGNOSTIC(
// Ray tracing
//

DIAGNOSTIC(40000, Error, rayPayloadFieldMissingAccessQualifiers, "field '$0' in ray payload struct must have either 'read' OR 'write' access qualifiers")
DIAGNOSTIC(
40000,
Error,
rayPayloadFieldMissingAccessQualifiers,
"field '$0' in ray payload struct must have either 'read' OR 'write' access qualifiers")

#undef DIAGNOSTIC
Loading