Fix invalid include guards

Change-Id: Ia9d53908b35343a1b285800bb930efdc9af2d6d4

diff --git a/external/vulkancts/framework/vulkan/vkSpirVProgram.hpp b/external/vulkancts/framework/vulkan/vkSpirVProgram.hpp
index b09e5fd..f6717c4 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkSpirVProgram.hpp
+++ b/external/vulkancts/framework/vulkan/vkSpirVProgram.hpp
@@ -1,5 +1,5 @@
-#ifndef _VKSPIPVROGRAM_HPP
-#define _VKSPIPVROGRAM_HPP
+#ifndef _VKSPIRVPROGRAM_HPP
+#define _VKSPIRVPROGRAM_HPP
 /*-------------------------------------------------------------------------
  * Vulkan CTS Framework
  * --------------------
@@ -72,4 +72,4 @@ tcu::TestLog& operator<<                      (tcu::TestLog& log, const SpirVAsmSource& program);
 
 }
 
-#endif // _VKSPIVPROGRAM_HPP
+#endif // _VKSPIRVPROGRAM_HPP

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineClearUtil.hpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineClearUtil.hpp
index f43eb2d..48649f4 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineClearUtil.hpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineClearUtil.hpp
@@ -1,3 +1,5 @@
+#ifndef _VKTPIPELINECLEARUTIL_HPP
+#define _VKTPIPELINECLEARUTIL_HPP
 /*------------------------------------------------------------------------
  * Vulkan Conformance Tests
  * ------------------------
@@ -33,9 +35,6 @@
  * \brief Utilities for clear values.
  *//*--------------------------------------------------------------------*/
 
-#ifndef _VKTPIPELINECLEARUTIL_HPP
-#define _VKTPIPELINECLEARUTIL_HPP
-
 #include "tcuTexture.hpp"
 #include "tcuVectorUtil.hpp"
 #include "vkDefs.hpp"

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.hpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.hpp
index 3b76738..006ce21 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.hpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.hpp
@@ -48,4 +48,3 @@ tcu::TestCaseGroup* createDepthTests (tcu::TestContext& testCtx);
 } // vkt
 
 #endif // _VKTPIPELINEDEPTHTESTS_HPP
-

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.hpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.hpp
index c6660bf..b3e91aa 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.hpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageUtil.hpp
@@ -68,4 +68,3 @@ de::MovePtr<tcu::TextureLevel> readColorAttachment (const vk::DeviceInterface&        v
 } // vkt
 
 #endif // _VKTPIPELINEIMAGEUTIL_HPP
-

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.hpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.hpp
index 609f684..a4de408 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.hpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineReferenceRenderer.hpp
@@ -186,4 +186,3 @@ rr::PrimitiveType                           mapVkPrimitiveTopology  (vk::VkPrimitiveTopology primitiveTo
 } // vkt
 
 #endif // _VKTPIPELINEREFERENCERENDERER_HPP
-

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.hpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.hpp
index 0fc3663..02dfbe9 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.hpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineVertexUtil.hpp
@@ -37,6 +37,7 @@
 
 #include "tcuDefs.hpp"
 #include "tcuVectorUtil.hpp"
+
 #include <vector>
 
 namespace vkt
@@ -61,4 +62,4 @@ std::vector<Vertex4RGBA> createOverlappingQuads (void);
 } // pipeline
 } // vkt
 
-#endif  // _VKTPIPELINEVERTEXUTIL_HPP
+#endif // _VKTPIPELINEVERTEXUTIL_HPP