From: lriki <lriki.net@gmail.com>
Date: Fri, 12 Jun 2020 12:26:48 +0000 (+0900)
Subject: HLSL: Fix #pragma pack_matrix(row_major) not work on global uniforms
X-Git-Tag: upstream/11.4.0~174^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3cae3c4da8b3bfb92fadea4150b7a2608fdccba5;p=platform%2Fupstream%2Fglslang.git

HLSL: Fix #pragma pack_matrix(row_major) not work on global uniforms
---

diff --git a/glslang/HLSL/hlslParseHelper.h b/glslang/HLSL/hlslParseHelper.h
index 3ae1db1..b92856a 100644
--- 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
     {
-        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 { }