Fix whitespace and include guards
authorPyry Haulos <phaulos@google.com>
Sat, 5 Dec 2015 20:50:27 +0000 (12:50 -0800)
committerPyry Haulos <phaulos@google.com>
Sat, 5 Dec 2015 20:50:27 +0000 (12:50 -0800)
Change-Id: I580f26ff447fcba8a685850cf5ac15a14af41d60

external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.hpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineStencilTests.cpp
external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp
external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp
external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTests.hpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmTests.hpp
external/vulkancts/modules/vulkan/vktRenderPassTests.cpp
external/vulkancts/modules/vulkan/vktRenderPassTests.hpp

index 61b5960..87626e1 100644 (file)
@@ -1046,7 +1046,7 @@ void SingleCmdRenderInstance::renderToTarget (void)
                        &mainCmd.get(),
                        0u,
                        (const vk::VkSemaphore*)0,
-               };      
+               };
                VK_CHECK(m_vki.queueSubmit(m_queue, 1, &submitInfo, *fence));
        }
        VK_CHECK(m_vki.waitForFences(m_device, 1, &fence.get(), 0u, infiniteTimeout)); // \note: timeout is failure
index 3819b0c..ab6a214 100644 (file)
@@ -88,13 +88,13 @@ de::MovePtr<tcu::TextureLevel>      readColorAttachment                      (const vk::DeviceInterface
  * The VkImage must be non-multisampled and able to be used as a
  * destination operand for transfer operations.
  *//*--------------------------------------------------------------------*/
-void                                                   uploadTestTexture                        (const vk::DeviceInterface&    vk,
-                                                                                                                         vk::VkDevice                                  device,
-                                                                                                                         vk::VkQueue                                   queue,
-                                                                                                                         deUint32                                              queueFamilyIndex,
-                                                                                                                         vk::Allocator&                                allocator,
-                                                                                                                         const TestTexture&                    testTexture,
-                                                                                                                         vk::VkImage                                   destImage);
+void                                                   uploadTestTexture                       (const vk::DeviceInterface&             vk,
+                                                                                                                        vk::VkDevice                                   device,
+                                                                                                                        vk::VkQueue                                    queue,
+                                                                                                                        deUint32                                               queueFamilyIndex,
+                                                                                                                        vk::Allocator&                                 allocator,
+                                                                                                                        const TestTexture&                             testTexture,
+                                                                                                                        vk::VkImage                                    destImage);
 
 class TestTexture
 {
@@ -118,11 +118,13 @@ public:
 
        virtual std::vector<vk::VkBufferImageCopy>      getBufferCopyRegions            (void) const;
        virtual void                                                            write                                           (deUint8* destPtr) const;
+
 protected:
        void                                                                            populateLevels                          (const std::vector<tcu::PixelBufferAccess>& levels);
-       void                                                                            populateCompressedLevels        (const tcu::CompressedTexFormat& format, const std::vector<tcu::PixelBufferAccess>& decompressedLevels);
+       void                                                                            populateCompressedLevels        (const tcu::CompressedTexFormat& format, const std::vector<tcu::PixelBufferAccess>& decompressedLevels);
 
        static void                                                                     fillWithGradient                        (const tcu::PixelBufferAccess& levelAccess);
+
 protected:
        std::vector<tcu::CompressedTexture*>            m_compressedLevels;
 };
index df4c3c3..5b745fb 100644 (file)
@@ -430,7 +430,7 @@ StencilTestInstance::StencilTestInstance (Context&                                  context,
        {
                const VkAttachmentDescription colorAttachmentDescription =
                {
-                       0u,                                                                                                     // VkAttachmentDescriptionFlags flags;          
+                       0u,                                                                                                     // VkAttachmentDescriptionFlags flags;
                        m_colorFormat,                                                                          // VkFormat                                             format;
                        VK_SAMPLE_COUNT_1_BIT,                                                          // VkSampleCountFlagBits                samples;
                        VK_ATTACHMENT_LOAD_OP_CLEAR,                                            // VkAttachmentLoadOp                   loadOp;
@@ -813,11 +813,11 @@ StencilTestInstance::StencilTestInstance (Context&                                        context,
        {
                const VkCommandBufferAllocateInfo cmdBufferAllocateInfo =
                {
-                       VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType              sType;    
-                       DE_NULL,                                                                                // const void*                  pNext;    
-                       *m_cmdPool,                                                                             // VkCommandPool                commandPool; 
-                       VK_COMMAND_BUFFER_LEVEL_PRIMARY,                                // VkCommandBufferLevel level;       
-                       1u                                                                                              // deUint32                             bufferCount; 
+                       VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType              sType;
+                       DE_NULL,                                                                                // const void*                  pNext;
+                       *m_cmdPool,                                                                             // VkCommandPool                commandPool;
+                       VK_COMMAND_BUFFER_LEVEL_PRIMARY,                                // VkCommandBufferLevel level;
+                       1u                                                                                              // deUint32                             bufferCount;
                };
 
                const VkCommandBufferBeginInfo cmdBufferBeginInfo =
index 6fd96c2..740ffca 100644 (file)
@@ -208,10 +208,10 @@ QuadGrid::QuadGrid (int                                                                           gridSize,
                float           fy                      = 2.0f * sy - 1.0f;
                int                     vtxNdx          = ((y * (gridSize+1)) + x);
 
-               m_positions[vtxNdx]     = tcu::Vec4(fx, fy, 0.0f, 1.0f);
-               m_coords[vtxNdx]                = getCoords(sx, sy);
+               m_positions[vtxNdx]             = tcu::Vec4(fx, fy, 0.0f, 1.0f);
+               m_coords[vtxNdx]                = getCoords(sx, sy);
                m_unitCoords[vtxNdx]    = getUnitCoords(sx, sy);
-               m_attribOne[vtxNdx]     = 1.0f;
+               m_attribOne[vtxNdx]             = 1.0f;
 
                m_screenPos[vtxNdx]             = tcu::Vec4(sx, sy, 0.0f, 1.0f) * viewportScale;
 
@@ -224,13 +224,13 @@ QuadGrid::QuadGrid (int                                                                           gridSize,
        for (int y = 0; y < gridSize; y++)
        for (int x = 0; x < gridSize; x++)
        {
-               int stride                              = gridSize + 1;
-               int v00                                 = (y * stride) + x;
-               int v01                                 = (y * stride) + x + 1;
-               int v10                                 = ((y+1) * stride) + x;
-               int v11                                 = ((y+1) * stride) + x + 1;
+               int stride                              = gridSize + 1;
+               int v00                                 = (y * stride) + x;
+               int v01                                 = (y * stride) + x + 1;
+               int v10                                 = ((y+1) * stride) + x;
+               int v11                                 = ((y+1) * stride) + x + 1;
 
-               int baseNdx                     = ((y * gridSize) + x) * 6;
+               int baseNdx                             = ((y * gridSize) + x) * 6;
                m_indices[baseNdx + 0]  = (deUint16)v10;
                m_indices[baseNdx + 1]  = (deUint16)v00;
                m_indices[baseNdx + 2]  = (deUint16)v01;
@@ -493,7 +493,7 @@ tcu::TestStatus ShaderRenderCaseInstance::iterate (void)
        // Create quad grid.
        const tcu::IVec2        viewportSize    = getViewportSize();
        const int                       width                   = viewportSize.x();
-       const int                       height                  = viewportSize.y();
+       const int                       height                  = viewportSize.y();
 
        QuadGrid                        quadGrid                (m_isVertexCase ? s_gridSize : 4, width, height, tcu::Vec4(0.125f, 0.25f, 0.5f, 1.0f), m_userAttribTransforms, m_textures);
 
@@ -509,7 +509,7 @@ tcu::TestStatus ShaderRenderCaseInstance::iterate (void)
                computeFragmentReference(refImage, quadGrid);
 
        // Compare.
-       const bool                      compareOk               = compareImages(resImage, refImage, 0.05f);
+       const bool                      compareOk               = compareImages(resImage, refImage, 0.05f);
 
        if (compareOk)
                return tcu::TestStatus::pass("Result image matches reference");
@@ -523,7 +523,7 @@ void ShaderRenderCaseInstance::setupUniformData (deUint32 bindingLocation, deUin
        const DeviceInterface&                  vk                                      = m_context.getDeviceInterface();
        const deUint32                                  queueFamilyIndex        = m_context.getUniversalQueueFamilyIndex();
 
-       const VkBufferCreateInfo                uniformBufferParams     =
+       const VkBufferCreateInfo                uniformBufferParams     =
        {
                VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,           // VkStructureType              sType;
                DE_NULL,                                                                        // const void*                  pNext;
@@ -536,7 +536,7 @@ void ShaderRenderCaseInstance::setupUniformData (deUint32 bindingLocation, deUin
        };
 
        Move<VkBuffer>                                  buffer                          = createBuffer(vk, vkDevice, &uniformBufferParams);
-       de::MovePtr<Allocation>                 alloc                           = m_memAlloc.allocate(getBufferMemoryRequirements(vk, vkDevice, *buffer), MemoryRequirement::HostVisible);
+       de::MovePtr<Allocation>                 alloc                           = m_memAlloc.allocate(getBufferMemoryRequirements(vk, vkDevice, *buffer), MemoryRequirement::HostVisible);
        VK_CHECK(vk.bindBufferMemory(vkDevice, *buffer, alloc->getMemory(), alloc->getOffset()));
 
        deMemcpy(alloc->getHostPtr(), dataPtr, size);
@@ -568,13 +568,13 @@ void ShaderRenderCaseInstance::addAttribute (deUint32             bindingLocation,
                                                                                         vk::VkFormat   format,
                                                                                         deUint32               sizePerElement,
                                                                                         deUint32               count,
-                                                                                        const void*    dataPtr)
+                                                                                        const void*    dataPtr)
 {
        // Add binding specification
-       const deUint32                                                  binding                                 = (deUint32)m_vertexBindingDescription.size();
+       const deUint32                                                  binding                                 = (deUint32)m_vertexBindingDescription.size();
        const VkVertexInputBindingDescription   bindingDescription              =
        {
-               binding,                                                        // deUint32                     binding;
+               binding,                                                        // deUint32                             binding;
                sizePerElement,                                         // deUint32                             stride;
                VK_VERTEX_INPUT_RATE_VERTEX                     // VkVertexInputRate    stepRate;
        };
@@ -597,7 +597,7 @@ void ShaderRenderCaseInstance::addAttribute (deUint32               bindingLocation,
        const DeviceInterface&                                  vk                                              = m_context.getDeviceInterface();
        const deUint32                                                  queueFamilyIndex                = m_context.getUniversalQueueFamilyIndex();
 
-       const VkDeviceSize                                              inputSize                               = sizePerElement * count;
+       const VkDeviceSize                                              inputSize                               = sizePerElement * count;
        const VkBufferCreateInfo                                vertexBufferParams              =
        {
                VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,           // VkStructureType              sType;
@@ -610,7 +610,7 @@ void ShaderRenderCaseInstance::addAttribute (deUint32               bindingLocation,
                &queueFamilyIndex                                                       // const deUint32*              pQueueFamilyIndices;
        };
 
-       Move<VkBuffer>                                                  buffer                                  = createBuffer(vk, vkDevice, &vertexBufferParams);
+       Move<VkBuffer>                                                  buffer                                  = createBuffer(vk, vkDevice, &vertexBufferParams);
        de::MovePtr<vk::Allocation>                             alloc                                   = m_memAlloc.allocate(getBufferMemoryRequirements(vk, vkDevice, *buffer), MemoryRequirement::HostVisible);
        VK_CHECK(vk.bindBufferMemory(vkDevice, *buffer, alloc->getMemory(), alloc->getOffset()));
 
@@ -655,19 +655,19 @@ void ShaderRenderCaseInstance::useUniform (deUint32 bindingLocation, BaseUniform
                UNIFORM_CASE(UB4_TRUE,  tcu::Vec4(1));
 
                // Integer
-               UNIFORM_CASE(UI_ZERO,   0);
-               UNIFORM_CASE(UI_ONE,    1);
-               UNIFORM_CASE(UI_TWO,    2);
-               UNIFORM_CASE(UI_THREE,  3);
-               UNIFORM_CASE(UI_FOUR,   4);
-               UNIFORM_CASE(UI_FIVE,   5);
-               UNIFORM_CASE(UI_SIX,    6);
-               UNIFORM_CASE(UI_SEVEN,  7);
-               UNIFORM_CASE(UI_EIGHT,  8);
+               UNIFORM_CASE(UI_ZERO,   0);
+               UNIFORM_CASE(UI_ONE,    1);
+               UNIFORM_CASE(UI_TWO,    2);
+               UNIFORM_CASE(UI_THREE,  3);
+               UNIFORM_CASE(UI_FOUR,   4);
+               UNIFORM_CASE(UI_FIVE,   5);
+               UNIFORM_CASE(UI_SIX,    6);
+               UNIFORM_CASE(UI_SEVEN,  7);
+               UNIFORM_CASE(UI_EIGHT,  8);
                UNIFORM_CASE(UI_ONEHUNDREDONE, 101);
 
                // IVec2
-               UNIFORM_CASE(UI2_MINUS_ONE, tcu::IVec2(-1));
+               UNIFORM_CASE(UI2_MINUS_ONE,     tcu::IVec2(-1));
                UNIFORM_CASE(UI2_ZERO,          tcu::IVec2(0));
                UNIFORM_CASE(UI2_ONE,           tcu::IVec2(1));
                UNIFORM_CASE(UI2_TWO,           tcu::IVec2(2));
@@ -808,7 +808,7 @@ de::MovePtr<Allocation> ShaderRenderCaseInstance::uploadImage2D (const tcu::Text
        VkSubresourceLayout layout;
        vk.getImageSubresourceLayout(vkDevice, vkTexture, &subres, &layout);
 
-       tcu::ConstPixelBufferAccess     access          = refTexture.getLevel(0);
+       tcu::ConstPixelBufferAccess     access          = refTexture.getLevel(0);
        tcu::PixelBufferAccess          destAccess      (refTexture.getFormat(), refTexture.getWidth(), refTexture.getHeight(), 1, allocation->getHostPtr());
 
        tcu::copy(destAccess, access);
@@ -840,7 +840,7 @@ void ShaderRenderCaseInstance::copyTilingImageToOptimal     (const vk::VkImage&     srcI
        Move<VkCommandPool>                                     cmdPool                         = createCommandPool(vk, vkDevice, &cmdPoolParams);
 
        // Create command buffer
-       const VkCommandBufferAllocateInfo       cmdBufferParams         =
+       const VkCommandBufferAllocateInfo       cmdBufferParams         =
        {
                VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO, // VkStructureType                      sType;
                DE_NULL,                                                                                // const void*                          pNext;
@@ -918,7 +918,7 @@ void ShaderRenderCaseInstance::copyTilingImageToOptimal     (const vk::VkImage&     srcI
        const VkImageMemoryBarrier              dstBarrier                      =
                        createImageMemoryBarrier(dstImage, VK_ACCESS_HOST_WRITE_BIT | VK_ACCESS_TRANSFER_WRITE_BIT, 0u, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
 
-       const void* const*                              barrier                         = (const void* const*)&dstBarrier;
+       const void* const*                              barrier                         = (const void* const*)&dstBarrier;
        vk.cmdPipelineBarrier(*cmdBuffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, false, 1, (const void* const*)&barrier);
 
        VK_CHECK(vk.endCommandBuffer(*cmdBuffer));
@@ -964,7 +964,7 @@ void ShaderRenderCaseInstance::useSampler2D (deUint32 bindingLocation, deUint32
 
        // Create & alloc the image
        Move<VkImage>                                   vkTexture;
-       de::MovePtr<Allocation>         allocation;
+       de::MovePtr<Allocation>                 allocation;
 
        if (isSupportedLinearTilingFormat(m_context.getInstanceInterface(), m_context.getPhysicalDevice(), format))
        {
@@ -1653,7 +1653,7 @@ void ShaderRenderCaseInstance::render (tcu::Surface& result, const QuadGrid& qua
        // Read back the result
        {
                const VkDeviceSize                                                              imageSizeBytes                          = (VkDeviceSize)(sizeof(deUint32) * m_renderSize.x() * m_renderSize.y());
-               const VkBufferCreateInfo                                                readImageBufferParams           =
+               const VkBufferCreateInfo                                                readImageBufferParams           =
                {
                        VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO,           //  VkStructureType             sType;
                        DE_NULL,                                                                        //  const void*                 pNext;
index f75851a..266d107 100644 (file)
@@ -77,7 +77,7 @@ public:
                                                                                                                        const Type                              type,
                                                                                                                        const tcu::Sampler&             sampler);
                                                                                ~TextureBinding         (void);
-       Type                                                            getType                         (void) const { return m_type;           }
+       Type                                                            getType                         (void) const { return m_type;           }
        const tcu::Sampler&                                     getSampler                      (void) const { return m_sampler;        }
        const tcu::Texture2D&                           get2D                           (void) const { DE_ASSERT(getType() == TYPE_2D && m_binding.tex2D !=NULL); return *m_binding.tex2D; }
 
@@ -380,7 +380,7 @@ public:
        template<typename T>
        void                                                                                            addUniform                                      (deUint32                               bindingLocation,
                                                                                                                                                                        vk::VkDescriptorType    descriptorType,
-                                                                                                                                                                       const T&                                data);
+                                                                                                                                                                       const T&                                data);
        void                                                                                            addUniform                                      (deUint32                               bindingLocation,
                                                                                                                                                                        vk::VkDescriptorType    descriptorType,
                                                                                                                                                                        deUint32                                dataSize,
@@ -405,16 +405,16 @@ protected:
 private:
 
        void                                                                                            setupTextures                           (void);
-       de::MovePtr<vk::Allocation>                                                     uploadImage2D                           (const tcu::Texture2D&  refTexture,
-                                                                                                                                                                        const vk::VkImage&             vkTexture);
+       de::MovePtr<vk::Allocation>                                                     uploadImage2D                           (const tcu::Texture2D&                  refTexture,
+                                                                                                                                                                        const vk::VkImage&                             vkTexture);
        vk::Move<vk::VkImage>                                                           createImage2D                           (const tcu::Texture2D&                  texture,
                                                                                                                                                                         const vk::VkFormat                             format,
                                                                                                                                                                         const vk::VkImageUsageFlags    usage,
                                                                                                                                                                         const vk::VkImageTiling                tiling);
-       void                                                                                            copyTilingImageToOptimal        (const vk::VkImage&     srcImage,
-                                                                                                                                                                        const vk::VkImage&     dstImage,
-                                                                                                                                                                        deInt32                        width,
-                                                                                                                                                                        deInt32                        height);
+       void                                                                                            copyTilingImageToOptimal        (const vk::VkImage&                             srcImage,
+                                                                                                                                                                        const vk::VkImage&                             dstImage,
+                                                                                                                                                                        deInt32                                                width,
+                                                                                                                                                                        deInt32                                                height);
 
        void                                                                                            setupUniformData                        (deUint32 bindingLocation, deUint32 size, const void* dataPtr);
        void                                                                                            setupDefaultInputs                      (const QuadGrid& quadGrid);
@@ -428,7 +428,7 @@ private:
 
        const bool                                                                                      m_isVertexCase;
        const ShaderEvaluator&                                                          m_evaluator;
-       const UniformSetup&                                                                     m_uniformSetup;
+       const UniformSetup&                                                                     m_uniformSetup;
        const AttributeSetupFunc                                                        m_attribFunc;
 
        struct EnabledBaseAttribute
@@ -443,7 +443,7 @@ private:
 
        vk::Move<vk::VkImage>                                                           m_colorImage;
        de::MovePtr<vk::Allocation>                                                     m_colorImageAlloc;
-       vk::Move<vk::VkImageView>                                                       m_colorImageView;
+       vk::Move<vk::VkImageView>                                                       m_colorImageView;
 
        vk::Move<vk::VkRenderPass>                                                      m_renderPass;
        vk::Move<vk::VkFramebuffer>                                                     m_framebuffer;
@@ -468,13 +468,13 @@ private:
 
        vk::DescriptorSetLayoutBuilder                                          m_descriptorSetLayoutBuilder;
        vk::DescriptorPoolBuilder                                                       m_descriptorPoolBuilder;
-       vk::DescriptorSetUpdateBuilder                                          m_descriptorSetUpdateBuilder;
+       vk::DescriptorSetUpdateBuilder                                          m_descriptorSetUpdateBuilder;
 
-       typedef de::SharedPtr<vk::Unique<vk::VkBuffer> >                VkBufferSp;
+       typedef de::SharedPtr<vk::Unique<vk::VkBuffer> >                VkBufferSp;
 
-       typedef de::SharedPtr<vk::Unique<vk::VkImage> >                 VkImageSp;
+       typedef de::SharedPtr<vk::Unique<vk::VkImage> >                 VkImageSp;
        typedef de::SharedPtr<vk::Unique<vk::VkImageView> >             VkImageViewSp;
-       typedef de::SharedPtr<vk::Unique<vk::VkSampler> >               VkSamplerSp;
+       typedef de::SharedPtr<vk::Unique<vk::VkSampler> >               VkSamplerSp;
        typedef de::SharedPtr<vk::Allocation>                                   AllocationSp;
 
        class UniformInfo
index c8da5e8..904eea3 100644 (file)
@@ -64,7 +64,7 @@ public:
                                                }
 
 private:
-       const bool                      m_useSampler;
+       const bool                      m_useSampler;
 };
 
 
index 2efe0f0..ef7cb77 100644 (file)
@@ -1,4 +1,5 @@
 #ifndef _VKTSHADERRENDERTESTS_HPP
+#define _VKTSHADERRENDERTESTS_HPP
 /*------------------------------------------------------------------------
  * Copyright (c) 2015 The Khronos Group Inc.
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
index 31b4da9..acfaa0f 100644 (file)
@@ -2147,16 +2147,16 @@ string makeTessEvalShaderAssembly(const map<string, string>& fragments)
 // layout(location = 1) out vec4 out_color;
 //
 // void main() {
-//      gl_Position = gl_in[0].gl_Position;
-//      out_color = test_fun(in_color[0]);
-//      EmitVertex();
-//      gl_Position = gl_in[1].gl_Position;
-//      out_color = test_fun(in_color[1]);
-//      EmitVertex();
-//      gl_Position = gl_in[2].gl_Position;
-//      out_color = test_fun(in_color[2]);
-//      EmitVertex();
-//      EndPrimitive();
+//   gl_Position = gl_in[0].gl_Position;
+//   out_color = test_fun(in_color[0]);
+//   EmitVertex();
+//   gl_Position = gl_in[1].gl_Position;
+//   out_color = test_fun(in_color[1]);
+//   EmitVertex();
+//   gl_Position = gl_in[2].gl_Position;
+//   out_color = test_fun(in_color[2]);
+//   EmitVertex();
+//   EndPrimitive();
 // }
 string makeGeometryShaderAssembly(const map<string, string>& fragments)
 {
@@ -3052,7 +3052,7 @@ tcu::TestCaseGroup* createInstructionTests (tcu::TestContext& testCtx)
        instructionTests->addChild(createBlockOrderGroup(testCtx));
        instructionTests->addChild(createOpUndefGroup(testCtx));
        instructionTests->addChild(createOpUnreachableGroup(testCtx));
-    
+
     RGBA defaultColors[4];
        getDefaultColors(defaultColors);
        de::MovePtr<tcu::TestCaseGroup> group   (new tcu::TestCaseGroup(testCtx, "graphics-assembly", "Test the graphics pipeline"));
index c2d3f14..92e5301 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef _VKTSPVASMESTS_HPP
-#define _VKTSPVASMESTS_HPP
+#ifndef _VKTSPVASMTESTS_HPP
+#define _VKTSPVASMTESTS_HPP
 /*-------------------------------------------------------------------------
  * Vulkan Conformance Tests
  * ------------------------
@@ -47,4 +47,4 @@ tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx);
 } // SpirVAssembly
 } // vkt
 
-#endif // _VKTSPVASMESTS_HPP
+#endif // _VKTSPVASMTESTS_HPP
index 272d936..0f143e3 100644 (file)
@@ -1095,12 +1095,12 @@ Move<VkImage> createAttachmentImage (const DeviceInterface&     vk,
        const VkExtent3D size_                                  = { (deInt32)size.x(), (deInt32)size.y(), 1 };
        VkImageUsageFlags targetUsageFlags              = 0;
        const tcu::TextureFormat textureFormat  = mapVkFormat(format);
-       
+
        if (tcu::hasDepthComponent(textureFormat.order) || tcu::hasStencilComponent(textureFormat.order))
        {
                targetUsageFlags |= vk::VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
        }
-       else    
+       else
        {
                targetUsageFlags |= vk::VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
        }
@@ -2140,11 +2140,11 @@ void pushReadImagesToBuffers (const DeviceInterface&                                                            vk,
                        0, // bufferImageHeight
                        {                                                       // imageSubresource
                                getPrimaryImageAspect(mapVkFormat(attachmentInfo[attachmentNdx].getFormat()).order),    // aspect
-                               0,                                              // mipLevel
+                               0,                                              // mipLevel
                                0,                                              // arraySlice
                                1                                               // arraySize
                        },
-                       { 0, 0, 0 },                            // imageOffset
+                       { 0, 0, 0 },                            // imageOffset
                        { (deInt32)targetSize.x(), (deInt32)targetSize.y(), 1 }         // imageExtent
                };
 
@@ -2163,7 +2163,7 @@ void pushReadImagesToBuffers (const DeviceInterface&                                                              vk,
                                        0,                                                              // arraySlice
                                        1                                               // arraySize
                                },
-                               { 0, 0, 0 },                            // imageOffset
+                               { 0, 0, 0 },                            // imageOffset
                                { (deInt32)targetSize.x(), (deInt32)targetSize.y(), 1 }         // imageExtent
                        };
 
@@ -2369,7 +2369,7 @@ void renderReferenceImages (vector<tcu::TextureLevel>&                    referenceAttachments,
                        }
                }
 
-               // Apply load op to depth/stencil attachment if it was used for the first time 
+               // Apply load op to depth/stencil attachment if it was used for the first time
                if (subpass.getDepthStencilAttachment().getAttachment() != VK_ATTACHMENT_UNUSED && !attachmentUsed[subpass.getDepthStencilAttachment().getAttachment()])
                {
                        const deUint32 attachmentIndex = subpass.getDepthStencilAttachment().getAttachment();
index 9e6ec87..efebfa0 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef _VKTMULTIPASSTESTS_HPP
-#define _VKTMULTIPASSTESTS_HPP
+#ifndef _VKTRENDERPASSTESTS_HPP
+#define _VKTRENDERPASSTESTS_HPP
 /*-------------------------------------------------------------------------
  * Vulkan Conformance Tests
  * ------------------------
@@ -44,4 +44,4 @@ tcu::TestCaseGroup*   createRenderPassTests   (tcu::TestContext& testCtx);
 
 } // vkt
 
-#endif // _VKTMULTIPASSTESTS_HPP
+#endif // _VKTRENDERPASSTESTS_HPP