diff options
| author | pdeayton-nv <205388607+pdeayton-nv@users.noreply.github.com> | 2025-07-15 17:44:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-16 00:44:33 +0000 |
| commit | 299eb0c889322a960d1907b6722ee1caf88475a4 (patch) | |
| tree | ded57d1c9fe1e8ec909722877b93cb0037bf190d /source | |
| parent | a8519e68b6df636932ca5d89a332b2a689259b0f (diff) | |
Fix GLSL memory layout qualifiers not applied to uniform buffers or cbuffers (#7740)
* Fix GLSL memory layout qualifiers not applied to uniform buffers or cbuffers
The `layout(scalar)` qualifier was being ignored for GLSL `uniform` blocks and
HLSL `cbuffer` declarations, causing them to use std140 layout instead of the
requested scalar layout.
**Root Cause**:
The parsing logic in `slang-parser.cpp` handled layout qualifiers inconsistently:
- GLSL `buffer` blocks correctly used `getLayoutArg()` to map layout modifiers
- GLSL `uniform` blocks and HLSL `cbuffer` skipped layout arguments entirely
**Solution**:
- Enhanced `parseHLSLCBufferDecl()` to check for GLSL layout qualifiers
- Added same `getLayoutArg()` logic used by buffer blocks
- Modified uniform block parsing to pass layout arguments through
**Testing**:
- Added comprehensive test case: `tests/glsl/layout-scalar-qualifier.slang`
- Verified fix works for both `uniform` blocks and `cbuffer` declarations
- Confirmed no regressions in existing test suite
**Before**: `layout(scalar) uniform {...}` → std140 layout (32 bytes, offset 0,16)
**After**: `layout(scalar) uniform {...}` → scalar layout (16 bytes, offset 0,4)
Fixes #7735
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-authored-by: pdeayton-nv <pdeayton-nv@users.noreply.github.com>
* Apply code formatting to slang-parser.cpp
Fixed line wrapping, trailing whitespace, and parameter formatting
according to repository style guidelines.
Co-authored-by: Harsh Aggarwal (NVIDIA) <szihs@users.noreply.github.com>
* format code (#7742)
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: pdeayton-nv <pdeayton-nv@users.noreply.github.com>
Co-authored-by: Harsh Aggarwal (NVIDIA) <szihs@users.noreply.github.com>
Co-authored-by: slangbot <ellieh+slangbot@nvidia.com>
Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com>
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/slang-parser.cpp | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/source/slang/slang-parser.cpp b/source/slang/slang-parser.cpp index 0efa6a4b3..590954bd2 100644 --- a/source/slang/slang-parser.cpp +++ b/source/slang/slang-parser.cpp @@ -3578,9 +3578,36 @@ static Decl* ParseBufferBlockDecl( static NodeBase* parseHLSLCBufferDecl(Parser* parser, void* /*userData*/) { + // Check for GLSL layout qualifiers when GLSL input is allowed + if (parser->options.allowGLSLInput && parser->pendingModifiers) + { + auto getLayoutArg = [&](const char* defaultLayout) + { + if (auto dataLayoutMod = + parser->pendingModifiers->findModifier<GLSLBufferDataLayoutModifier>()) + { + if (as<GLSLStd140Modifier>(dataLayoutMod)) + return "Std140DataLayout"; + else if (as<GLSLStd430Modifier>(dataLayoutMod)) + return "Std430DataLayout"; + else if (as<GLSLScalarModifier>(dataLayoutMod)) + return "ScalarDataLayout"; + } + return defaultLayout; + }; + + String layoutType = getLayoutArg("Std140DataLayout"); + return ParseBufferBlockDecl(parser, "ConstantBuffer", &layoutType); + } + return ParseBufferBlockDecl(parser, "ConstantBuffer"); } +static NodeBase* parseHLSLCBufferDeclWithLayout(Parser* parser, String layoutType) +{ + return ParseBufferBlockDecl(parser, "ConstantBuffer", &layoutType); +} + static NodeBase* parseHLSLTBufferDecl(Parser* parser, void* /*userData*/) { return ParseBufferBlockDecl(parser, "TextureBuffer"); @@ -4994,7 +5021,9 @@ static DeclBase* ParseDeclWithModifiers( if (as<HLSLUniformModifier>(mod)) { - decl = as<Decl>(parseHLSLCBufferDecl(parser, nullptr)); + decl = as<Decl>(parseHLSLCBufferDeclWithLayout( + parser, + getLayoutArg("Std140DataLayout"))); break; } else |
