Remove spaces after control statements keywords Spaces are useful to separate independent constructs, but can cause confusion when added between dependent ones. For example "a*b [i]" is hard for humans to read correctly at a glance. "a*b[i]" is better, and "a * b[i]" is the easiest to understand immediately. Control statements are no different. "if (a)if (b)x;" is hard to parse. "if (a) if (b) x;" is better, but "if(a) if(b) x;" leaves no confusion of what belongs where. This recommendation also follows the 'zero one infinity' rule of thumb: https://en.wikipedia.org/wiki/Zero_one_infinity_rule Whether we write "a + b" or "a + b", they are equally readable, and the additional spaces may help with alignment of surrounding expressions. "for (int i : c)" on the other hand makes the keyword unintentionally even more dissociated from its header than "for (int i : c)" already does. The argument that the space helps set it apart from function calls seems moot when practically every editor supports keyword highlighting, function names are typically longer than 2-3 characters, and function calls are not followed by curly brackets (which while optional for singular statements, are still recommended for reasons other than this one). Bug: b/144825072 Change-Id: I3432fadae8e5604123f5c537097323504fecbc8c Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39588 Tested-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/src/Vulkan/Debug/Context.cpp b/src/Vulkan/Debug/Context.cpp index ce844eb..aa62304 100644 --- a/src/Vulkan/Debug/Context.cpp +++ b/src/Vulkan/Debug/Context.cpp
@@ -100,7 +100,7 @@ void Broadcaster::modify(F&& f) { std::unique_lock<std::recursive_mutex> lock(mutex); - if (listenersInUse > 0) + if(listenersInUse > 0) { // The listeners map is current being iterated over. // Make a copy before making the edit.
diff --git a/src/Vulkan/VkBuffer.cpp b/src/Vulkan/VkBuffer.cpp index ce14bf3..ad24a83 100644 --- a/src/Vulkan/VkBuffer.cpp +++ b/src/Vulkan/VkBuffer.cpp
@@ -32,9 +32,9 @@ } const auto* nextInfo = reinterpret_cast<const VkBaseInStructure*>(pCreateInfo->pNext); - for (; nextInfo != nullptr; nextInfo = nextInfo->pNext) + for(; nextInfo != nullptr; nextInfo = nextInfo->pNext) { - if (nextInfo->sType == VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO) + if(nextInfo->sType == VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO) { const auto* externalInfo = reinterpret_cast<const VkExternalMemoryBufferCreateInfo*>(nextInfo); supportedExternalMemoryHandleTypes = externalInfo->handleTypes;
diff --git a/src/Vulkan/VkBufferView.cpp b/src/Vulkan/VkBufferView.cpp index 085acfe..7b007e2 100644 --- a/src/Vulkan/VkBufferView.cpp +++ b/src/Vulkan/VkBufferView.cpp
@@ -21,7 +21,7 @@ BufferView::BufferView(const VkBufferViewCreateInfo* pCreateInfo, void* mem) : buffer(vk::Cast(pCreateInfo->buffer)), format(pCreateInfo->format), offset(pCreateInfo->offset) { - if (pCreateInfo->range == VK_WHOLE_SIZE) + if(pCreateInfo->range == VK_WHOLE_SIZE) { range = buffer->getSize() - offset; }
diff --git a/src/Vulkan/VkCommandBuffer.cpp b/src/Vulkan/VkCommandBuffer.cpp index e025b4b..08178cd 100644 --- a/src/Vulkan/VkCommandBuffer.cpp +++ b/src/Vulkan/VkCommandBuffer.cpp
@@ -515,7 +515,7 @@ executionState.renderer->setBlendConstant(pipeline->hasDynamicState(VK_DYNAMIC_STATE_BLEND_CONSTANTS) ? executionState.dynamicState.blendConstants : pipeline->getBlendConstants()); - if (pipeline->hasDynamicState(VK_DYNAMIC_STATE_DEPTH_BIAS)) + if(pipeline->hasDynamicState(VK_DYNAMIC_STATE_DEPTH_BIAS)) { // If the depth bias clamping feature is not enabled, depthBiasClamp must be 0.0 ASSERT(executionState.dynamicState.depthBiasClamp == 0.0f); @@ -523,7 +523,7 @@ context.depthBias = executionState.dynamicState.depthBiasConstantFactor; context.slopeDepthBias = executionState.dynamicState.depthBiasSlopeFactor; } - if (pipeline->hasDynamicState(VK_DYNAMIC_STATE_DEPTH_BOUNDS) && context.depthBoundsTestEnable) + if(pipeline->hasDynamicState(VK_DYNAMIC_STATE_DEPTH_BOUNDS) && context.depthBoundsTestEnable) { // Unless the VK_EXT_depth_range_unrestricted extension is enabled minDepthBounds and maxDepthBounds must be between 0.0 and 1.0, inclusive ASSERT(executionState.dynamicState.minDepthBounds >= 0.0f && @@ -533,17 +533,17 @@ UNIMPLEMENTED("depthBoundsTestEnable"); } - if (pipeline->hasDynamicState(VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK) && context.stencilEnable) + if(pipeline->hasDynamicState(VK_DYNAMIC_STATE_STENCIL_COMPARE_MASK) && context.stencilEnable) { context.frontStencil.compareMask = executionState.dynamicState.compareMask[0]; context.backStencil.compareMask = executionState.dynamicState.compareMask[1]; } - if (pipeline->hasDynamicState(VK_DYNAMIC_STATE_STENCIL_WRITE_MASK) && context.stencilEnable) + if(pipeline->hasDynamicState(VK_DYNAMIC_STATE_STENCIL_WRITE_MASK) && context.stencilEnable) { context.frontStencil.writeMask = executionState.dynamicState.writeMask[0]; context.backStencil.writeMask = executionState.dynamicState.writeMask[1]; } - if (pipeline->hasDynamicState(VK_DYNAMIC_STATE_STENCIL_REFERENCE) && context.stencilEnable) + if(pipeline->hasDynamicState(VK_DYNAMIC_STATE_STENCIL_REFERENCE) && context.stencilEnable) { context.frontStencil.reference = executionState.dynamicState.reference[0]; context.backStencil.reference = executionState.dynamicState.reference[1]; @@ -554,13 +554,13 @@ context.occlusionEnabled = executionState.renderer->hasOcclusionQuery(); std::vector<std::pair<uint32_t, void *>> indexBuffers; - if (indexed) + if(indexed) { void *indexBuffer = executionState.indexBufferBinding.buffer->getOffsetPointer( executionState.indexBufferBinding.offset + first * bytesPerIndex(executionState)); - if (pipeline->hasPrimitiveRestartEnable()) + if(pipeline->hasPrimitiveRestartEnable()) { - switch (executionState.indexType) + switch(executionState.indexType) { case VK_INDEX_TYPE_UINT16: processPrimitiveRestart(static_cast<uint16_t *>(indexBuffer), count, pipeline, indexBuffers); @@ -582,16 +582,16 @@ indexBuffers.push_back({pipeline->computePrimitiveCount(count), nullptr}); } - for (uint32_t instance = firstInstance; instance != firstInstance + instanceCount; instance++) + for(uint32_t instance = firstInstance; instance != firstInstance + instanceCount; instance++) { // FIXME: reconsider instances/views nesting. auto viewMask = executionState.renderPass->getViewMask(executionState.subpassIndex); - while (viewMask) + while(viewMask) { int viewID = sw::log2i(viewMask); viewMask &= ~(1 << viewID); - for (auto indexBuffer : indexBuffers) + for(auto indexBuffer : indexBuffers) { executionState.renderer->draw(&context, executionState.indexType, indexBuffer.first, vertexOffset, executionState.events, instance, viewID, indexBuffer.second, @@ -660,7 +660,7 @@ void play(vk::CommandBuffer::ExecutionState& executionState) override { - for (auto drawId = 0u; drawId < drawCount; drawId++) + for(auto drawId = 0u; drawId < drawCount; drawId++) { auto cmd = reinterpret_cast<VkDrawIndirectCommand const *>(buffer->getOffsetPointer(offset + drawId * stride)); draw(executionState, false, cmd->vertexCount, cmd->instanceCount, 0, cmd->firstVertex, cmd->firstInstance); @@ -686,7 +686,7 @@ void play(vk::CommandBuffer::ExecutionState& executionState) override { - for (auto drawId = 0u; drawId < drawCount; drawId++) + for(auto drawId = 0u; drawId < drawCount; drawId++) { auto cmd = reinterpret_cast<VkDrawIndexedIndirectCommand const *>(buffer->getOffsetPointer(offset + drawId * stride)); draw(executionState, true, cmd->indexCount, cmd->instanceCount, cmd->firstIndex, cmd->vertexOffset, cmd->firstInstance); @@ -1022,7 +1022,7 @@ : pipelineBindPoint(pipelineBindPoint), pipelineLayout(pipelineLayout), set(set), descriptorSet(descriptorSet), dynamicOffsetCount(dynamicOffsetCount) { - for (uint32_t i = 0; i < dynamicOffsetCount; i++) + for(uint32_t i = 0; i < dynamicOffsetCount; i++) { this->dynamicOffsets[i] = dynamicOffsets[i]; } @@ -1036,7 +1036,7 @@ ASSERT_OR_RETURN(dynamicOffsetBase + dynamicOffsetCount <= vk::MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC); pipelineState.descriptorSets[set] = descriptorSet; - for (uint32_t i = 0; i < dynamicOffsetCount; i++) + for(uint32_t i = 0; i < dynamicOffsetCount; i++) { pipelineState.descriptorDynamicOffsets[dynamicOffsetBase + i] = dynamicOffsets[i]; } @@ -1152,7 +1152,7 @@ void play(vk::CommandBuffer::ExecutionState& executionState) override { - if (stage & ~(VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT)) + if(stage & ~(VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | VK_PIPELINE_STAGE_DRAW_INDIRECT_BIT)) { // The `top of pipe` and `draw indirect` stages are handled in command buffer processing so a timestamp write // done in those stages can just be done here without any additional synchronization. @@ -1691,7 +1691,7 @@ for(uint32_t i = 0; i < MAX_VERTEX_INPUT_BINDINGS; i++) { auto &attrib = context.input[i]; - if (attrib.count) + if(attrib.count) { const auto &vertexInput = vertexInputBindings[attrib.binding]; VkDeviceSize offset = attrib.offset + vertexInput.offset + @@ -1713,24 +1713,24 @@ auto const & subpass = renderPass->getSubpass(subpassIndex); - for (auto i = 0u; i < subpass.colorAttachmentCount; i++) + for(auto i = 0u; i < subpass.colorAttachmentCount; i++) { auto attachmentReference = subpass.pColorAttachments[i]; - if (attachmentReference.attachment != VK_ATTACHMENT_UNUSED) + if(attachmentReference.attachment != VK_ATTACHMENT_UNUSED) { context.renderTarget[i] = renderPassFramebuffer->getAttachment(attachmentReference.attachment); } } auto attachmentReference = subpass.pDepthStencilAttachment; - if (attachmentReference && attachmentReference->attachment != VK_ATTACHMENT_UNUSED) + if(attachmentReference && attachmentReference->attachment != VK_ATTACHMENT_UNUSED) { auto attachment = renderPassFramebuffer->getAttachment(attachmentReference->attachment); - if (attachment->hasDepthAspect()) + if(attachment->hasDepthAspect()) { context.depthBuffer = attachment; } - if (attachment->hasStencilAspect()) + if(attachment->hasStencilAspect()) { context.stencilBuffer = attachment; }
diff --git a/src/Vulkan/VkDebug.cpp b/src/Vulkan/VkDebug.cpp index 7b7cf85..02213da 100644 --- a/src/Vulkan/VkDebug.cpp +++ b/src/Vulkan/VkDebug.cpp
@@ -37,12 +37,12 @@ static bool checked = false; static bool res = false; - if (!checked) + if(!checked) { // If a debugger is attached then we're already being ptraced and ptrace // will return a non-zero value. checked = true; - if (ptrace(PTRACE_TRACEME, 0, 1, 0) != 0) + if(ptrace(PTRACE_TRACEME, 0, 1, 0) != 0) { res = true; } @@ -144,7 +144,7 @@ va_list vararg; va_start(vararg, format); - if (IsUnderDebugger() && !asserted.exchange(true)) + if(IsUnderDebugger() && !asserted.exchange(true)) { // Abort after tracing and printing to stderr tracev(format, vararg); @@ -156,7 +156,7 @@ ::abort(); } - else if (!asserted) + else if(!asserted) { tracev(format, vararg); va_end(vararg);
diff --git a/src/Vulkan/VkDescriptorSetLayout.cpp b/src/Vulkan/VkDescriptorSetLayout.cpp index 73e4d58..8342b44 100644 --- a/src/Vulkan/VkDescriptorSetLayout.cpp +++ b/src/Vulkan/VkDescriptorSetLayout.cpp
@@ -212,9 +212,9 @@ uint32_t DescriptorSetLayout::getDynamicDescriptorCount() const { uint32_t count = 0; - for (size_t i = 0; i < bindingCount; i++) + for(size_t i = 0; i < bindingCount; i++) { - if (isDynamic(bindings[i].descriptorType)) + if(isDynamic(bindings[i].descriptorType)) { count += bindings[i].descriptorCount; } @@ -228,9 +228,9 @@ ASSERT(isDynamic(bindings[n].descriptorType)); uint32_t index = 0; - for (uint32_t i = 0; i < n; i++) + for(uint32_t i = 0; i < n; i++) { - if (isDynamic(bindings[i].descriptorType)) + if(isDynamic(bindings[i].descriptorType)) { index += bindings[i].descriptorCount; } @@ -270,7 +270,7 @@ ASSERT(reinterpret_cast<intptr_t>(memToWrite) % 16 == 0); // Each descriptor must be 16-byte aligned. - if (entry.descriptorType == VK_DESCRIPTOR_TYPE_SAMPLER) + if(entry.descriptorType == VK_DESCRIPTOR_TYPE_SAMPLER) { SampledImageDescriptor *imageSampler = reinterpret_cast<SampledImageDescriptor*>(memToWrite); @@ -279,18 +279,18 @@ auto update = reinterpret_cast<VkDescriptorImageInfo const *>(src + entry.offset + entry.stride * i); // "All consecutive bindings updated via a single VkWriteDescriptorSet structure, except those with a // descriptorCount of zero, must all either use immutable samplers or must all not use immutable samplers." - if (!binding.pImmutableSamplers) + if(!binding.pImmutableSamplers) { imageSampler[i].updateSampler(update->sampler); } imageSampler[i].device = device; } } - else if (entry.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER) + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER) { SampledImageDescriptor *imageSampler = reinterpret_cast<SampledImageDescriptor*>(memToWrite); - for (uint32_t i = 0; i < entry.descriptorCount; i++) + for(uint32_t i = 0; i < entry.descriptorCount; i++) { auto update = reinterpret_cast<VkBufferView const *>(src + entry.offset + entry.stride * i); auto bufferView = vk::Cast(*update); @@ -322,7 +322,7 @@ mipmap.onePitchP[1] = mipmap.onePitchP[3] = static_cast<short>(numElements); } } - else if (entry.descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER || + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER || entry.descriptorType == VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE) { SampledImageDescriptor *imageSampler = reinterpret_cast<SampledImageDescriptor*>(memToWrite); @@ -430,7 +430,7 @@ } } } - else if (entry.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE || + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE || entry.descriptorType == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT) { auto descriptor = reinterpret_cast<StorageImageDescriptor *>(memToWrite); @@ -449,7 +449,7 @@ descriptor[i].sampleCount = imageView->getSampleCount(); descriptor[i].sizeInBytes = static_cast<int>(imageView->getImageSizeInBytes()); - if (imageView->getFormat().isStencil()) + if(imageView->getFormat().isStencil()) { descriptor[i].stencilPtr = imageView->getOffsetPointer({0, 0, 0}, VK_IMAGE_ASPECT_STENCIL_BIT, 0, 0); descriptor[i].stencilRowPitchBytes = imageView->rowPitchBytes(VK_IMAGE_ASPECT_STENCIL_BIT, 0); @@ -460,10 +460,10 @@ } } } - else if (entry.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) { auto descriptor = reinterpret_cast<StorageImageDescriptor *>(memToWrite); - for (uint32_t i = 0; i < entry.descriptorCount; i++) + for(uint32_t i = 0; i < entry.descriptorCount; i++) { auto update = reinterpret_cast<VkBufferView const *>(src + entry.offset + entry.stride * i); auto bufferView = vk::Cast(*update); @@ -477,13 +477,13 @@ descriptor[i].sizeInBytes = bufferView->getRangeInBytes(); } } - else if (entry.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER || + else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER || entry.descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC || entry.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER || entry.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC) { auto descriptor = reinterpret_cast<BufferDescriptor *>(memToWrite); - for (uint32_t i = 0; i < entry.descriptorCount; i++) + for(uint32_t i = 0; i < entry.descriptorCount; i++) { auto update = reinterpret_cast<VkDescriptorBufferInfo const *>(src + entry.offset + entry.stride * i); auto buffer = vk::Cast(update->buffer); @@ -591,7 +591,7 @@ e.descriptorCount = writeDescriptorSet.descriptorCount; e.offset = 0; void const *ptr = nullptr; - switch (writeDescriptorSet.descriptorType) + switch(writeDescriptorSet.descriptorType) { case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
diff --git a/src/Vulkan/VkDevice.cpp b/src/Vulkan/VkDevice.cpp index a8fcd9c..55add6e 100644 --- a/src/Vulkan/VkDevice.cpp +++ b/src/Vulkan/VkDevice.cpp
@@ -189,7 +189,7 @@ { return any.isSignalled() ? VK_SUCCESS : VK_TIMEOUT; } - else if (infiniteTimeout) + else if(infiniteTimeout) { any.wait(); return VK_SUCCESS;
diff --git a/src/Vulkan/VkDeviceMemory.cpp b/src/Vulkan/VkDeviceMemory.cpp index faaa4b5..2c1991a 100644 --- a/src/Vulkan/VkDeviceMemory.cpp +++ b/src/Vulkan/VkDeviceMemory.cpp
@@ -67,7 +67,7 @@ static bool parseCreateInfo(const VkMemoryAllocateInfo* pAllocateInfo, ExternalMemoryTraits* pTraits) { - if (T::supportsAllocateInfo(pAllocateInfo)) + if(T::supportsAllocateInfo(pAllocateInfo)) { pTraits->typeFlagBit = T::typeFlagBit; pTraits->instanceSize = sizeof(T); @@ -99,7 +99,7 @@ VkResult allocate(size_t size, void** pBuffer) override { void* buffer = vk::allocate(size, REQUIRED_MEMORY_ALIGNMENT, DEVICE_MEMORY); - if (!buffer) + if(!buffer) return VK_ERROR_OUT_OF_DEVICE_MEMORY; *pBuffer = buffer; @@ -133,7 +133,7 @@ ExternalMemoryTraits* pTraits) { #if SWIFTSHADER_EXTERNAL_MEMORY_OPAQUE_FD - if (parseCreateInfo<OpaqueFdExternalMemory>(pAllocateInfo, pTraits)) + if(parseCreateInfo<OpaqueFdExternalMemory>(pAllocateInfo, pTraits)) { return; } @@ -154,7 +154,7 @@ void DeviceMemory::destroy(const VkAllocationCallbacks* pAllocator) { - if (buffer) + if(buffer) { external->deallocate(buffer, size); buffer = nullptr; @@ -173,7 +173,7 @@ VkResult DeviceMemory::allocate() { VkResult result = VK_SUCCESS; - if (!buffer) + if(!buffer) { result = external->allocate(size, &buffer); } @@ -202,14 +202,14 @@ bool DeviceMemory::checkExternalMemoryHandleType( VkExternalMemoryHandleTypeFlags supportedHandleTypes) const { - if (!supportedHandleTypes) + if(!supportedHandleTypes) { // This image or buffer does not need to be stored on external // memory, so this check should always pass. return true; } VkExternalMemoryHandleTypeFlagBits handle_type_bit = external->getFlagBit(); - if (!handle_type_bit) + if(!handle_type_bit) { // This device memory is not external and can accomodate // any image or buffer as well.
diff --git a/src/Vulkan/VkDeviceMemoryExternalLinux.hpp b/src/Vulkan/VkDeviceMemoryExternalLinux.hpp index 620037d..a9f0d0d 100644 --- a/src/Vulkan/VkDeviceMemoryExternalLinux.hpp +++ b/src/Vulkan/VkDeviceMemoryExternalLinux.hpp
@@ -37,15 +37,15 @@ AllocateInfo(const VkMemoryAllocateInfo* pAllocateInfo) { const auto* createInfo = reinterpret_cast<const VkBaseInStructure*>(pAllocateInfo->pNext); - while (createInfo) + while(createInfo) { - switch (createInfo->sType) + switch(createInfo->sType) { case VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR: { const auto* importInfo = reinterpret_cast<const VkImportMemoryFdInfoKHR*>(createInfo); - if (importInfo->handleType != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) + if(importInfo->handleType != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) { UNIMPLEMENTED("importInfo->handleType"); } @@ -57,7 +57,7 @@ { const auto* exportInfo = reinterpret_cast<const VkExportMemoryAllocateInfo*>(createInfo); - if (exportInfo->handleTypes != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) + if(exportInfo->handleTypes != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) { UNIMPLEMENTED("exportInfo->handleTypes"); } @@ -93,10 +93,10 @@ VkResult allocate(size_t size, void** pBuffer) override { - if (allocateInfo.importFd) + if(allocateInfo.importFd) { memfd.importFd(allocateInfo.fd); - if (!memfd.isValid()) + if(!memfd.isValid()) { return VK_ERROR_INVALID_EXTERNAL_HANDLE; } @@ -107,14 +107,14 @@ static int counter = 0; char name[40]; snprintf(name, sizeof(name), "SwiftShader.Memory.%d", ++counter); - if (!memfd.allocate(name, size)) + if(!memfd.allocate(name, size)) { TRACE("memfd.allocate() returned %s", strerror(errno)); return VK_ERROR_OUT_OF_DEVICE_MEMORY; } } void* addr = memfd.mapReadWrite(0, size); - if (!addr) + if(!addr) { return VK_ERROR_MEMORY_MAP_FAILED; } @@ -135,7 +135,7 @@ VkResult exportFd(int* pFd) const override { int fd = memfd.exportFd(); - if (fd < 0) + if(fd < 0) { return VK_ERROR_INVALID_EXTERNAL_HANDLE; }
diff --git a/src/Vulkan/VkFence.hpp b/src/Vulkan/VkFence.hpp index af8becd..170798b 100644 --- a/src/Vulkan/VkFence.hpp +++ b/src/Vulkan/VkFence.hpp
@@ -69,7 +69,7 @@ void finish() override { ASSERT(!event.isSignalled()); - if (wg.done()) + if(wg.done()) { event.signal(); }
diff --git a/src/Vulkan/VkFormat.cpp b/src/Vulkan/VkFormat.cpp index dc7a71e..efb3929 100644 --- a/src/Vulkan/VkFormat.cpp +++ b/src/Vulkan/VkFormat.cpp
@@ -144,8 +144,8 @@ // isDepth / isStencil etc to check for their aspect VkImageAspectFlags aspects = 0; - if (isDepth()) aspects |= VK_IMAGE_ASPECT_DEPTH_BIT; - if (isStencil()) aspects |= VK_IMAGE_ASPECT_STENCIL_BIT; + if(isDepth()) aspects |= VK_IMAGE_ASPECT_DEPTH_BIT; + if(isStencil()) aspects |= VK_IMAGE_ASPECT_STENCIL_BIT; // YCbCr formats switch(format) @@ -162,7 +162,7 @@ } // Anything else is "color". - if (!aspects) aspects |= VK_IMAGE_ASPECT_COLOR_BIT; + if(!aspects) aspects |= VK_IMAGE_ASPECT_COLOR_BIT; return aspects; }
diff --git a/src/Vulkan/VkFramebuffer.cpp b/src/Vulkan/VkFramebuffer.cpp index 33be291..96804c1 100644 --- a/src/Vulkan/VkFramebuffer.cpp +++ b/src/Vulkan/VkFramebuffer.cpp
@@ -41,22 +41,22 @@ ASSERT(attachmentCount == renderPass->getAttachmentCount()); const uint32_t count = std::min(clearValueCount, attachmentCount); - for (uint32_t i = 0; i < count; i++) + for(uint32_t i = 0; i < count; i++) { const VkAttachmentDescription attachment = renderPass->getAttachment(i); VkImageAspectFlags aspectMask = Format(attachment.format).getAspects(); - if (attachment.loadOp != VK_ATTACHMENT_LOAD_OP_CLEAR) + if(attachment.loadOp != VK_ATTACHMENT_LOAD_OP_CLEAR) aspectMask &= VK_IMAGE_ASPECT_STENCIL_BIT; - if (attachment.stencilLoadOp != VK_ATTACHMENT_LOAD_OP_CLEAR) + if(attachment.stencilLoadOp != VK_ATTACHMENT_LOAD_OP_CLEAR) aspectMask &= ~VK_IMAGE_ASPECT_STENCIL_BIT; - if (!aspectMask || !renderPass->isAttachmentUsed(i)) + if(!aspectMask || !renderPass->isAttachmentUsed(i)) { continue; } - if (renderPass->isMultiView()) + if(renderPass->isMultiView()) { attachments[i]->clearWithLayerMask(pClearValues[i], aspectMask, renderArea, renderPass->getAttachmentViewMask(i)); @@ -72,17 +72,17 @@ { VkSubpassDescription subpass = renderPass->getSubpass(subpassIndex); - if (attachment.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) + if(attachment.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) { ASSERT(attachment.colorAttachment < subpass.colorAttachmentCount); uint32_t attachmentIndex = subpass.pColorAttachments[attachment.colorAttachment].attachment; - if (attachmentIndex != VK_ATTACHMENT_UNUSED) + if(attachmentIndex != VK_ATTACHMENT_UNUSED) { ASSERT(attachmentIndex < attachmentCount); ImageView *imageView = attachments[attachmentIndex]; - if (renderPass->isMultiView()) + if(renderPass->isMultiView()) { imageView->clearWithLayerMask(attachment.clearValue, attachment.aspectMask, rect.rect, renderPass->getViewMask(subpassIndex)); @@ -93,16 +93,16 @@ } } } - else if (attachment.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) + else if(attachment.aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { uint32_t attachmentIndex = subpass.pDepthStencilAttachment->attachment; - if (attachmentIndex != VK_ATTACHMENT_UNUSED) + if(attachmentIndex != VK_ATTACHMENT_UNUSED) { ASSERT(attachmentIndex < attachmentCount); ImageView *imageView = attachments[attachmentIndex]; - if (renderPass->isMultiView()) + if(renderPass->isMultiView()) { imageView->clearWithLayerMask(attachment.clearValue, attachment.aspectMask, rect.rect, renderPass->getViewMask(subpassIndex)); @@ -131,7 +131,7 @@ if(resolveAttachment != VK_ATTACHMENT_UNUSED) { ImageView *imageView = attachments[subpass.pColorAttachments[i].attachment]; - if (renderPass->isMultiView()) + if(renderPass->isMultiView()) { imageView->resolveWithLayerMask(attachments[resolveAttachment], renderPass->getViewMask(subpassIndex));
diff --git a/src/Vulkan/VkGetProcAddress.cpp b/src/Vulkan/VkGetProcAddress.cpp index 46d19cd..fd870c7 100644 --- a/src/Vulkan/VkGetProcAddress.cpp +++ b/src/Vulkan/VkGetProcAddress.cpp
@@ -464,7 +464,7 @@ int OpenDevice(const hw_module_t *module, const char *id, hw_device_t **device) { - if (strcmp(id, HWVULKAN_DEVICE_0) != 0) return -ENOENT; + if(strcmp(id, HWVULKAN_DEVICE_0) != 0) return -ENOENT; *device = &hal_device.common; return 0; }
diff --git a/src/Vulkan/VkImage.cpp b/src/Vulkan/VkImage.cpp index 3e78447..9cde705 100644 --- a/src/Vulkan/VkImage.cpp +++ b/src/Vulkan/VkImage.cpp
@@ -132,9 +132,9 @@ } const auto* nextInfo = reinterpret_cast<const VkBaseInStructure*>(pCreateInfo->pNext); - for (; nextInfo != nullptr; nextInfo = nextInfo->pNext) + for(; nextInfo != nullptr; nextInfo = nextInfo->pNext) { - if (nextInfo->sType == VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO) + if(nextInfo->sType == VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO) { const auto* externalInfo = reinterpret_cast<const VkExternalMemoryImageCreateInfo*>(nextInfo); supportedExternalMemoryHandleTypes = externalInfo->handleTypes; @@ -225,7 +225,7 @@ void Image::getSubresourceLayout(const VkImageSubresource* pSubresource, VkSubresourceLayout* pLayout) const { // By spec, aspectMask has a single bit set. - if (!((pSubresource->aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) || + if(!((pSubresource->aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) || (pSubresource->aspectMask == VK_IMAGE_ASPECT_DEPTH_BIT) || (pSubresource->aspectMask == VK_IMAGE_ASPECT_STENCIL_BIT) || (pSubresource->aspectMask == VK_IMAGE_ASPECT_PLANE_0_BIT) || @@ -248,7 +248,7 @@ // Image copy does not perform any conversion, it simply copies memory from // an image to another image that has the same number of bytes per pixel. - if (!((region.srcSubresource.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) || + if(!((region.srcSubresource.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) || (region.srcSubresource.aspectMask == VK_IMAGE_ASPECT_DEPTH_BIT) || (region.srcSubresource.aspectMask == VK_IMAGE_ASPECT_STENCIL_BIT) || (region.srcSubresource.aspectMask == VK_IMAGE_ASPECT_PLANE_0_BIT) || @@ -258,7 +258,7 @@ UNSUPPORTED("srcSubresource.aspectMask %X", region.srcSubresource.aspectMask); } - if (!((region.dstSubresource.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) || + if(!((region.dstSubresource.aspectMask == VK_IMAGE_ASPECT_COLOR_BIT) || (region.dstSubresource.aspectMask == VK_IMAGE_ASPECT_DEPTH_BIT) || (region.dstSubresource.aspectMask == VK_IMAGE_ASPECT_STENCIL_BIT) || (region.dstSubresource.aspectMask == VK_IMAGE_ASPECT_PLANE_0_BIT) ||
diff --git a/src/Vulkan/VkImageView.cpp b/src/Vulkan/VkImageView.cpp index 27c2f38..905e4a0 100644 --- a/src/Vulkan/VkImageView.cpp +++ b/src/Vulkan/VkImageView.cpp
@@ -157,7 +157,7 @@ void ImageView::clearWithLayerMask(const VkClearValue &clearValue, VkImageAspectFlags aspectMask, const VkRect2D &renderArea, uint32_t layerMask) { - while (layerMask) + while(layerMask) { uint32_t layer = sw::log2i(layerMask); layerMask &= ~(1 << layer); @@ -229,7 +229,7 @@ void ImageView::resolveWithLayerMask(ImageView *resolveAttachment, uint32_t layerMask) { - while (layerMask) + while(layerMask) { int layer = sw::log2i(layerMask); layerMask &= ~(1 << layer);
diff --git a/src/Vulkan/VkImageView.hpp b/src/Vulkan/VkImageView.hpp index 86adedd..a922946 100644 --- a/src/Vulkan/VkImageView.hpp +++ b/src/Vulkan/VkImageView.hpp
@@ -57,7 +57,7 @@ int getSampleCount() const { - switch (image->getSampleCountFlagBits()) + switch(image->getSampleCountFlagBits()) { case VK_SAMPLE_COUNT_1_BIT: return 1; case VK_SAMPLE_COUNT_4_BIT: return 4;
diff --git a/src/Vulkan/VkInstance.cpp b/src/Vulkan/VkInstance.cpp index 70dee28..235a3eb 100644 --- a/src/Vulkan/VkInstance.cpp +++ b/src/Vulkan/VkInstance.cpp
@@ -29,13 +29,13 @@ VkResult Instance::getPhysicalDevices(uint32_t *pPhysicalDeviceCount, VkPhysicalDevice* pPhysicalDevices) const { - if (!pPhysicalDevices) + if(!pPhysicalDevices) { *pPhysicalDeviceCount = 1; return VK_SUCCESS; } - if (*pPhysicalDeviceCount < 1) + if(*pPhysicalDeviceCount < 1) { return VK_INCOMPLETE; } @@ -49,13 +49,13 @@ VkResult Instance::getPhysicalDeviceGroups(uint32_t *pPhysicalDeviceGroupCount, VkPhysicalDeviceGroupProperties* pPhysicalDeviceGroupProperties) const { - if (!pPhysicalDeviceGroupProperties) + if(!pPhysicalDeviceGroupProperties) { *pPhysicalDeviceGroupCount = 1; return VK_SUCCESS; } - if (*pPhysicalDeviceGroupCount < 1) + if(*pPhysicalDeviceGroupCount < 1) { return VK_INCOMPLETE; }
diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp index 0d1fd76..e30b6ac 100644 --- a/src/Vulkan/VkPhysicalDevice.cpp +++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -25,7 +25,7 @@ static void setExternalMemoryProperties(VkExternalMemoryHandleTypeFlagBits handleType, VkExternalMemoryProperties* properties) { #if SWIFTSHADER_EXTERNAL_MEMORY_OPAQUE_FD - if (handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) + if(handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) { properties->compatibleHandleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; properties->exportFromImportedHandleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; @@ -385,7 +385,7 @@ void PhysicalDevice::getProperties(const VkPhysicalDeviceExternalSemaphoreInfo* pExternalSemaphoreInfo, VkExternalSemaphoreProperties* pExternalSemaphoreProperties) const { #if SWIFTSHADER_EXTERNAL_SEMAPHORE_OPAQUE_FD - if (pExternalSemaphoreInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) + if(pExternalSemaphoreInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { pExternalSemaphoreProperties->compatibleHandleTypes = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; pExternalSemaphoreProperties->exportFromImportedHandleTypes = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; @@ -394,7 +394,7 @@ } #endif #if VK_USE_PLATFORM_FUCHSIA - if (pExternalSemaphoreInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA) + if(pExternalSemaphoreInfo->handleType == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA) { pExternalSemaphoreProperties->compatibleHandleTypes = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA; pExternalSemaphoreProperties->exportFromImportedHandleTypes = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA; @@ -785,7 +785,7 @@ VkFormatProperties props; getFormatProperties(format, &props); auto features = tiling == VK_IMAGE_TILING_LINEAR ? props.linearTilingFeatures : props.optimalTilingFeatures; - if (features & (VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)) + if(features & (VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)) { // Only renderable formats make sense for multisample pImageFormatProperties->sampleCounts = getSampleCounts();
diff --git a/src/Vulkan/VkPipeline.cpp b/src/Vulkan/VkPipeline.cpp index f72d229..f35b203 100644 --- a/src/Vulkan/VkPipeline.cpp +++ b/src/Vulkan/VkPipeline.cpp
@@ -165,7 +165,7 @@ spvtools::Optimizer opt{SPV_ENV_VULKAN_1_1}; opt.SetMessageConsumer([](spv_message_level_t level, const char*, const spv_position_t& p, const char* m) { - switch (level) + switch(level) { case SPV_MSG_FATAL: vk::warn("SPIR-V FATAL: %d:%d %s\n", int(p.line), int(p.column), m); case SPV_MSG_INTERNAL_ERROR: vk::warn("SPIR-V INTERNAL_ERROR: %d:%d %s\n", int(p.line), int(p.column), m); @@ -178,10 +178,10 @@ }); // If the pipeline uses specialization, apply the specializations before freezing - if (specializationInfo) + if(specializationInfo) { std::unordered_map<uint32_t, std::vector<uint32_t>> specializations; - for (auto i = 0u; i < specializationInfo->mapEntryCount; ++i) + for(auto i = 0u; i < specializationInfo->mapEntryCount; ++i) { auto const &e = specializationInfo->pMapEntries[i]; auto value_ptr = @@ -198,7 +198,7 @@ std::vector<uint32_t> optimized; opt.Run(code.data(), code.size(), &optimized); - if (false) { + if(false) { spvtools::SpirvTools core(SPV_ENV_VULKAN_1_1); std::string preOpt; core.Disassemble(code, &preOpt, SPV_BINARY_TO_TEXT_OPTION_NONE); @@ -395,7 +395,7 @@ const VkPipelineMultisampleStateCreateInfo* multisampleState = pCreateInfo->pMultisampleState; if(multisampleState) { - switch (multisampleState->rasterizationSamples) + switch(multisampleState->rasterizationSamples) { case VK_SAMPLE_COUNT_1_BIT: context.sampleCount = 1; @@ -407,7 +407,7 @@ UNIMPLEMENTED("Unsupported sample count"); } - if (multisampleState->pSampleMask) + if(multisampleState->pSampleMask) { context.sampleMask = multisampleState->pSampleMask[0]; } @@ -465,7 +465,7 @@ blendConstants.a = colorBlendState->blendConstants[3]; } - for (auto i = 0u; i < colorBlendState->attachmentCount; i++) + for(auto i = 0u; i < colorBlendState->attachmentCount; i++) { const VkPipelineColorBlendAttachmentState& attachment = colorBlendState->pAttachments[i]; context.colorWriteMask[i] = attachment.colorWriteMask; @@ -528,9 +528,9 @@ void GraphicsPipeline::compileShaders(const VkAllocationCallbacks* pAllocator, const VkGraphicsPipelineCreateInfo* pCreateInfo, PipelineCache* pPipelineCache) { - for (auto pStage = pCreateInfo->pStages; pStage != pCreateInfo->pStages + pCreateInfo->stageCount; pStage++) + for(auto pStage = pCreateInfo->pStages; pStage != pCreateInfo->pStages + pCreateInfo->stageCount; pStage++) { - if (pStage->flags != 0) + if(pStage->flags != 0) { UNIMPLEMENTED("pStage->flags"); }
diff --git a/src/Vulkan/VkPipelineLayout.cpp b/src/Vulkan/VkPipelineLayout.cpp index 6d42c34..4394c7e 100644 --- a/src/Vulkan/VkPipelineLayout.cpp +++ b/src/Vulkan/VkPipelineLayout.cpp
@@ -37,7 +37,7 @@ dynamicOffsetBases = reinterpret_cast<uint32_t*>(hostMem); uint32_t dynamicOffsetBase = 0; - for (uint32_t i = 0; i < setLayoutCount; i++) + for(uint32_t i = 0; i < setLayoutCount; i++) { uint32_t dynamicDescriptorCount = setLayouts[i]->getDynamicDescriptorCount(); ASSERT_OR_RETURN((dynamicOffsetBase + dynamicDescriptorCount) <= MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC);
diff --git a/src/Vulkan/VkQueryPool.cpp b/src/Vulkan/VkQueryPool.cpp index 6c4f975..f31aa8b 100644 --- a/src/Vulkan/VkQueryPool.cpp +++ b/src/Vulkan/VkQueryPool.cpp
@@ -46,7 +46,7 @@ void Query::finish() { - if (wg.done()) + if(wg.done()) { auto prevState = state.exchange(FINISHED); ASSERT(prevState == ACTIVE);
diff --git a/src/Vulkan/VkQueue.cpp b/src/Vulkan/VkQueue.cpp index 4c5f798..36fb0a8 100644 --- a/src/Vulkan/VkQueue.cpp +++ b/src/Vulkan/VkQueue.cpp
@@ -115,7 +115,7 @@ void Queue::submitQueue(const Task& task) { - if (renderer == nullptr) + if(renderer == nullptr) { renderer.reset(new sw::Renderer(device)); } @@ -144,7 +144,7 @@ } } - if (task.pSubmits) + if(task.pSubmits) { toDelete.put(task.pSubmits); } @@ -202,10 +202,10 @@ void Queue::garbageCollect() { - while (true) + while(true) { auto v = toDelete.tryTake(); - if (!v.second) { break; } + if(!v.second) { break; } vk::deallocate(v.first, DEVICE_MEMORY); } } @@ -226,11 +226,11 @@ for(uint32_t i = 0; i < presentInfo->swapchainCount; i++) { VkResult res = vk::Cast(presentInfo->pSwapchains[i])->present(presentInfo->pImageIndices[i]); - if (presentInfo->pResults != nullptr) + if(presentInfo->pResults != nullptr) { presentInfo->pResults[i] = res; } - if (res != VK_SUCCESS) + if(res != VK_SUCCESS) result = res; }
diff --git a/src/Vulkan/VkRenderPass.cpp b/src/Vulkan/VkRenderPass.cpp index 27de7a6..3fc4d90 100644 --- a/src/Vulkan/VkRenderPass.cpp +++ b/src/Vulkan/VkRenderPass.cpp
@@ -48,7 +48,7 @@ attachmentViewMasks = reinterpret_cast<uint32_t *>(hostMemory); hostMemory += pCreateInfo->attachmentCount * sizeof(uint32_t); - for (auto i = 0u; i < pCreateInfo->attachmentCount; i++) + for(auto i = 0u; i < pCreateInfo->attachmentCount; i++) { attachmentFirstUse[i] = -1; attachmentViewMasks[i] = 0; @@ -56,20 +56,20 @@ } const VkBaseInStructure* extensionCreateInfo = reinterpret_cast<const VkBaseInStructure*>(pCreateInfo->pNext); - while (extensionCreateInfo) + while(extensionCreateInfo) { - switch (extensionCreateInfo->sType) + switch(extensionCreateInfo->sType) { case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO: { // Renderpass uses multiview if this structure is present AND some subpass specifies // a nonzero view mask auto const *multiviewCreateInfo = reinterpret_cast<VkRenderPassMultiviewCreateInfo const *>(extensionCreateInfo); - for (auto i = 0u; i < pCreateInfo->subpassCount; i++) + for(auto i = 0u; i < pCreateInfo->subpassCount; i++) { masks[i] = multiviewCreateInfo->pViewMasks[i]; // This is now a multiview renderpass, so make the masks available - if (masks[i]) + if(masks[i]) viewMasks = masks; } @@ -101,9 +101,9 @@ pCreateInfo->pSubpasses[i].pInputAttachments, inputAttachmentsSize); hostMemory += inputAttachmentsSize; - for (auto j = 0u; j < subpasses[i].inputAttachmentCount; j++) + for(auto j = 0u; j < subpasses[i].inputAttachmentCount; j++) { - if (subpass.pInputAttachments[j].attachment != VK_ATTACHMENT_UNUSED) + if(subpass.pInputAttachments[j].attachment != VK_ATTACHMENT_UNUSED) MarkFirstUse(subpass.pInputAttachments[j].attachment, i); } } @@ -124,11 +124,11 @@ hostMemory += colorAttachmentsSize; } - for (auto j = 0u; j < subpasses[i].colorAttachmentCount; j++) + for(auto j = 0u; j < subpasses[i].colorAttachmentCount; j++) { - if (subpass.pColorAttachments[j].attachment != VK_ATTACHMENT_UNUSED) + if(subpass.pColorAttachments[j].attachment != VK_ATTACHMENT_UNUSED) MarkFirstUse(subpass.pColorAttachments[j].attachment, i); - if (subpass.pResolveAttachments && + if(subpass.pResolveAttachments && subpass.pResolveAttachments[j].attachment != VK_ATTACHMENT_UNUSED) MarkFirstUse(subpass.pResolveAttachments[j].attachment, i); } @@ -141,7 +141,7 @@ subpass.pDepthStencilAttachment, sizeof(VkAttachmentReference)); hostMemory += sizeof(VkAttachmentReference); - if (subpass.pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) + if(subpass.pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) MarkFirstUse(subpass.pDepthStencilAttachment->attachment, i); } @@ -153,9 +153,9 @@ pCreateInfo->pSubpasses[i].pPreserveAttachments, preserveAttachmentSize); hostMemory += preserveAttachmentSize; - for (auto j = 0u; j < subpasses[i].preserveAttachmentCount; j++) + for(auto j = 0u; j < subpasses[i].preserveAttachmentCount; j++) { - if (subpass.pPreserveAttachments[j] != VK_ATTACHMENT_UNUSED) + if(subpass.pPreserveAttachments[j] != VK_ATTACHMENT_UNUSED) MarkFirstUse(subpass.pPreserveAttachments[j], i); } } @@ -213,10 +213,10 @@ // FIXME: we may not actually need to track attachmentFirstUse if we're going to eagerly // clear attachments at the start of the renderpass; can use attachmentViewMasks always instead. - if (attachmentFirstUse[attachment] == -1) + if(attachmentFirstUse[attachment] == -1) attachmentFirstUse[attachment] = subpass; - if (isMultiView()) + if(isMultiView()) attachmentViewMasks[attachment] |= viewMasks[subpass]; }
diff --git a/src/Vulkan/VkSemaphore.cpp b/src/Vulkan/VkSemaphore.cpp index eb7231e..e921e4e 100644 --- a/src/Vulkan/VkSemaphore.cpp +++ b/src/Vulkan/VkSemaphore.cpp
@@ -46,13 +46,13 @@ // the pCreateInfo->pNext chain indicates it needs to be exported. Impl(const VkSemaphoreCreateInfo* pCreateInfo) { bool exportSemaphore = false; - for (const auto* nextInfo = reinterpret_cast<const VkBaseInStructure*>(pCreateInfo->pNext); + for(const auto* nextInfo = reinterpret_cast<const VkBaseInStructure*>(pCreateInfo->pNext); nextInfo != nullptr; nextInfo = nextInfo->pNext) { - if (nextInfo->sType == VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO) + if(nextInfo->sType == VK_STRUCTURE_TYPE_EXPORT_SEMAPHORE_CREATE_INFO) { const auto* exportInfo = reinterpret_cast<const VkExportSemaphoreCreateInfo *>(nextInfo); - if (exportInfo->handleTypes != External::kExternalSemaphoreHandleType) + if(exportInfo->handleTypes != External::kExternalSemaphoreHandleType) { UNIMPLEMENTED("exportInfo->handleTypes"); } @@ -61,7 +61,7 @@ } } - if (exportSemaphore) + if(exportSemaphore) { allocateExternalNoInit(); external->init(); @@ -75,7 +75,7 @@ // Deallocate the External semaphore if any. void deallocateExternal() { - if (external) + if(external) { external->~External(); external = nullptr; @@ -93,9 +93,9 @@ void wait() { - if (external) + if(external) { - if (!external->tryWait()) + if(!external->tryWait()) { // Dispatch the external wait to a background thread. // Even if this creates a new thread on each @@ -110,7 +110,7 @@ // If the import was temporary, reset the semaphore to its // permanent state by getting rid of |external|. // See "6.4.5. Importing Semaphore Payloads" in Vulkan 1.1 spec. - if (temporaryImport) + if(temporaryImport) { deallocateExternal(); temporaryImport = false; @@ -124,7 +124,7 @@ void signal() { - if (external) + if(external) { // Assumes that signalling an external semaphore is non-blocking, // so it can be performed directly either from a fiber or thread. @@ -152,7 +152,7 @@ { // Signal the marl condition variable only. std::unique_lock<std::mutex> lock(mutex); - if (!signaled) + if(!signaled) { signaled = true; condition.notify_one(); @@ -203,12 +203,12 @@ VkResult Semaphore::importFd(int fd, bool temporaryImport) { std::unique_lock<std::mutex> lock(impl->mutex); - if (!impl->external) + if(!impl->external) { impl->allocateExternalNoInit(); } VkResult result = impl->external->importFd(fd); - if (result != VK_SUCCESS) + if(result != VK_SUCCESS) { impl->deallocateExternal(); } @@ -222,7 +222,7 @@ VkResult Semaphore::exportFd(int* pFd) const { std::unique_lock<std::mutex> lock(impl->mutex); - if (!impl->external) + if(!impl->external) { TRACE("Cannot export non-external semaphore"); return VK_ERROR_INVALID_EXTERNAL_HANDLE; @@ -235,7 +235,7 @@ VkResult Semaphore::importHandle(zx_handle_t handle, bool temporaryImport) { std::unique_lock<std::mutex> lock(impl->mutex); - if (!impl->external) + if(!impl->external) { impl->allocateExternalNoInit(); } @@ -248,7 +248,7 @@ VkResult Semaphore::exportHandle(zx_handle_t *pHandle) const { std::unique_lock<std::mutex> lock(impl->mutex); - if (!impl->external) + if(!impl->external) { TRACE("Cannot export non-external semaphore"); return VK_ERROR_INVALID_EXTERNAL_HANDLE;
diff --git a/src/Vulkan/VkSemaphoreExternalFuchsia.hpp b/src/Vulkan/VkSemaphoreExternalFuchsia.hpp index 4da9d39..d42787a 100644 --- a/src/Vulkan/VkSemaphoreExternalFuchsia.hpp +++ b/src/Vulkan/VkSemaphoreExternalFuchsia.hpp
@@ -44,7 +44,7 @@ void init() { zx_status_t status = zx_event_create(0, &handle); - if (status != ZX_OK) + if(status != ZX_OK) { ABORT("zx_event_create() returned %d", status); } @@ -60,7 +60,7 @@ { zx_handle_t new_handle = ZX_HANDLE_INVALID; zx_status_t status = zx_handle_duplicate(handle, ZX_RIGHT_SAME_RIGHTS, &new_handle); - if (status != ZX_OK) + if(status != ZX_OK) { TRACE("zx_handle_duplicate() returned %d", status); return VK_ERROR_INVALID_EXTERNAL_HANDLE; @@ -74,17 +74,17 @@ zx_signals_t observed = 0; zx_status_t status = zx_object_wait_one( handle, ZX_EVENT_SIGNALED, ZX_TIME_INFINITE, &observed); - if (status != ZX_OK) + if(status != ZX_OK) { ABORT("zx_object_wait_one() returned %d", status); } - if (observed != ZX_EVENT_SIGNALED) + if(observed != ZX_EVENT_SIGNALED) { ABORT("zx_object_wait_one() returned observed %x (%x expected)", observed, ZX_EVENT_SIGNALED); } // Need to unsignal the event now, as required by the Vulkan spec. status = zx_object_signal(handle, ZX_EVENT_SIGNALED, 0); - if (status != ZX_OK) + if(status != ZX_OK) { ABORT("zx_object_signal() returned %d", status); } @@ -95,17 +95,17 @@ zx_signals_t observed = 0; zx_status_t status = zx_object_wait_one( handle, ZX_EVENT_SIGNALED, zx_clock_get_monotonic(), &observed); - if (status != ZX_OK) + if(status != ZX_OK) { ABORT("zx_object_wait_one() returned %d", status); } - if (observed != ZX_EVENT_SIGNALED) + if(observed != ZX_EVENT_SIGNALED) { return false; } // Need to unsignal the event now, as required by the Vulkan spec. status = zx_object_signal(handle, ZX_EVENT_SIGNALED, 0); - if (status != ZX_OK) + if(status != ZX_OK) { ABORT("zx_object_signal() returned %d", status); } @@ -115,7 +115,7 @@ void signal() { zx_status_t status = zx_object_signal(handle, 0, ZX_EVENT_SIGNALED); - if (status != ZX_OK) + if(status != ZX_OK) { ABORT("zx_object_signal() returned %d", status); }
diff --git a/src/Vulkan/VkSemaphoreExternalLinux.hpp b/src/Vulkan/VkSemaphoreExternalLinux.hpp index 9ba6c65..47b18c1 100644 --- a/src/Vulkan/VkSemaphoreExternalLinux.hpp +++ b/src/Vulkan/VkSemaphoreExternalLinux.hpp
@@ -85,7 +85,7 @@ void wait() { pthread_mutex_lock(&mutex); - while (!signaled) + while(!signaled) { pthread_cond_wait(&cond, &mutex); } @@ -104,7 +104,7 @@ { pthread_mutex_lock(&mutex); bool result = signaled; - if (result) + if(result) { signaled = false; } @@ -150,7 +150,7 @@ static int counter = 0; char name[40]; snprintf(name, sizeof(name), "SwiftShader.Semaphore.%d", ++counter); - if (!memfd.allocate(name, size)) + if(!memfd.allocate(name, size)) { ABORT("memfd.allocate() returned %s", strerror(errno)); } @@ -172,7 +172,7 @@ VkResult exportFd(int* pFd) const { int fd = memfd.exportFd(); - if (fd < 0) + if(fd < 0) { return VK_ERROR_INVALID_EXTERNAL_HANDLE; } @@ -199,9 +199,9 @@ // Unmap the semaphore if needed and close its file descriptor. void close() { - if (semaphore) + if(semaphore) { - if (semaphore->deref()) + if(semaphore->deref()) { semaphore->~SharedSemaphore(); } @@ -216,12 +216,12 @@ { // Map the region into memory and point the semaphore to it. void* addr = memfd.mapReadWrite(0, size); - if (!addr) + if(!addr) { ABORT("mmap() failed: %s", strerror(errno)); } semaphore = reinterpret_cast<SharedSemaphore *>(addr); - if (needInitialization) + if(needInitialization) { new (semaphore) SharedSemaphore(); }
diff --git a/src/Vulkan/VkStringify.cpp b/src/Vulkan/VkStringify.cpp index e7ac2d4..b7c0b63 100644 --- a/src/Vulkan/VkStringify.cpp +++ b/src/Vulkan/VkStringify.cpp
@@ -457,7 +457,7 @@ #undef INSERT_ELEMENT }; auto it = strings.find(value); - if (it != strings.end()) + if(it != strings.end()) { return std::string(it->second); }
diff --git a/src/Vulkan/libVulkan.cpp b/src/Vulkan/libVulkan.cpp index a01f392..ae9a9b8 100644 --- a/src/Vulkan/libVulkan.cpp +++ b/src/Vulkan/libVulkan.cpp
@@ -138,7 +138,7 @@ static std::weak_ptr<marl::Scheduler> schedulerWeak; std::unique_lock<std::mutex> lock(mutex); auto scheduler = schedulerWeak.lock(); - if (!scheduler) + if(!scheduler) { scheduler = std::make_shared<marl::Scheduler>(); scheduler->setThreadInitializer([] { @@ -273,9 +273,9 @@ } uint32_t extensionPropertiesCount = sizeof(instanceExtensionProperties) / sizeof(instanceExtensionProperties[0]); - for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; ++i) + for(uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; ++i) { - if (!HasExtensionProperty(pCreateInfo->ppEnabledExtensionNames[i], instanceExtensionProperties, extensionPropertiesCount)) + if(!HasExtensionProperty(pCreateInfo->ppEnabledExtensionNames[i], instanceExtensionProperties, extensionPropertiesCount)) { return VK_ERROR_EXTENSION_NOT_PRESENT; } @@ -362,7 +362,7 @@ vk::Cast(physicalDevice)->getFormatProperties(format, &properties); VkFormatFeatureFlags features; - switch (tiling) + switch(tiling) { case VK_IMAGE_TILING_LINEAR: features = properties.linearTilingFeatures; @@ -377,43 +377,43 @@ features = 0; } - if (features == 0) + if(features == 0) { return VK_ERROR_FORMAT_NOT_SUPPORTED; } // Check for usage conflict with features - if ((usage & VK_IMAGE_USAGE_SAMPLED_BIT) && !(features & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT)) + if((usage & VK_IMAGE_USAGE_SAMPLED_BIT) && !(features & VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT)) { return VK_ERROR_FORMAT_NOT_SUPPORTED; } - if ((usage & VK_IMAGE_USAGE_STORAGE_BIT) && !(features & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT)) + if((usage & VK_IMAGE_USAGE_STORAGE_BIT) && !(features & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT)) { return VK_ERROR_FORMAT_NOT_SUPPORTED; } - if ((usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) && !(features & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT)) + if((usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) && !(features & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT)) { return VK_ERROR_FORMAT_NOT_SUPPORTED; } - if ((usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) && !(features & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)) + if((usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) && !(features & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)) { return VK_ERROR_FORMAT_NOT_SUPPORTED; } - if ((usage & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT) && !(features & (VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT))) + if((usage & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT) && !(features & (VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT))) { return VK_ERROR_FORMAT_NOT_SUPPORTED; } - if ((usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) && !(features & VK_FORMAT_FEATURE_TRANSFER_SRC_BIT)) + if((usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) && !(features & VK_FORMAT_FEATURE_TRANSFER_SRC_BIT)) { return VK_ERROR_FORMAT_NOT_SUPPORTED; } - if ((usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT) && !(features & VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) + if((usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT) && !(features & VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) { return VK_ERROR_FORMAT_NOT_SUPPORTED; } @@ -513,9 +513,9 @@ } uint32_t extensionPropertiesCount = sizeof(deviceExtensionProperties) / sizeof(deviceExtensionProperties[0]); - for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; ++i) + for(uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; ++i) { - if (!HasExtensionProperty(pCreateInfo->ppEnabledExtensionNames[i], deviceExtensionProperties, extensionPropertiesCount)) + if(!HasExtensionProperty(pCreateInfo->ppEnabledExtensionNames[i], deviceExtensionProperties, extensionPropertiesCount)) { return VK_ERROR_EXTENSION_NOT_PRESENT; } @@ -598,7 +598,7 @@ { const VkPhysicalDeviceMultiviewFeatures* multiviewFeatures = reinterpret_cast<const VkPhysicalDeviceMultiviewFeatures*>(extensionCreateInfo); - if (multiviewFeatures->multiviewGeometryShader || + if(multiviewFeatures->multiviewGeometryShader || multiviewFeatures->multiviewTessellationShader) { return VK_ERROR_FEATURE_NOT_PRESENT; @@ -609,7 +609,7 @@ { const VkPhysicalDeviceShaderDrawParametersFeatures* shaderDrawParametersFeatures = reinterpret_cast<const VkPhysicalDeviceShaderDrawParametersFeatures*>(extensionCreateInfo); - if (shaderDrawParametersFeatures->shaderDrawParameters) + if(shaderDrawParametersFeatures->shaderDrawParameters) { return VK_ERROR_FEATURE_NOT_PRESENT; } @@ -813,7 +813,7 @@ case VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR: { auto* importInfo = reinterpret_cast<const VkImportMemoryFdInfoKHR *>(allocationInfo); - if (importInfo->handleType != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) + if(importInfo->handleType != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) { UNSUPPORTED("importInfo->handleType %u", importInfo->handleType); return VK_ERROR_INVALID_EXTERNAL_HANDLE; @@ -823,7 +823,7 @@ case VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO: { auto* exportInfo = reinterpret_cast<const VkExportMemoryAllocateInfo *>(allocationInfo); - if (exportInfo->handleTypes != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) + if(exportInfo->handleTypes != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) { UNSUPPORTED("exportInfo->handleTypes %u", exportInfo->handleTypes); return VK_ERROR_INVALID_EXTERNAL_HANDLE; @@ -870,7 +870,7 @@ TRACE("(VkDevice device = %p, const VkMemoryGetFdInfoKHR* getFdInfo = %p, int* pFd = %p", device, getFdInfo, pFd); - if (getFdInfo->handleType != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) + if(getFdInfo->handleType != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) { UNSUPPORTED("pGetFdInfo->handleType %u", getFdInfo->handleType); return VK_ERROR_INVALID_EXTERNAL_HANDLE; @@ -883,13 +883,13 @@ TRACE("(VkDevice device = %p, VkExternalMemoryHandleTypeFlagBits handleType = %x, int fd = %d, VkMemoryFdPropertiesKHR* pMemoryFdProperties = %p)", device, handleType, fd, pMemoryFdProperties); - if (handleType != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) + if(handleType != VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) { UNSUPPORTED("handleType %u", handleType); return VK_ERROR_INVALID_EXTERNAL_HANDLE; } - if (fd < 0) + if(fd < 0) { return VK_ERROR_INVALID_EXTERNAL_HANDLE; } @@ -961,7 +961,7 @@ TRACE("(VkDevice device = %p, VkBuffer buffer = %p, VkDeviceMemory memory = %p, VkDeviceSize memoryOffset = %d)", device, static_cast<void*>(buffer), static_cast<void*>(memory), int(memoryOffset)); - if (!vk::Cast(buffer)->canBindToMemory(vk::Cast(memory))) + if(!vk::Cast(buffer)->canBindToMemory(vk::Cast(memory))) { UNSUPPORTED("vkBindBufferMemory with invalid external memory"); return VK_ERROR_INVALID_EXTERNAL_HANDLE; @@ -975,7 +975,7 @@ TRACE("(VkDevice device = %p, VkImage image = %p, VkDeviceMemory memory = %p, VkDeviceSize memoryOffset = %d)", device, static_cast<void*>(image), static_cast<void*>(memory), int(memoryOffset)); - if (!vk::Cast(image)->canBindToMemory(vk::Cast(memory))) + if(!vk::Cast(image)->canBindToMemory(vk::Cast(memory))) { UNSUPPORTED("vkBindImageMemory with invalid external memory"); return VK_ERROR_INVALID_EXTERNAL_HANDLE; @@ -1104,7 +1104,7 @@ TRACE("(VkDevice device = %p, const VkSemaphoreGetFdInfoKHR* pGetFdInfo = %p, int* pFd = %p)", device, static_cast<const void*>(pGetFdInfo), static_cast<void*>(pFd)); - if (pGetFdInfo->handleType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) + if(pGetFdInfo->handleType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { UNIMPLEMENTED("pGetFdInfo->handleType"); } @@ -1117,7 +1117,7 @@ TRACE("(VkDevice device = %p, const VkImportSemaphoreFdInfoKHR* pImportSemaphoreInfo = %p", device, static_cast<const void*>(pImportSemaphoreInfo)); - if (pImportSemaphoreInfo->handleType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) + if(pImportSemaphoreInfo->handleType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { UNIMPLEMENTED("pImportSemaphoreInfo->handleType"); } @@ -1135,7 +1135,7 @@ TRACE("(VkDevice device = %p, const VkImportSemaphoreZirconHandleInfoFUCHSIA* pImportSemaphoreZirconHandleInfo = %p)", device, pImportSemaphoreZirconHandleInfo); - if (pImportSemaphoreZirconHandleInfo->handleType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA) + if(pImportSemaphoreZirconHandleInfo->handleType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA) { UNIMPLEMENTED("pImportSemaphoreZirconHandleInfo->handleType"); } @@ -1154,7 +1154,7 @@ TRACE("(VkDevice device = %p, const VkSemaphoreGetZirconHandleInfoFUCHSIA* pGetZirconHandleInfo = %p, zx_handle_t* pZirconHandle = %p)", device, static_cast<const void*>(pGetZirconHandleInfo), static_cast<void*>(pZirconHandle)); - if (pGetZirconHandleInfo->handleType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA) + if(pGetZirconHandleInfo->handleType != VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_TEMP_ZIRCON_EVENT_BIT_FUCHSIA) { UNIMPLEMENTED("pGetZirconHandleInfo->handleType"); } @@ -1258,9 +1258,9 @@ device, pCreateInfo, pAllocator, pBuffer); auto* nextInfo = reinterpret_cast<const VkBaseInStructure*>(pCreateInfo->pNext); - while (nextInfo) + while(nextInfo) { - switch (nextInfo->sType) + switch(nextInfo->sType) { case VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO: // Do nothing. Should be handled by vk::Buffer::Create(). @@ -1361,9 +1361,9 @@ VkResult result = vk::Image::Create(pAllocator, pCreateInfo, pImage, vk::Cast(device)); #ifdef __ANDROID__ - if (swapchainImage) + if(swapchainImage) { - if (result != VK_SUCCESS) + if(result != VK_SUCCESS) { return result; } @@ -2408,14 +2408,14 @@ extInfo = extInfo->pNext; } - if (!vk::Cast(pBindInfos[i].buffer)->canBindToMemory(vk::Cast(pBindInfos[i].memory))) + if(!vk::Cast(pBindInfos[i].buffer)->canBindToMemory(vk::Cast(pBindInfos[i].memory))) { UNSUPPORTED("vkBindBufferMemory2 with invalid external memory"); return VK_ERROR_INVALID_EXTERNAL_HANDLE; } } - for (uint32_t i = 0; i < bindInfoCount; i++) + for(uint32_t i = 0; i < bindInfoCount; i++) { vk::Cast(pBindInfos[i].buffer)->bind(vk::Cast(pBindInfos[i].memory), pBindInfos[i].memoryOffset); } @@ -2430,7 +2430,7 @@ for(uint32_t i = 0; i < bindInfoCount; i++) { - if (!vk::Cast(pBindInfos[i].image)->canBindToMemory(vk::Cast(pBindInfos[i].memory))) + if(!vk::Cast(pBindInfos[i].image)->canBindToMemory(vk::Cast(pBindInfos[i].memory))) { UNSUPPORTED("vkBindImageMemory2 with invalid external memory"); return VK_ERROR_OUT_OF_DEVICE_MEMORY; @@ -2443,9 +2443,9 @@ VkDeviceSize offset = pBindInfos[i].memoryOffset; auto extInfo = reinterpret_cast<VkBaseInStructure const *>(pBindInfos[i].pNext); - while (extInfo) + while(extInfo) { - switch (extInfo->sType) + switch(extInfo->sType) { case VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_DEVICE_GROUP_INFO: /* Do nothing */ @@ -3295,7 +3295,7 @@ TRACE("(VkDevice device = %p, VkDeviceGroupPresentCapabilitiesKHR* pDeviceGroupPresentCapabilities = %p)", device, pDeviceGroupPresentCapabilities); - for (int i = 0; i < VK_MAX_DEVICE_GROUP_SIZE; i++) + for(int i = 0; i < VK_MAX_DEVICE_GROUP_SIZE; i++) { // The only real physical device in the presentation group is device 0, // and it can present to itself.