From cde2ea4b731f1b37d765a5a07cc3e0d84420c142 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Mon, 7 Dec 2015 15:24:16 -0800 Subject: [PATCH] Fix ShaderLibrary vertex layout for matrices Change-Id: I2b3ad53c81404bf306a82c165496dcb147a52234 --- external/vulkancts/modules/vulkan/vktShaderLibrary.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 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); -- 2.7.4