Skip to content

HlslParseContext should respect global uniform block name override by intermediate #3949

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

Open
MohammadMDSA wants to merge 1 commit into
base: main
Choose a base branch
from
Open

HlslParseContext should respect global uniform block name override by intermediate #3949

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
10 changes: 10 additions & 0 deletions glslang/HLSL/hlslParseHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10284,4 +10284,14 @@ void HlslParseContext::finish()
TParseContextBase::finish();
}


const char* HlslParseContext::getGlobalUniformBlockName() const
{
const char* name = intermediate.getGlobalUniformBlockName();
if (std::string(name) == "")
return "$Global";
else
return name;
}

} // end namespace glslang
2 changes: 1 addition & 1 deletion glslang/HLSL/hlslParseHelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class HlslParseContext : public TParseContextBase {

void setLimits(const TBuiltInResource&) override;
bool parseShaderStrings(TPpContext&, TInputScanner& input, bool versionWillBeError = false) override;
virtual const char* getGlobalUniformBlockName() const override { return "$Global"; }
virtual const char* getGlobalUniformBlockName() const override;
virtual void setUniformBlockDefaults(TType& block) const override
{
block.getQualifier().layoutPacking = globalUniformDefaults.layoutPacking;
Expand Down
Loading