projects
/
platform
/
upstream
/
glslang.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fbb9dc2
)
HLSL: Fix #pragma pack_matrix(row_major) not work on global uniforms
author
lriki
<lriki.net@gmail.com>
Fri, 12 Jun 2020 12:26:48 +0000
(21:26 +0900)
committer
lriki
<lriki.net@gmail.com>
Thu, 25 Jun 2020 07:10:00 +0000
(16:10 +0900)
glslang/HLSL/hlslParseHelper.h
patch
|
blob
|
history
diff --git
a/glslang/HLSL/hlslParseHelper.h
b/glslang/HLSL/hlslParseHelper.h
index
3ae1db1
..
b92856a
100644
(file)
--- a/
glslang/HLSL/hlslParseHelper.h
+++ b/
glslang/HLSL/hlslParseHelper.h
@@
-60,8
+60,8
@@
public:
virtual const char* getGlobalUniformBlockName() const override { return "$Global"; }
virtual void setUniformBlockDefaults(TType& block) const override
{
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 { }
}
void reservedPpErrorCheck(const TSourceLoc&, const char* /*name*/, const char* /*op*/) override { }