From a9f670634b3213102e5d230bc5f72c40228cdf13 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Wed, 23 Dec 2015 15:54:58 +0900 Subject: [PATCH] Fix whitespace violations --- .../modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp | 2 +- external/vulkancts/modules/vulkan/compute/vktComputeTests.cpp | 2 +- external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp | 2 +- external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp | 2 +- .../vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp b/external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp index 40fad67..6eb538c 100644 --- a/external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp +++ b/external/vulkancts/modules/vulkan/compute/vktComputeIndirectComputeDispatchTests.cpp @@ -555,7 +555,7 @@ void IndirectDispatchCaseBufferGenerate::initPrograms (vk::SourceCollections& pr for (DispatchCommandsVec::const_iterator cmdIter = m_dispatchCommands.begin(); cmdIter != m_dispatchCommands.end(); ++cmdIter) { const deUint32 offs = (deUint32)(cmdIter->m_offset / sizeof(deUint32)); - DE_ASSERT((deIntptr)offs * sizeof(deUint32) == cmdIter->m_offset); + DE_ASSERT((size_t)offs * sizeof(deUint32) == (size_t)cmdIter->m_offset); computeBuffer << "\twriteCmd(" << offs << "u, uvec3(" diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeTests.cpp b/external/vulkancts/modules/vulkan/compute/vktComputeTests.cpp index 308708c..de2959f 100644 --- a/external/vulkancts/modules/vulkan/compute/vktComputeTests.cpp +++ b/external/vulkancts/modules/vulkan/compute/vktComputeTests.cpp @@ -50,7 +50,7 @@ tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx) computeTests->addChild(createBasicComputeShaderTests(testCtx)); computeTests->addChild(createIndirectComputeDispatchTests(testCtx)); computeTests->addChild(createComputeShaderBuiltinVarTests(testCtx)); - + return computeTests.release(); } diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp index e1655de..2095508 100644 --- a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp +++ b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.cpp @@ -82,7 +82,7 @@ VkBufferCreateInfo makeBufferCreateInfo (const VkDeviceSize bufferSize, return bufferCreateInfo; } -VkBufferImageCopy makeBufferImageCopy (const VkExtent3D extent, +VkBufferImageCopy makeBufferImageCopy (const VkExtent3D extent, const deUint32 arraySize) { const VkBufferImageCopy copyParams = diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp index 831db63..6b1ffeb 100644 --- a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp +++ b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp @@ -142,7 +142,7 @@ vk::Move makeImageView (const vk::DeviceInterface& vk, vk::Move makeDescriptorSet (const vk::DeviceInterface& vk, const vk::VkDevice device, - const vk::VkDescriptorPool descriptorPool, + const vk::VkDescriptorPool descriptorPool, const vk::VkDescriptorSetLayout setLayout); vk::VkBufferCreateInfo makeBufferCreateInfo (const vk::VkDeviceSize bufferSize, diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp index 68b1ec7..025f582 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderLoopTests.cpp @@ -109,7 +109,7 @@ static BaseUniformType getFloatFractionUniformType(int number) { switch (number) { - case 1: return UF_ONE; + case 1: return UF_ONE; case 2: return UF_HALF; case 3: return UF_THIRD; case 4: return UF_FOURTH; -- 2.7.4