From: Pyry Haulos <phaulos@google.com>
Date: Mon, 7 Dec 2015 23:24:16 +0000 (-0800)
Subject: Fix ShaderLibrary vertex layout for matrices
X-Git-Tag: upstream/0.1.0~812^2~486
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cde2ea4b731f1b37d765a5a07cc3e0d84420c142;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix ShaderLibrary vertex layout for matrices

Change-Id: I2b3ad53c81404bf306a82c165496dcb147a52234
---

diff --git a/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp b/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp
index 594d629..30ec1bc 100644
--- a/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp
+++ b/external/vulkancts/modules/vulkan/vktShaderLibrary.cpp
@@ -964,10 +964,10 @@ vector<vk::VkVertexInputAttributeDescription> getVertexAttributeDescriptions (co
 		const ValueBufferLayout::Entry&	layoutEntry	= layout.entries[inputNdx];
 		const DataType					basicType	= input.type.getBasicType();
 		const int						numVecs		= isDataTypeMatrix(basicType)
-													? getDataTypeMatrixNumRows(basicType)
+													? getDataTypeMatrixNumColumns(basicType)
 													: 1;
 		const int						vecSize		= isDataTypeMatrix(basicType)
-													? getDataTypeMatrixNumColumns(basicType)
+													? getDataTypeMatrixNumRows(basicType)
 													: getDataTypeScalarSize(basicType);
 		const vk::VkFormat				vecFmt		= getFloatVecFormat(vecSize);