From a15e7d7f566d93c76ca90171eb728e3d1cd82378 Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Tue, 16 Aug 2016 12:22:39 +0200 Subject: [PATCH] Fix trailing whitespace and include guards Change-Id: If9cf0f5b43ad668243033f7e7c04319c4fcd804d --- .../framework/vulkan/vkAllocationCallbackUtil.cpp | 4 ++-- .../modules/vulkan/clipping/vktClippingTests.cpp | 2 +- .../modules/vulkan/draw/vktDrawIndirectTest.cpp | 8 ++++---- .../modules/vulkan/draw/vktDrawTestCaseUtil.hpp | 2 +- .../vulkancts/modules/vulkan/draw/vktDrawTests.cpp | 2 +- .../vulkan/dynamic_state/vktDynamicStateDSTests.cpp | 4 ++-- .../vulkan/dynamic_state/vktDynamicStateRSTests.cpp | 2 +- .../modules/vulkan/image/vktImageQualifiersTests.cpp | 2 +- .../vulkancts/modules/vulkan/image/vktImageTests.cpp | 2 +- .../vulkan/pipeline/vktPipelineTimestampTests.cpp | 2 +- .../modules/vulkan/query_pool/vktQueryPoolTests.cpp | 2 +- .../vulkan/rasterization/vktRasterizationTests.cpp | 2 +- .../vulkan/shaderexecutor/vktShaderExecutor.cpp | 2 +- .../modules/vulkan/shaderrender/vktShaderRender.cpp | 2 +- .../modules/vulkan/shaderrender/vktShaderRender.hpp | 2 +- .../vktShaderRenderTextureGatherTests.cpp | 8 ++++---- .../sparse_resources/vktSparseResourcesBase.cpp | 2 +- .../sparse_resources/vktSparseResourcesBase.hpp | 4 ++-- .../vktSparseResourcesBufferMemoryAliasing.cpp | 6 +++--- .../vktSparseResourcesBufferSparseBinding.cpp | 2 +- .../vktSparseResourcesBufferSparseResidency.cpp | 4 ++-- .../vktSparseResourcesImageMemoryAliasing.cpp | 2 +- .../vktSparseResourcesImageSparseResidency.cpp | 2 +- .../vktSparseResourcesMipmapSparseResidency.cpp | 2 +- .../vktSparseResourcesShaderIntrinsics.cpp | 2 +- .../vktSparseResourcesShaderIntrinsics.hpp | 2 +- .../vktSparseResourcesShaderIntrinsicsBase.cpp | 16 ++++++++-------- .../vktSparseResourcesShaderIntrinsicsBase.hpp | 2 +- .../vktSparseResourcesShaderIntrinsicsSampled.cpp | 14 +++++++------- .../vktSparseResourcesShaderIntrinsicsSampled.hpp | 2 +- .../vktSparseResourcesShaderIntrinsicsStorage.hpp | 2 +- .../sparse_resources/vktSparseResourcesTests.cpp | 2 +- .../sparse_resources/vktSparseResourcesTests.hpp | 2 +- .../sparse_resources/vktSparseResourcesTestsUtil.cpp | 6 +++--- .../sparse_resources/vktSparseResourcesTestsUtil.hpp | 18 +++++++++--------- .../vktSynchronizationBasicEventTests.cpp | 10 +++++----- .../vktSynchronizationBasicFenceTests.cpp | 2 +- .../vktSynchronizationBasicSemaphoreTests.cpp | 20 ++++++++++---------- ...hronizationInternallySynchronizedObjectsTests.cpp | 2 +- ...hronizationInternallySynchronizedObjectsTests.hpp | 2 +- .../tessellation/vktTessellationUserDefinedIO.hpp | 6 +++--- .../modules/vulkan/ubo/vktUniformBlockCase.cpp | 2 +- .../modules/vulkan/wsi/vktWsiSurfaceTests.hpp | 6 +++--- .../modules/vulkan/wsi/vktWsiSwapchainTests.hpp | 6 +++--- .../vulkancts/modules/vulkan/wsi/vktWsiTests.hpp | 6 +++--- framework/common/tcuCompressedTexture.hpp | 2 +- framework/common/tcuEither.hpp | 4 ++-- framework/common/tcuFloatFormat.hpp | 4 ++-- framework/common/tcuMatrix.hpp | 2 +- framework/common/tcuSurface.hpp | 2 +- framework/common/tcuTestContext.hpp | 2 +- framework/common/tcuThreadUtil.hpp | 4 ++-- framework/delibs/decpp/deUniquePtr.hpp | 4 ++-- framework/egl/egluDefs.hpp | 2 +- framework/egl/egluGLUtil.hpp | 2 +- framework/opengl/gluStrUtil.hpp | 2 +- framework/referencerenderer/rrRenderer.hpp | 2 +- modules/egl/teglImageFormatTests.hpp | 2 +- .../gles31/functional/es31fNegativeTestShared.hpp | 8 ++++---- .../functional/es31fProgramInterfaceDefinition.hpp | 2 +- .../es31fProgramInterfaceDefinitionUtil.hpp | 2 +- modules/glshared/glsAttributeLocationTests.hpp | 4 ++-- modules/glshared/glsDrawTest.hpp | 4 ++-- modules/glshared/glsFboCompletenessTests.hpp | 2 +- modules/glshared/glsLifetimeTests.hpp | 8 ++++---- modules/glshared/glsStateQueryUtil.hpp | 2 +- modules/glshared/glsVertexArrayTests.hpp | 12 ++++++------ 67 files changed, 140 insertions(+), 140 deletions(-) diff --git a/external/vulkancts/framework/vulkan/vkAllocationCallbackUtil.cpp b/external/vulkancts/framework/vulkan/vkAllocationCallbackUtil.cpp index 723706a..2224665 100644 --- a/external/vulkancts/framework/vulkan/vkAllocationCallbackUtil.cpp +++ b/external/vulkancts/framework/vulkan/vkAllocationCallbackUtil.cpp @@ -390,7 +390,7 @@ void validateAllocationCallbacks (const AllocationCallbackRecorder& recorder, Al case AllocationCallbackRecord::TYPE_ALLOCATION: { if (record.data.allocation.returnedPtr) - { + { if (!de::contains(ptrToSlotIndex, record.data.allocation.returnedPtr)) { ptrToSlotIndex[record.data.allocation.returnedPtr] = allocations.size(); @@ -399,7 +399,7 @@ void validateAllocationCallbacks (const AllocationCallbackRecorder& recorder, Al else { const size_t slotNdx = ptrToSlotIndex[record.data.allocation.returnedPtr]; - if (!allocations[slotNdx].isLive) + if (!allocations[slotNdx].isLive) { allocations[slotNdx].isLive = true; allocations[slotNdx].record = record; diff --git a/external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp b/external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp index 1be330f..c0f4666 100644 --- a/external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp +++ b/external/vulkancts/modules/vulkan/clipping/vktClippingTests.cpp @@ -1546,7 +1546,7 @@ void addClippingTests (tcu::TestCaseGroup* clippingTestsGroup) VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP_WITH_ADJACENCY, VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN, }; - + MovePtr clipVolumeGroup(new tcu::TestCaseGroup(testCtx, "clip_volume", "clipping with the clip volume")); // Fully inside the clip volume diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp index 6ab3cb3..5f3a4d1 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawIndirectTest.cpp @@ -149,10 +149,10 @@ IndirectDraw::IndirectDraw (Context &context, ShaderMap shaders, vk::VkPrimitive // Check device for multidraw support: if (m_context.getDeviceFeatures().multiDrawIndirect) - m_isMultiDrawEnabled = true; + m_isMultiDrawEnabled = true; else m_isMultiDrawEnabled = false; - + m_drawIndirectMaxCount = m_context.getDeviceProperties().limits.maxDrawIndirectCount; } @@ -548,7 +548,7 @@ void IndirectDrawTests::init (void) noFirstInstanceGroup->addChild(new InstanceFactory >(m_testCtx, "triangle_list", "Draws an instanced triangle list", shaderPaths, vk::VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST)); noFirstInstanceGroup->addChild(new InstanceFactory >(m_testCtx, "triangle_strip", "Draws an instanced triangle strip", shaderPaths, vk::VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP)); - } + } indirectDrawInstancedGroup->addChild(noFirstInstanceGroup); tcu::TestCaseGroup* firstInstanceGroup = new tcu::TestCaseGroup(m_testCtx, "first_instance", "Use drawIndirectFirstInstance optional feature"); @@ -564,4 +564,4 @@ void IndirectDrawTests::init (void) } } // DrawTests -} // vkt \ No newline at end of file +} // vkt diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawTestCaseUtil.hpp b/external/vulkancts/modules/vulkan/draw/vktDrawTestCaseUtil.hpp index c77783d..2ff9e07 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawTestCaseUtil.hpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawTestCaseUtil.hpp @@ -93,4 +93,4 @@ private: } // Draw } // vkt -#endif // _VKTDRAWTESTCASEUTIL_HPP \ No newline at end of file +#endif // _VKTDRAWTESTCASEUTIL_HPP diff --git a/external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp b/external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp index 54aac18..0a6d1a6 100644 --- a/external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp +++ b/external/vulkancts/modules/vulkan/draw/vktDrawTests.cpp @@ -54,4 +54,4 @@ tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx) } } // Draw -} // vkt \ No newline at end of file +} // vkt diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp index 55ff970..06c38e0 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateDSTests.cpp @@ -331,12 +331,12 @@ protected: memBarrier.srcAccessMask = vk::VK_ACCESS_TRANSFER_WRITE_BIT; memBarrier.dstAccessMask = vk::VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | vk::VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT | vk::VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | vk::VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; - + m_vk.cmdPipelineBarrier(*m_cmdBuffer, vk::VK_PIPELINE_STAGE_TRANSFER_BIT, vk::VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT | vk::VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | vk::VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, 0, 1, &memBarrier, 0, NULL, 0, NULL); - + const vk::VkRect2D renderArea = { { 0, 0 }, { WIDTH, HEIGHT } }; const RenderPassBeginInfo renderPassBegin(*m_renderPass, *m_framebuffer, renderArea); diff --git a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp index c40c1ad..106e2f9 100644 --- a/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp +++ b/external/vulkancts/modules/vulkan/dynamic_state/vktDynamicStateRSTests.cpp @@ -295,7 +295,7 @@ protected: const vk::VkClearDepthStencilValue depthStencilClearValue = { 0.0f, 0 }; const ImageSubresourceRange subresourceRangeDepthStencil[2] = { vk::VK_IMAGE_ASPECT_DEPTH_BIT, vk::VK_IMAGE_ASPECT_STENCIL_BIT }; - + m_vk.cmdClearDepthStencilImage(*m_cmdBuffer, m_depthStencilImage->object(), vk::VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &depthStencilClearValue, 2, subresourceRangeDepthStencil); diff --git a/external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp index 822a5e1..dabe758 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp +++ b/external/vulkancts/modules/vulkan/image/vktImageQualifiersTests.cpp @@ -695,7 +695,7 @@ tcu::TestCaseGroup* createImageQualifiersTests (tcu::TestContext& testCtx) { ImageParams(const ImageType imageType, const tcu::UVec3& imageSize) : m_imageType (imageType) - , m_imageSize (imageSize) + , m_imageSize (imageSize) { } ImageType m_imageType; diff --git a/external/vulkancts/modules/vulkan/image/vktImageTests.cpp b/external/vulkancts/modules/vulkan/image/vktImageTests.cpp index b1a0828..ef6d83f 100644 --- a/external/vulkancts/modules/vulkan/image/vktImageTests.cpp +++ b/external/vulkancts/modules/vulkan/image/vktImageTests.cpp @@ -39,7 +39,7 @@ namespace void createChildren (tcu::TestCaseGroup* imageTests) { tcu::TestContext& testCtx = imageTests->getTestContext(); - + imageTests->addChild(createImageStoreTests(testCtx)); imageTests->addChild(createImageLoadStoreTests(testCtx)); imageTests->addChild(createImageFormatReinterpretTests(testCtx)); diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp index 692367e..43904eb 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp @@ -905,7 +905,7 @@ Move TimestampTestInstance::createImage2DAndBindMemory(VkFormat // Remove storage usage if the optimal tiling feature does not support it usage &= ~VK_IMAGE_USAGE_STORAGE_BIT; } - + const VkImageCreateInfo colorImageParams = { VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, // VkStructureType sType; diff --git a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolTests.cpp b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolTests.cpp index 25a30ff..26dc01b 100644 --- a/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolTests.cpp +++ b/external/vulkancts/modules/vulkan/query_pool/vktQueryPoolTests.cpp @@ -50,4 +50,4 @@ tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx) } } // QueryPool -} // vkt \ No newline at end of file +} // vkt diff --git a/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp b/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp index 0bd032a..9146270 100644 --- a/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp +++ b/external/vulkancts/modules/vulkan/rasterization/vktRasterizationTests.cpp @@ -640,7 +640,7 @@ void BaseRenderingTestInstance::drawPrimitives (tcu::Surface& result, const std: Move vertexBuffer; de::MovePtr vertexBufferMemory; const VkPhysicalDeviceProperties properties = m_context.getDeviceProperties(); - + if (attributeBatchSize > properties.limits.maxVertexInputAttributeOffset) { std::stringstream message; diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp index 4302e28..2426301 100644 --- a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp +++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp @@ -960,7 +960,7 @@ void FragmentOutExecutor::execute (const Context& ctx, int numValues, const void descriptorSetLayout = m_descriptorSetLayoutBuilder.build(vk, vkDevice); if (!m_uniformInfos.empty()) descriptorPool = m_descriptorPoolBuilder.build(vk, vkDevice, VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT, 1u); - else + else { const VkDescriptorPoolSize poolSizeCount = { vk::VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1 }; const VkDescriptorPoolCreateInfo createInfo = diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp index 53ac78c..e7aa41f 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp @@ -1347,7 +1347,7 @@ void ShaderRenderCaseInstance::clearImage (const tcu::Sampler& refSampler, }; - const VkImageSubresourceRange clearRange = + const VkImageSubresourceRange clearRange = { aspectMask, // VkImageAspectFlags aspectMask; 0u, // deUint32 baseMipLevel; diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp index 9eb6e5f..5411736 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp @@ -98,7 +98,7 @@ public: Parameters (deUint32 baseMipLevel_ = 0, vk::VkComponentMapping componentMapping_ = vk::makeComponentMappingRGBA(), - vk::VkSampleCountFlagBits samples_ = vk::VK_SAMPLE_COUNT_1_BIT, + vk::VkSampleCountFlagBits samples_ = vk::VK_SAMPLE_COUNT_1_BIT, Init initialization_ = INIT_UPLOAD_DATA) : baseMipLevel (baseMipLevel_) , componentMapping (componentMapping_) diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureGatherTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureGatherTests.cpp index 4bc20c4..f4ccb04 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureGatherTests.cpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTextureGatherTests.cpp @@ -1503,7 +1503,7 @@ glu::FragmentSource genFragmentShaderSource (bool requireGpuShader5, // Texel declaration frag << "\t" << outType << " texel;\n"; frag << "\tint success = " << funcCall << ";\n"; - + // Check sparse validity, and handle each case frag << "\tif (sparseTexelsResidentARB(success))\n" << "\t\to_color = texel;\n" @@ -1514,7 +1514,7 @@ glu::FragmentSource genFragmentShaderSource (bool requireGpuShader5, { frag << "\t\to_color = " << funcCall << ";\n"; } - + frag << "}\n"; return glu::FragmentSource(frag.str()); @@ -1567,7 +1567,7 @@ string genGatherFuncCall (GatherType gatherType, DE_ASSERT(false); } } - + result += "(u_sampler, v_texCoord"; if (isDepthFormat(textureFormat)) @@ -1614,7 +1614,7 @@ string genGatherFuncCall (GatherType gatherType, if (sparseCase == ShaderRenderCaseInstance::IMAGE_BACKING_MODE_SPARSE) result += ", texel"; - + if (gatherArgs.componentNdx >= 0) { DE_ASSERT(gatherArgs.componentNdx < 4); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp index 497e5a6..2a56079 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp @@ -40,7 +40,7 @@ struct QueueFamilyQueuesCount deUint32 queueCount; }; -SparseResourcesBaseInstance::SparseResourcesBaseInstance (Context &context) +SparseResourcesBaseInstance::SparseResourcesBaseInstance (Context &context) : TestInstance(context) { } diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.hpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.hpp index 94ab2d8..9d32910 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.hpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.hpp @@ -19,8 +19,8 @@ * limitations under the License. * *//*! - * \file vktSparseResourcesBase.hpp - * \brief Sparse Resources Base Instance + * \file vktSparseResourcesBase.hpp + * \brief Sparse Resources Base Instance *//*--------------------------------------------------------------------*/ #include "tcuDefs.hpp" diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp index a7a76b7..a94217b 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferMemoryAliasing.cpp @@ -176,11 +176,11 @@ tcu::TestStatus BufferSparseMemoryAliasingInstance::iterate (void) const Queue& sparseQueue = getQueue(VK_QUEUE_SPARSE_BINDING_BIT, 0); const Queue& computeQueue = getQueue(VK_QUEUE_COMPUTE_BIT, 0); - VkBufferCreateInfo bufferCreateInfo = + VkBufferCreateInfo bufferCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, // VkStructureType sType; DE_NULL, // const void* pNext; - VK_BUFFER_CREATE_SPARSE_BINDING_BIT | + VK_BUFFER_CREATE_SPARSE_BINDING_BIT | VK_BUFFER_CREATE_SPARSE_ALIASED_BIT, // VkBufferCreateFlags flags; m_bufferSizeInBytes, // VkDeviceSize size; VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | @@ -212,7 +212,7 @@ tcu::TestStatus BufferSparseMemoryAliasingInstance::iterate (void) TCU_THROW(NotSupportedError, "Required memory size for sparse resources exceeds device limits"); DE_ASSERT((bufferMemRequirements.size % bufferMemRequirements.alignment) == 0); - + const deUint32 memoryType = findMatchingMemoryType(instance, physicalDevice, bufferMemRequirements, MemoryRequirement::Any); if (memoryType == NO_MATCH_FOUND) diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp index 08c0a9e..9f33b9f 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseBinding.cpp @@ -207,7 +207,7 @@ tcu::TestStatus BufferSparseBindingInstance::iterate (void) referenceData.resize(m_bufferSize); for (deUint32 valueNdx = 0; valueNdx < m_bufferSize; ++valueNdx) - { + { referenceData[valueNdx] = static_cast((valueNdx % bufferMemRequirement.alignment) + 1u); } diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp index 7b5a5e4..8a8beec 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBufferSparseResidency.cpp @@ -158,7 +158,7 @@ tcu::TestStatus BufferSparseResidencyInstance::iterate (void) const Queue& sparseQueue = getQueue(VK_QUEUE_SPARSE_BINDING_BIT, 0); const Queue& computeQueue = getQueue(VK_QUEUE_COMPUTE_BIT, 0); - VkBufferCreateInfo bufferCreateInfo = + VkBufferCreateInfo bufferCreateInfo = { VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO, // VkStructureType sType; DE_NULL, // const void* pNext; @@ -303,7 +303,7 @@ tcu::TestStatus BufferSparseResidencyInstance::iterate (void) deviceInterface.cmdPipelineBarrier(*commandBuffer, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0u, 0u, DE_NULL, 1u, &inputBufferBarrier, 0u, DE_NULL); } - + deviceInterface.cmdDispatch(*commandBuffer, 1u, 1u, 1u); { diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp index 8ee3321..f137b33 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageMemoryAliasing.cpp @@ -244,7 +244,7 @@ tcu::TestStatus ImageSparseMemoryAliasingInstance::iterate (void) const Unique imageRead(createImage(deviceInterface, *m_logicalDevice, &imageSparseInfo)); const Unique imageWrite(createImage(deviceInterface, *m_logicalDevice, &imageSparseInfo)); - // Create semaphores to synchronize sparse binding operations with other operations on the sparse images + // Create semaphores to synchronize sparse binding operations with other operations on the sparse images const Unique memoryBindSemaphoreTransfer(makeSemaphore(deviceInterface, *m_logicalDevice)); const Unique memoryBindSemaphoreCompute(makeSemaphore(deviceInterface, *m_logicalDevice)); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp index 4392706..c9e889a 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesImageSparseResidency.cpp @@ -503,7 +503,7 @@ tcu::TestStatus ImageSparseResidencyInstance::iterate (void) VK_ACCESS_TRANSFER_WRITE_BIT, VK_ACCESS_HOST_READ_BIT, outputBuffer->get(), - 0u, + 0u, imageSizeInBytes ); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp index fa821c8..8d5fa6a 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesMipmapSparseResidency.cpp @@ -453,7 +453,7 @@ tcu::TestCaseGroup* createMipmapSparseResidencyTests (tcu::TestContext& testCtx) ImageType imageType; tcu::UVec3 imageSizes[sizeCountPerImageType]; }; - + static const ImageParameters imageParametersArray[] = { { IMAGE_TYPE_2D, { tcu::UVec3(512u, 256u, 1u), tcu::UVec3(1024u, 128u, 1u), tcu::UVec3(11u, 137u, 1u) } }, diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.cpp index 7af6493..a8535a6 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.cpp @@ -78,7 +78,7 @@ tcu::TestCaseGroup* createSparseResourcesShaderIntrinsicsTests (tcu::TestContext for (deInt32 imageTypeNdx = 0; imageTypeNdx < DE_LENGTH_OF_ARRAY(imageParametersArray); ++imageTypeNdx) { const ImageType imageType = imageParametersArray[imageTypeNdx].imageType; - de::MovePtr imageTypeGroup(new tcu::TestCaseGroup(testCtx, (getImageTypeName(imageType) + functions[functionNdx]).c_str(), "")); + de::MovePtr imageTypeGroup(new tcu::TestCaseGroup(testCtx, (getImageTypeName(imageType) + functions[functionNdx]).c_str(), "")); for (deInt32 formatNdx = 0; formatNdx < DE_LENGTH_OF_ARRAY(formats); ++formatNdx) { diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.hpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.hpp index 53ada12..702b635 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.hpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsics.hpp @@ -36,4 +36,4 @@ tcu::TestCaseGroup* createSparseResourcesShaderIntrinsicsTests(tcu::TestContext& } // sparse } // vkt -#endif // _VKTSPARSERESOURCESSHADERINTRINSICS_HPP \ No newline at end of file +#endif // _VKTSPARSERESOURCESSHADERINTRINSICS_HPP diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp index 3178fce..32e82ac 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.cpp @@ -202,9 +202,9 @@ tcu::TestStatus SparseShaderIntrinsicsInstanceBase::iterate (void) TCU_THROW(NotSupportedError, "Sparse residency for image type is not supported"); imageSparseInfo.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; - imageSparseInfo.pNext = DE_NULL; + imageSparseInfo.pNext = DE_NULL; imageSparseInfo.flags = VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT | VK_IMAGE_CREATE_SPARSE_BINDING_BIT; - imageSparseInfo.imageType = mapImageType(m_imageType); + imageSparseInfo.imageType = mapImageType(m_imageType); imageSparseInfo.format = mapTextureFormat(m_format); imageSparseInfo.extent = makeExtent3D(getLayerSize(m_imageType, m_imageSize)); imageSparseInfo.arrayLayers = getNumLayers(m_imageType, m_imageSize); @@ -289,7 +289,7 @@ tcu::TestStatus SparseShaderIntrinsicsInstanceBase::iterate (void) aspectRequirements = sparseMemoryRequirements[colorAspectIndex]; DE_ASSERT((aspectRequirements.imageMipTailSize % imageMemoryRequirements.alignment) == 0); - + const VkImageAspectFlags aspectMask = aspectRequirements.formatProperties.aspectMask; const VkExtent3D imageGranularity = aspectRequirements.formatProperties.imageGranularity; const deUint32 memoryType = findMatchingMemoryType(instance, physicalDevice, imageMemoryRequirements, MemoryRequirement::Any); @@ -506,7 +506,7 @@ tcu::TestStatus SparseShaderIntrinsicsInstanceBase::iterate (void) // Copy reference data from input buffer to sparse image std::vector bufferImageCopy; bufferImageCopy.resize(imageSparseInfo.mipLevels); - + bufferOffset = 0u; for (deUint32 mipLevelNdx = 0u; mipLevelNdx < imageSparseInfo.mipLevels; ++mipLevelNdx) { @@ -562,12 +562,12 @@ tcu::TestStatus SparseShaderIntrinsicsInstanceBase::iterate (void) deviceInterface.cmdPipelineBarrier(*commandBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_HOST_BIT, 0u, 0u, DE_NULL, 2u, bufferOutputHostReadBarriers, 0u, DE_NULL); } - + // End recording commands endCommandBuffer(deviceInterface, *commandBuffer); - + const VkPipelineStageFlags stageBits[] = { VK_PIPELINE_STAGE_TRANSFER_BIT }; - + // Submit commands for execution and wait for completion submitCommandsAndWait(deviceInterface, *m_logicalDevice, extractQueue.queueHandle, *commandBuffer, 1u, &memoryBindSemaphore.get(), stageBits); @@ -582,7 +582,7 @@ tcu::TestStatus SparseShaderIntrinsicsInstanceBase::iterate (void) if (deMemCmp(&bufferResidencyData[0], &residencyReferenceData[0], imageResidencySizeInBytes) != 0) return tcu::TestStatus::fail("Failed"); - + // Retrieve data from texels buffer to host memory const Allocation& bufferTexelsAllocation = bufferTexels->getAllocation(); diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.hpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.hpp index f459aef..5c1028f 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.hpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsBase.hpp @@ -173,4 +173,4 @@ protected: } // sparse } // vkt -#endif // _VKTSPARSERESOURCESSHADERINTRINSICSBASE_HPP \ No newline at end of file +#endif // _VKTSPARSERESOURCESSHADERINTRINSICSBASE_HPP diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.cpp index 502dda2..2bdb612 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.cpp @@ -231,7 +231,7 @@ void SparseShaderIntrinsicsCaseSampledBase::initPrograms (vk::SourceCollections& << "OpBranch %branch_texel_resident\n" << "%branch_texel_resident = OpLabel\n" - + << "OpReturn\n" << "OpFunctionEnd\n"; @@ -371,7 +371,7 @@ void SparseShaderIntrinsicsInstanceSampledBase::recordCommands (vk::Allocator& if (!checkImageFormatFeatureSupport(instance, physicalDevice, imageSparseInfo.format, VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT)) TCU_THROW(NotSupportedError, "Device does not support image format for sampled images"); - // Check if device supports image format for color attachment + // Check if device supports image format for color attachment if (!checkImageFormatFeatureSupport(instance, physicalDevice, imageSparseInfo.format, VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT)) TCU_THROW(NotSupportedError, "Device does not support image format for color attachment"); @@ -384,7 +384,7 @@ void SparseShaderIntrinsicsInstanceSampledBase::recordCommands (vk::Allocator& vertexData.push_back(tcu::Vec2(-1.0f,-1.0f)); vertexData.push_back(tcu::Vec2( 0.0f, 0.0f)); - + vertexData.push_back(tcu::Vec2(-1.0f, 1.0f)); vertexData.push_back(tcu::Vec2( 0.0f, 1.0f)); @@ -409,7 +409,7 @@ void SparseShaderIntrinsicsInstanceSampledBase::recordCommands (vk::Allocator& vertexBuffer = de::SharedPtr(new Buffer(deviceInterface, *m_logicalDevice, allocator, makeBufferCreateInfo(vertexDataSizeInBytes, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT), MemoryRequirement::HostVisible)); const Allocation& vertexBufferAllocation = vertexBuffer->getAllocation(); - + deMemcpy(vertexBufferAllocation.getHostPtr(), &vertexData[0], static_cast(vertexDataSizeInBytes)); flushMappedMemoryRange(deviceInterface, *m_logicalDevice, vertexBufferAllocation.getMemory(), vertexBufferAllocation.getOffset(), vertexDataSizeInBytes); @@ -630,8 +630,8 @@ void SparseShaderIntrinsicsInstanceSampledBase::recordCommands (vk::Allocator& for (deUint32 mipLevelNdx = 0u; mipLevelNdx < imageSparseInfo.mipLevels; ++mipLevelNdx) { const vk::VkExtent3D mipLevelSize = mipLevelExtents(imageSparseInfo.extent, mipLevelNdx); - - const vk::VkRect2D renderArea = + + const vk::VkRect2D renderArea = { makeOffset2D(0u, 0u), makeExtent2D(mipLevelSize.width, mipLevelSize.height), @@ -707,7 +707,7 @@ void SparseShaderIntrinsicsInstanceSampledBase::recordCommands (vk::Allocator& // Draw full screen quad deviceInterface.cmdDraw(commandBuffer, 4u, 1u, 0u, 0u); - + // End render pass endRenderPass(deviceInterface, commandBuffer); } diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.hpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.hpp index f898214..867c608 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.hpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsSampled.hpp @@ -123,4 +123,4 @@ public: } // sparse } // vkt -#endif // _VKTSPARSERESOURCESSHADERINTRINSICSSAMPLED_HPP \ No newline at end of file +#endif // _VKTSPARSERESOURCESSHADERINTRINSICSSAMPLED_HPP diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.hpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.hpp index 47f1b7c..fdc8940 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.hpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesShaderIntrinsicsStorage.hpp @@ -92,4 +92,4 @@ public: } // sparse } // vkt -#endif // _VKTSPARSERESOURCESSHADERINTRINSICSSTORAGE_HPP \ No newline at end of file +#endif // _VKTSPARSERESOURCESSHADERINTRINSICSSTORAGE_HPP diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp index 319f92d..4969137 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.cpp @@ -49,7 +49,7 @@ tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx) sparseTests->addChild(createBufferSparseMemoryAliasingTests(testCtx)); sparseTests->addChild(createImageSparseMemoryAliasingTests(testCtx)); sparseTests->addChild(createSparseResourcesShaderIntrinsicsTests(testCtx)); - + return sparseTests.release(); } diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.hpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.hpp index 28b21eb..3f2302b 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.hpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTests.hpp @@ -20,7 +20,7 @@ * *//*! * \file vktSparseResourcesTests.hpp - * \brief Sparse Resources Tests + * \brief Sparse Resources Tests *//*--------------------------------------------------------------------*/ #include "tcuDefs.hpp" diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp index c5f4d0c..e0f719b 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.cpp @@ -812,7 +812,7 @@ VkSparseImageMemoryBind makeSparseImageMemoryBind (const DeviceInterface& vk, } VkSparseMemoryBind makeSparseMemoryBind (const vk::DeviceInterface& vk, - const vk::VkDevice device, + const vk::VkDevice device, const vk::VkDeviceSize allocationSize, const deUint32 memoryType, const vk::VkDeviceSize resourceOffset) @@ -1135,7 +1135,7 @@ Move GraphicsPipelineBuilder::build (const DeviceInterface& vk, 0.0f, 1.0f ); - const VkRect2D scissor = + const VkRect2D scissor = { makeOffset2D(0, 0), makeExtent2D(m_renderSize.x(), m_renderSize.y()), @@ -1193,7 +1193,7 @@ Move GraphicsPipelineBuilder::build (const DeviceInterface& vk, 0u, // compare mask 0u, // write mask 0u // reference - ); + ); const VkPipelineDepthStencilStateCreateInfo pipelineDepthStencilStateInfo = { diff --git a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp index 88d967d..f7e1dab 100644 --- a/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp +++ b/external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesTestsUtil.hpp @@ -169,22 +169,22 @@ std::string getShaderImageCoordinates (const ImageType imageType, const std::string& xy, const std::string& xyz); //!< Size used for addresing image in a compute shader -tcu::UVec3 getShaderGridSize (const ImageType imageType, - const tcu::UVec3& imageSize, +tcu::UVec3 getShaderGridSize (const ImageType imageType, + const tcu::UVec3& imageSize, const deUint32 mipLevel = 0); //!< Size of a single image layer -tcu::UVec3 getLayerSize (const ImageType imageType, +tcu::UVec3 getLayerSize (const ImageType imageType, const tcu::UVec3& imageSize); //!< Number of array layers (for array and cube types) -deUint32 getNumLayers (const ImageType imageType, +deUint32 getNumLayers (const ImageType imageType, const tcu::UVec3& imageSize); //!< Number of texels in an image -deUint32 getNumPixels (const ImageType imageType, +deUint32 getNumPixels (const ImageType imageType, const tcu::UVec3& imageSize); //!< Coordinate dimension used for addressing (e.g. 3 (x,y,z) for 2d array) deUint32 getDimensions (const ImageType imageType); //!< Coordinate dimension used for addressing a single layer (e.g. 2 (x,y) for 2d array) -deUint32 getLayerDimensions (const ImageType imageType); +deUint32 getLayerDimensions (const ImageType imageType); //!< Helper function for checking if requested image size does not exceed device limits bool isImageSizeSupported (const vk::InstanceInterface& instance, const vk::VkPhysicalDevice physicalDevice, @@ -322,11 +322,11 @@ vk::VkSparseMemoryBind makeSparseMemoryBind (const vk::DeviceInterface& vk const deUint32 memoryType, const vk::VkDeviceSize resourceOffset); -vk::Move makeRenderPass (const vk::DeviceInterface& vk, - const vk::VkDevice device, +vk::Move makeRenderPass (const vk::DeviceInterface& vk, + const vk::VkDevice device, const vk::VkFormat colorFormat); -vk::Move makeRenderPassWithoutAttachments(const vk::DeviceInterface& vk, +vk::Move makeRenderPassWithoutAttachments(const vk::DeviceInterface& vk, const vk::VkDevice device); vk::Move makeFramebuffer (const vk::DeviceInterface& vk, diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp index 42163aa..2986ff9 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicEventTests.cpp @@ -164,7 +164,7 @@ tcu::TestStatus deviceWaitForEventCase (Context& context) const Unique event (createEvent(vk, device, &eventInfo, DE_NULL)); beginCommandBuffer(vk, *cmdBuffer); - vk.cmdWaitEvents(*cmdBuffer, 1u, &event.get(), VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0u, DE_NULL, 0u, DE_NULL, 0u, DE_NULL); + vk.cmdWaitEvents(*cmdBuffer, 1u, &event.get(), VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0u, DE_NULL, 0u, DE_NULL, 0u, DE_NULL); endCommandBuffer(vk, *cmdBuffer); VK_CHECK(vk.queueSubmit(queue, 1u, &submitInfo, *fence)); @@ -173,7 +173,7 @@ tcu::TestStatus deviceWaitForEventCase (Context& context) if (VK_SUCCESS != vk.setEvent(device, *event)) return tcu::TestStatus::fail("Couldn't set event"); - + if (VK_SUCCESS != vk.waitForFences(device, 1u, &fence.get(), DE_TRUE, LONG_FENCE_WAIT)) return tcu::TestStatus::fail("Queue should end execution"); @@ -222,7 +222,7 @@ tcu::TestStatus singleSubmissionCase (Context& context) endCommandBuffer(vk, cmdBuffers[SET]); beginCommandBuffer(vk, cmdBuffers[WAIT]); - vk.cmdWaitEvents(cmdBuffers[WAIT], 1u, &event.get(),VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0u, DE_NULL, 0u, DE_NULL, 0u, DE_NULL); + vk.cmdWaitEvents(cmdBuffers[WAIT], 1u, &event.get(),VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0u, DE_NULL, 0u, DE_NULL, 0u, DE_NULL); endCommandBuffer(vk, cmdBuffers[WAIT]); VK_CHECK(vk.queueSubmit(queue, 1u, &submitInfo, *fence)); @@ -288,7 +288,7 @@ tcu::TestStatus multiSubmissionCase (Context& context) endCommandBuffer(vk, cmdBuffers[SET]); beginCommandBuffer(vk, cmdBuffers[WAIT]); - vk.cmdWaitEvents(cmdBuffers[WAIT], 1u, &event.get(), VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0u, DE_NULL, 0u, DE_NULL, 0u, DE_NULL); + vk.cmdWaitEvents(cmdBuffers[WAIT], 1u, &event.get(), VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0u, DE_NULL, 0u, DE_NULL, 0u, DE_NULL); endCommandBuffer(vk, cmdBuffers[WAIT]); VK_CHECK(vk.queueSubmit(queue, 1u, &submitInfo[SET], fence[SET])); @@ -370,7 +370,7 @@ tcu::TestStatus secondaryCommandBufferCase (Context& context) endCommandBuffer(vk, secondaryCmdBuffers[SET]); VK_CHECK(vk.beginCommandBuffer(secondaryCmdBuffers[WAIT], &cmdBufferBeginInfo)); - vk.cmdWaitEvents(secondaryCmdBuffers[WAIT], 1u, &event.get(),VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0u, DE_NULL, 0u, DE_NULL, 0u, DE_NULL); + vk.cmdWaitEvents(secondaryCmdBuffers[WAIT], 1u, &event.get(),VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0u, DE_NULL, 0u, DE_NULL, 0u, DE_NULL); endCommandBuffer(vk, secondaryCmdBuffers[WAIT]); beginCommandBuffer(vk, *primaryCmdBuffer); diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp index 90367ef..fbde395 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicFenceTests.cpp @@ -69,7 +69,7 @@ tcu::TestStatus basicOneFenceCase (Context& context) 0u, // deUint32 signalSemaphoreCount; DE_NULL, // const VkSemaphore* pSignalSemaphores; }; - + if (VK_NOT_READY != vk.getFenceStatus(device, *fence)) return tcu::TestStatus::fail("Created fence should be in unsignaled state"); diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp index b667f91..a28c11d 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp @@ -98,7 +98,7 @@ tcu::TestStatus basicOneQueueCase (Context& context) 0u, // VkFenceCreateFlags flags; }; const Unique fence (createFence(vk, device, &fenceInfo)); - + VK_CHECK(vk.beginCommandBuffer(*cmdBuffer, &info)); endCommandBuffer(vk, *cmdBuffer); VK_CHECK(vk.queueSubmit(queue, 2u, submitInfo, *fence)); @@ -236,15 +236,15 @@ tcu::TestStatus basicMultiQueueCase (Context& context) submitInfo[FIRST].pSignalSemaphores = &semaphore.get(); submitInfo[SECOND].sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submitInfo[SECOND].pNext = DE_NULL; - submitInfo[SECOND].waitSemaphoreCount = 1u; - submitInfo[SECOND].pWaitSemaphores = &semaphore.get(); - submitInfo[SECOND].pWaitDstStageMask = stageBits; - submitInfo[SECOND].commandBufferCount = 1u; - submitInfo[SECOND].pCommandBuffers = &cmdBuffer[SECOND].get(); + submitInfo[SECOND].pNext = DE_NULL; + submitInfo[SECOND].waitSemaphoreCount = 1u; + submitInfo[SECOND].pWaitSemaphores = &semaphore.get(); + submitInfo[SECOND].pWaitDstStageMask = stageBits; + submitInfo[SECOND].commandBufferCount = 1u; + submitInfo[SECOND].pCommandBuffers = &cmdBuffer[SECOND].get(); submitInfo[SECOND].signalSemaphoreCount = 0u; - submitInfo[SECOND].pSignalSemaphores = DE_NULL; - + submitInfo[SECOND].pSignalSemaphores = DE_NULL; + VK_CHECK(vk.beginCommandBuffer(*cmdBuffer[FIRST], &info)); endCommandBuffer(vk, *cmdBuffer[FIRST]); VK_CHECK(vk.beginCommandBuffer(*cmdBuffer[SECOND], &info)); @@ -266,7 +266,7 @@ tcu::TestStatus basicMultiQueueCase (Context& context) VkSubmitInfo swapInfo = submitInfo[SECOND]; submitInfo[SECOND] = submitInfo[FIRST]; submitInfo[FIRST] = swapInfo; - submitInfo[SECOND].pCommandBuffers = &cmdBuffer[SECOND].get(); + submitInfo[SECOND].pCommandBuffers = &cmdBuffer[SECOND].get(); submitInfo[FIRST].pCommandBuffers = &cmdBuffer[FIRST].get(); } diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp index 8706ead..0a41b37 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.cpp @@ -1187,4 +1187,4 @@ tcu::TestCaseGroup* createInternallySynchronizedObjects (tcu::TestContext& testC } } // synchronization -} // vkt \ No newline at end of file +} // vkt diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.hpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.hpp index 156d5e5..4605f6e 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.hpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationInternallySynchronizedObjectsTests.hpp @@ -37,4 +37,4 @@ tcu::TestCaseGroup* createInternallySynchronizedObjects(tcu::TestContext& testC } // vkt -#endif // _VKTSYNCHRONIZATIONINTERNALLYSYNCHRONIZEDOBJECTSTESTS_HPP \ No newline at end of file +#endif // _VKTSYNCHRONIZATIONINTERNALLYSYNCHRONIZEDOBJECTSTESTS_HPP diff --git a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.hpp b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.hpp index a60aa06..bc577c3 100644 --- a/external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.hpp +++ b/external/vulkancts/modules/vulkan/tessellation/vktTessellationUserDefinedIO.hpp @@ -1,5 +1,5 @@ -#ifndef _VKTTESSELLATIONUSERDEFINEDIOTESTS_HPP -#define _VKTTESSELLATIONUSERDEFINEDIOTESTS_HPP +#ifndef _VKTTESSELLATIONUSERDEFINEDIO_HPP +#define _VKTTESSELLATIONUSERDEFINEDIO_HPP /*------------------------------------------------------------------------ * Vulkan Conformance Tests * ------------------------ @@ -37,4 +37,4 @@ tcu::TestCaseGroup* createUserDefinedIOTests (tcu::TestContext& testCtx); } // tessellation } // vkt -#endif // _VKTTESSELLATIONUSERDEFINEDIOTESTS_HPP +#endif // _VKTTESSELLATIONUSERDEFINEDIO_HPP diff --git a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp index c575266..5a5db75 100644 --- a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp +++ b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp @@ -1657,7 +1657,7 @@ tcu::TestStatus UniformBlockCaseInstance::iterate (void) &clearValue, // const VkClearValue* pClearValues; }; - // Add barrier for initializing image state + // Add barrier for initializing image state { const vk::VkImageMemoryBarrier initializeBarrier = { diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.hpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.hpp index 53f147e..c0a64c1 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.hpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.hpp @@ -1,5 +1,5 @@ -#ifndef _VKWSISURFACETESTS_HPP -#define _VKWSISURFACETESTS_HPP +#ifndef _VKTWSISURFACETESTS_HPP +#define _VKTWSISURFACETESTS_HPP /*------------------------------------------------------------------------- * Vulkan Conformance Tests * ------------------------ @@ -37,4 +37,4 @@ void createSurfaceTests (tcu::TestCaseGroup* testGroup, vk::wsi::Type wsiType); } // wsi } // vkt -#endif // _VKWSISURFACETESTS_HPP +#endif // _VKTWSISURFACETESTS_HPP diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.hpp b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.hpp index 25c54ec..29a3890 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.hpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.hpp @@ -1,5 +1,5 @@ -#ifndef _VKWSISWAPCHAINTESTS_HPP -#define _VKWSISWAPCHAINTESTS_HPP +#ifndef _VKTWSISWAPCHAINTESTS_HPP +#define _VKTWSISWAPCHAINTESTS_HPP /*------------------------------------------------------------------------- * Vulkan Conformance Tests * ------------------------ @@ -37,4 +37,4 @@ void createSwapchainTests (tcu::TestCaseGroup* testGroup, vk::wsi::Type wsiType) } // wsi } // vkt -#endif // _VKWSISWAPCHAINTESTS_HPP +#endif // _VKTWSISWAPCHAINTESTS_HPP diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiTests.hpp b/external/vulkancts/modules/vulkan/wsi/vktWsiTests.hpp index c722318..715f319 100644 --- a/external/vulkancts/modules/vulkan/wsi/vktWsiTests.hpp +++ b/external/vulkancts/modules/vulkan/wsi/vktWsiTests.hpp @@ -1,5 +1,5 @@ -#ifndef _VKWSITESTS_HPP -#define _VKWSITESTS_HPP +#ifndef _VKTWSITESTS_HPP +#define _VKTWSITESTS_HPP /*------------------------------------------------------------------------- * Vulkan Conformance Tests * ------------------------ @@ -36,4 +36,4 @@ tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx); } // wsi } // vkt -#endif // _VKWSITESTS_HPP +#endif // _VKTWSITESTS_HPP diff --git a/framework/common/tcuCompressedTexture.hpp b/framework/common/tcuCompressedTexture.hpp index 35d7956..24a3490 100644 --- a/framework/common/tcuCompressedTexture.hpp +++ b/framework/common/tcuCompressedTexture.hpp @@ -77,7 +77,7 @@ enum CompressedTexFormat COMPRESSEDTEXFORMAT_LAST }; -int getBlockSize (CompressedTexFormat format); +int getBlockSize (CompressedTexFormat format); IVec3 getBlockPixelSize (CompressedTexFormat format); bool isEtcFormat (CompressedTexFormat format); diff --git a/framework/common/tcuEither.hpp b/framework/common/tcuEither.hpp index 40c326a..51a2955 100644 --- a/framework/common/tcuEither.hpp +++ b/framework/common/tcuEither.hpp @@ -32,9 +32,9 @@ namespace tcu * \brief Object containing Either First or Second type of object * * \note Type First and Second are always aligned to same alignment as - * deUint64. + * deUint64. * \note This type always uses at least sizeof(bool) + max(sizeof(First*), - * sizeof(Second*)) + sizeof(deUint64) of memory. + * sizeof(Second*)) + sizeof(deUint64) of memory. *//*--------------------------------------------------------------------*/ template class Either diff --git a/framework/common/tcuFloatFormat.hpp b/framework/common/tcuFloatFormat.hpp index ddc3cf6..a7eea9e 100644 --- a/framework/common/tcuFloatFormat.hpp +++ b/framework/common/tcuFloatFormat.hpp @@ -65,13 +65,13 @@ public: Interval convert (const Interval& x) const; std::string floatToHex (double x) const; - std::string intervalToHex (const Interval& interval) const; + std::string intervalToHex (const Interval& interval) const; static FloatFormat nativeFloat (void); static FloatFormat nativeDouble (void); private: - int exponentShift (int exp) const; + int exponentShift (int exp) const; Interval clampValue (double d) const; int m_minExp; // Minimum exponent, inclusive diff --git a/framework/common/tcuMatrix.hpp b/framework/common/tcuMatrix.hpp index 31e9346..1ce18d8 100644 --- a/framework/common/tcuMatrix.hpp +++ b/framework/common/tcuMatrix.hpp @@ -20,7 +20,7 @@ * *//*! * \file - * \brief Templatized matrix class. + * \brief Templatized matrix class. *//*--------------------------------------------------------------------*/ #include "tcuDefs.hpp" diff --git a/framework/common/tcuSurface.hpp b/framework/common/tcuSurface.hpp index b9e4863..7727cf6 100644 --- a/framework/common/tcuSurface.hpp +++ b/framework/common/tcuSurface.hpp @@ -63,7 +63,7 @@ private: // \note Copy constructor and assignment operators are public and auto-generated int m_width; - int m_height; + int m_height; de::ArrayBuffer m_pixels; } DE_WARN_UNUSED_TYPE; diff --git a/framework/common/tcuTestContext.hpp b/framework/common/tcuTestContext.hpp index 2bf4ed3..0a8bddc 100644 --- a/framework/common/tcuTestContext.hpp +++ b/framework/common/tcuTestContext.hpp @@ -68,7 +68,7 @@ public: void setCurrentArchive (Archive& archive) { m_curArchive = &archive; } void setTerminateAfter (bool terminate) { m_terminateAfter = terminate; } - bool getTerminateAfter (void) const { return m_terminateAfter; } + bool getTerminateAfter (void) const { return m_terminateAfter; } protected: TestContext (const TestContext&); diff --git a/framework/common/tcuThreadUtil.hpp b/framework/common/tcuThreadUtil.hpp index 7157d2c..ed58c23 100644 --- a/framework/common/tcuThreadUtil.hpp +++ b/framework/common/tcuThreadUtil.hpp @@ -48,7 +48,7 @@ public: RESULT_FAILED }; - Event (void); + Event (void); ~Event (void); void setResult (Result result); Result waitReady (void); @@ -103,7 +103,7 @@ public: EndToken (void) {} }; - void operator<< (const EndToken&); + void operator<< (const EndToken&); private: Thread& m_thread; diff --git a/framework/delibs/decpp/deUniquePtr.hpp b/framework/delibs/decpp/deUniquePtr.hpp index 6560a77..eba9103 100644 --- a/framework/delibs/decpp/deUniquePtr.hpp +++ b/framework/delibs/decpp/deUniquePtr.hpp @@ -171,7 +171,7 @@ inline MovePtr movePtr (T* ptr) { return MovePtr(ptr); } //! Allocate and construct an object and return its address as a MovePtr. template -inline MovePtr newMovePtr (void) { return MovePtr(new T()); } +inline MovePtr newMovePtr (void) { return MovePtr(new T()); } template inline MovePtr newMovePtr (P0 p0) { return MovePtr(new T(p0)); } template @@ -194,7 +194,7 @@ inline MovePtr newMovePtr (P0 p0, P1 p1, P2 p2) { return MovePtr(new T(p0, * copied, direct initialization syntax must be used, i.e.: * * MovePtr createFoo (void); - * UniquePtr fooPtr(createFoo()); // NOT fooPtr = createFoo(); + * UniquePtr fooPtr(createFoo()); // NOT fooPtr = createFoo(); * *//*--------------------------------------------------------------------*/ template > diff --git a/framework/egl/egluDefs.hpp b/framework/egl/egluDefs.hpp index 3d6c7ce..affee84 100644 --- a/framework/egl/egluDefs.hpp +++ b/framework/egl/egluDefs.hpp @@ -75,7 +75,7 @@ public: bool operator>= (const Version& v) const; private: - int m_major; + int m_major; int m_minor; }; diff --git a/framework/egl/egluGLUtil.hpp b/framework/egl/egluGLUtil.hpp index e0db6ba..5f821b2 100644 --- a/framework/egl/egluGLUtil.hpp +++ b/framework/egl/egluGLUtil.hpp @@ -38,7 +38,7 @@ namespace eglu { glw::GLenum getImageGLTarget (eglw::EGLenum source); -eglw::EGLint apiRenderableType (glu::ApiType apiType); +eglw::EGLint apiRenderableType (glu::ApiType apiType); eglw::EGLContext createGLContext (const eglw::Library& egl, eglw::EGLDisplay display, eglw::EGLConfig config, const glu::ContextType& contextType); eglw::EGLConfig chooseConfig (const eglw::Library& egl, eglw::EGLDisplay display, const glu::RenderConfig& config); diff --git a/framework/opengl/gluStrUtil.hpp b/framework/opengl/gluStrUtil.hpp index cc402f9..e574c1a 100644 --- a/framework/opengl/gluStrUtil.hpp +++ b/framework/opengl/gluStrUtil.hpp @@ -49,7 +49,7 @@ public: class BooleanPointerFmt { public: - const deUint8* const value; + const deUint8* const value; const deUint32 size; BooleanPointerFmt (const deUint8* value_, deUint32 size_) : value(value_), size(size_) {} diff --git a/framework/referencerenderer/rrRenderer.hpp b/framework/referencerenderer/rrRenderer.hpp index 6655b5d..0b0dade 100644 --- a/framework/referencerenderer/rrRenderer.hpp +++ b/framework/referencerenderer/rrRenderer.hpp @@ -45,7 +45,7 @@ public: const MultisamplePixelBufferAccess& depthMultisampleBuffer = MultisamplePixelBufferAccess(), const MultisamplePixelBufferAccess& stencilMultisampleBuffer = MultisamplePixelBufferAccess()); - int getNumSamples (void) const; + int getNumSamples (void) const; const MultisamplePixelBufferAccess& getColorBuffer (int ndx) const { DE_ASSERT(de::inRange(ndx, 0, m_numColorBuffers)); return m_colorBuffers[ndx]; } int getNumColorBuffers (void) const { return m_numColorBuffers; } diff --git a/modules/egl/teglImageFormatTests.hpp b/modules/egl/teglImageFormatTests.hpp index af3fcaf..3d758b1 100644 --- a/modules/egl/teglImageFormatTests.hpp +++ b/modules/egl/teglImageFormatTests.hpp @@ -33,7 +33,7 @@ namespace egl namespace Image { -TestCaseGroup* createSimpleCreationTests (EglTestContext& eglTestCtx, const std::string& name, const std::string& desc); +TestCaseGroup* createSimpleCreationTests (EglTestContext& eglTestCtx, const std::string& name, const std::string& desc); TestCaseGroup* createModifyTests (EglTestContext& eglTestCtx, const std::string& name, const std::string& desc); TestCaseGroup* createMultiContextRenderTests (EglTestContext& eglTestCtx, const std::string& name, const std::string& desc); diff --git a/modules/gles31/functional/es31fNegativeTestShared.hpp b/modules/gles31/functional/es31fNegativeTestShared.hpp index faa5001..6963bed 100644 --- a/modules/gles31/functional/es31fNegativeTestShared.hpp +++ b/modules/gles31/functional/es31fNegativeTestShared.hpp @@ -49,7 +49,7 @@ class ErrorCase : public TestCase { public: ErrorCase (Context& ctx, const char* name, const char* desc); - virtual ~ErrorCase (void) {} + virtual ~ErrorCase (void) {} virtual void expectError (glw::GLenum error0, glw::GLenum error1) = 0; }; @@ -65,21 +65,21 @@ public: void fail (const std::string& msg); int getInteger (glw::GLenum pname) const; const glu::RenderContext& getRenderContext (void) const { return m_renderCtx; } - const glu::ContextInfo& getContextInfo (void) const { return m_ctxInfo; } + const glu::ContextInfo& getContextInfo (void) const { return m_ctxInfo; } void beginSection (const std::string& desc); void endSection (void); void expectError (glw::GLenum error); void expectError (glw::GLenum error0, glw::GLenum error1); bool isShaderSupported (glu::ShaderType shaderType); - bool isExtensionSupported (std::string extension); + bool isExtensionSupported (std::string extension); protected: ErrorCase& m_host; private: glu::RenderContext& m_renderCtx; - const glu::ContextInfo& m_ctxInfo; + const glu::ContextInfo& m_ctxInfo; tcu::ResultCollector& m_results; int m_openSections; }; diff --git a/modules/gles31/functional/es31fProgramInterfaceDefinition.hpp b/modules/gles31/functional/es31fProgramInterfaceDefinition.hpp index a0bb092..59837fc 100644 --- a/modules/gles31/functional/es31fProgramInterfaceDefinition.hpp +++ b/modules/gles31/functional/es31fProgramInterfaceDefinition.hpp @@ -107,7 +107,7 @@ public: deUint32 getGeometryNumOutputVertices (void) const; void setGeometryNumOutputVertices (deUint32); - deUint32 getTessellationNumOutputPatchVertices (void) const; + deUint32 getTessellationNumOutputPatchVertices (void) const; void setTessellationNumOutputPatchVertices (deUint32); bool isValid (void) const; diff --git a/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp b/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp index efd9e03..dd7cfa4 100644 --- a/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp +++ b/modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.hpp @@ -162,7 +162,7 @@ struct ProgramResourceUsage enum ResourceNameGenerationFlag { - RESOURCE_NAME_GENERATION_FLAG_DEFAULT = 0x0, + RESOURCE_NAME_GENERATION_FLAG_DEFAULT = 0x0, RESOURCE_NAME_GENERATION_FLAG_TOP_LEVEL_BUFFER_VARIABLE = 0x1, RESOURCE_NAME_GENERATION_FLAG_TRANSFORM_FEEDBACK_VARIABLE = 0x2, diff --git a/modules/glshared/glsAttributeLocationTests.hpp b/modules/glshared/glsAttributeLocationTests.hpp index e25b487..c3d2d59 100644 --- a/modules/glshared/glsAttributeLocationTests.hpp +++ b/modules/glshared/glsAttributeLocationTests.hpp @@ -48,7 +48,7 @@ public: AttribType (const std::string& name, deUint32 locationSize, deUint32 typeEnum); const std::string& getName (void) const { return m_name; } - deUint32 getLocationSize (void) const { return m_locationSize; } + deUint32 getLocationSize (void) const { return m_locationSize; } deUint32 getGLTypeEnum (void) const { return m_glTypeEnum; } private: @@ -95,7 +95,7 @@ public: Attribute (const AttribType& type, const std::string& name, - deInt32 layoutLocation = LOC_UNDEF, + deInt32 layoutLocation = LOC_UNDEF, const Cond& cond = Cond::COND_ALWAYS, int arraySize = NOT_ARRAY); diff --git a/modules/glshared/glsDrawTest.hpp b/modules/glshared/glsDrawTest.hpp index a373558..5347269 100644 --- a/modules/glshared/glsDrawTest.hpp +++ b/modules/glshared/glsDrawTest.hpp @@ -193,7 +193,7 @@ struct DrawTestSpec OutputType outputType; Storage storage; Usage usage; - int componentCount; + int componentCount; int offset; int stride; bool normalize; @@ -211,7 +211,7 @@ struct DrawTestSpec bool isBufferStrideAligned (void) const; }; - std::string getName (void) const; + std::string getName (void) const; std::string getDesc (void) const; std::string getMultilineDesc (void) const; diff --git a/modules/glshared/glsFboCompletenessTests.hpp b/modules/glshared/glsFboCompletenessTests.hpp index bc3cd3b..005162c 100644 --- a/modules/glshared/glsFboCompletenessTests.hpp +++ b/modules/glshared/glsFboCompletenessTests.hpp @@ -113,7 +113,7 @@ protected: }; // Utilities for building -Image* makeImage (GLenum bufType, ImageFormat format, +Image* makeImage (GLenum bufType, ImageFormat format, GLsizei width, GLsizei height, FboBuilder& builder); Attachment* makeAttachment (GLenum bufType, ImageFormat format, GLsizei width, GLsizei height, FboBuilder& builder); diff --git a/modules/glshared/glsLifetimeTests.hpp b/modules/glshared/glsLifetimeTests.hpp index 32a9734..f345bae 100644 --- a/modules/glshared/glsLifetimeTests.hpp +++ b/modules/glshared/glsLifetimeTests.hpp @@ -163,7 +163,7 @@ public: , m_binder (binder_) , m_genCreates (genCreates_) {} - GLuint gen (void); + GLuint gen (void); void release (GLuint name) { (this->*m_deleteFunc)(1, &name); } bool exists (GLuint name) { return (this->*m_existsFunc)(name) != GL_FALSE; } Binder* binder (void) const { return m_binder; } @@ -283,7 +283,7 @@ public: protected: FboAttacher (const Context& ctx, Type& elementType, Type& containerType) - : Attacher (ctx, elementType, containerType) {} + : Attacher (ctx, elementType, containerType) {} virtual void initStorage (void) = 0; }; @@ -291,7 +291,7 @@ class FboInputAttacher : public InputAttacher { public: FboInputAttacher (FboAttacher& attacher) - : InputAttacher (attacher) {} + : InputAttacher (attacher) {} void drawContainer (GLuint container, Surface& dst); }; @@ -299,7 +299,7 @@ class FboOutputAttacher : public OutputAttacher { public: FboOutputAttacher (FboAttacher& attacher) - : OutputAttacher (attacher) {} + : OutputAttacher (attacher) {} void setupContainer (GLuint seed, GLuint container); void drawAttachment (GLuint attachment, Surface& dst); }; diff --git a/modules/glshared/glsStateQueryUtil.hpp b/modules/glshared/glsStateQueryUtil.hpp index cd34dbc..3a985cc 100644 --- a/modules/glshared/glsStateQueryUtil.hpp +++ b/modules/glshared/glsStateQueryUtil.hpp @@ -431,7 +431,7 @@ void verifyStateAttributeInteger (tcu::ResultCollector& result, glu::CallLogW void verifyStateFramebufferInteger (tcu::ResultCollector& result, glu::CallLogWrapper& gl, glw::GLenum target, glw::GLenum pname, int expected, QueryType type); void verifyStateFramebufferIntegerMin (tcu::ResultCollector& result, glu::CallLogWrapper& gl, glw::GLenum target, glw::GLenum pname, int minValue, QueryType type); void verifyStateProgramInteger (tcu::ResultCollector& result, glu::CallLogWrapper& gl, glw::GLuint program, glw::GLenum pname, int expected, QueryType type); -void verifyStateProgramIntegerVec3 (tcu::ResultCollector& result, glu::CallLogWrapper& gl, glw::GLuint program, glw::GLenum pname, const tcu::IVec3& expected, QueryType type); +void verifyStateProgramIntegerVec3 (tcu::ResultCollector& result, glu::CallLogWrapper& gl, glw::GLuint program, glw::GLenum pname, const tcu::IVec3& expected, QueryType type); void verifyStatePipelineInteger (tcu::ResultCollector& result, glu::CallLogWrapper& gl, glw::GLuint pipeline, glw::GLenum pname, int expected, QueryType type); void verifyStateTextureParamInteger (tcu::ResultCollector& result, glu::CallLogWrapper& gl, glw::GLenum target, glw::GLenum pname, int expected, QueryType type); void verifyStateTextureParamFloat (tcu::ResultCollector& result, glu::CallLogWrapper& gl, glw::GLenum target, glw::GLenum pname, float expected, QueryType type); diff --git a/modules/glshared/glsVertexArrayTests.hpp b/modules/glshared/glsVertexArrayTests.hpp index b7539d4..3fd9fa9 100644 --- a/modules/glshared/glsVertexArrayTests.hpp +++ b/modules/glshared/glsVertexArrayTests.hpp @@ -221,11 +221,11 @@ public: virtual Array* getArray (int i); virtual int getArrayCount (void); virtual void newArray (Array::Storage storage); - virtual void render (Array::Primitive primitive, int firstVertex, int vertexCount, bool useVao, float coordScale, float colorScale); + virtual void render (Array::Primitive primitive, int firstVertex, int vertexCount, bool useVao, float coordScale, float colorScale); const tcu::Surface& getSurface (void) const { return m_screen; } private: - void updateProgram (void); + void updateProgram (void); glu::RenderContext& m_renderCtx; sglr::Context& m_ctx; @@ -263,7 +263,7 @@ public: inline bool operator<= (const WrappedType& other) const { return m_value <= other.m_value; } inline bool operator>= (const WrappedType& other) const { return m_value >= other.m_value; } - inline operator Type (void) const { return m_value; } + inline operator Type (void) const { return m_value; } template inline T to (void) const { return (T)m_value; } private: @@ -374,7 +374,7 @@ public: inline bool operator<= (const Fixed& other) const { return m_value <= other.m_value; } inline bool operator>= (const Fixed& other) const { return m_value >= other.m_value; } - inline operator deInt32 (void) const { return m_value; } + inline operator deInt32 (void) const { return m_value; } template inline T to (void) const { return (T)m_value; } private: @@ -460,7 +460,7 @@ public: Array::OutputType outputType; Array::Storage storage; Array::Usage usage; - int componentCount; + int componentCount; int offset; int stride; bool normalize; @@ -468,7 +468,7 @@ public: GLValue max; }; - std::string getName (void) const; + std::string getName (void) const; std::string getDesc (void) const; Array::Primitive primitive; -- 2.7.4