From: Daniel Koch <dkoch@nvidia.com>
Date: Wed, 21 Jun 2017 14:21:04 +0000 (-0400)
Subject: Fix 16bit_storage out of bounds buffer accesses
X-Git-Tag: upstream/0.1.0~9^2~82^2~38
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cdb23cd1ac95bc07f0235b2f872a7fce362fde38;p=platform%2Fupstream%2FVK-GL-CTS.git

Fix 16bit_storage out of bounds buffer accesses

VK-GL-CTS Issue: 518
Component: Vulkan

Affects:
dEQP-VK.spirv_assembly.instruction.compute.16bit_storage.push_constant_16_to_32.vector_sint
dEQP-VK.spirv_assembly.instruction.compute.16bit_storage.push_constant_16_to_32.vector_uint

Change-Id: I33d3c94388a8eacac78a617ba7711b3688701323
(cherry picked from commit 5bad3cacecc5de4868365cb854f9433c79770c5f)
---

diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp
index 71aa57a..50a6c4e 100644
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp
@@ -944,7 +944,7 @@ void addCompute16bitStoragePushConstant16To32Group (tcu::TestCaseGroup* group)
 			specs["convert"]		= cTypes[tyIdx].opcode;
 
 			spec.assembly			= shaderTemplate.specialize(specs);
-			spec.numWorkGroups		= IVec3(numElements, 1, 1);
+			spec.numWorkGroups		= IVec3(cTypes[tyIdx].count, 1, 1);
 			spec.pushConstants		= BufferSp(new Int16Buffer(inputs));
 
 			if (cTypes[tyIdx].isSigned)