Merge pull request #2268 from lriki/hlsl-pack_matrix

HLSL: Fix #pragma pack_matrix(row_major) not work on global uniforms
This commit is contained in:
John Kessenich 2020-07-02 05:21:45 -06:00 committed by GitHub
commit a70f7dea77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 113 additions and 2 deletions

View file

@ -60,8 +60,8 @@ public:
virtual const char* getGlobalUniformBlockName() const override { return "$Global"; }
virtual void setUniformBlockDefaults(TType& block) const override
{
block.getQualifier().layoutPacking = ElpStd140;
block.getQualifier().layoutMatrix = ElmRowMajor;
block.getQualifier().layoutPacking = globalUniformDefaults.layoutPacking;
block.getQualifier().layoutMatrix = globalUniformDefaults.layoutMatrix;
}
void reservedPpErrorCheck(const TSourceLoc&, const char* /*name*/, const char* /*op*/) override { }