Fix invalid include guards and ws violations in pipeline barrier tests

diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
index 45854dc..0b68b63 100644 (file)
--- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
@@ -1157,7 +1157,7 @@ protected:
 
 private:
        // Disallow copying
-                                               Command         (const Command&);
+                                               Command         (const Command&);
        Command&                        operator&       (const Command&);
 };
 
@@ -1200,7 +1200,7 @@ public:
                                                ~UnMap          (void) {}
        const char*                     getName         (void) const { return "UnMap"; }
 
-       void                            logExecute      (TestLog& log, size_t commandIndex) const
+       void                            logExecute      (TestLog& log, size_t commandIndex) const
        {
                log << TestLog::Message << commandIndex << ": Unmap memory" << TestLog::EndMessage;
        }
@@ -1230,7 +1230,7 @@ public:
                                                ~Invalidate     (void) {}
        const char*                     getName         (void) const { return "Invalidate"; }
 
-       void                            logExecute      (TestLog& log, size_t commandIndex) const
+       void                            logExecute      (TestLog& log, size_t commandIndex) const
        {
                log << TestLog::Message << commandIndex << ": Invalidate mapped memory" << TestLog::EndMessage;
        }
@@ -1261,7 +1261,7 @@ public:
                                                ~Flush          (void) {}
        const char*                     getName         (void) const { return "Flush"; }
 
-       void                            logExecute      (TestLog& log, size_t commandIndex) const
+       void                            logExecute      (TestLog& log, size_t commandIndex) const
        {
                log << TestLog::Message << commandIndex << ": Flush mapped memory" << TestLog::EndMessage;
        }

diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.hpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.hpp
index 240a300..7cf591f 100644 (file)
--- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.hpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.hpp
@@ -1,5 +1,5 @@
-#ifndef _VKTBUFFERMEMORYTESTS_HPP
-#define _VKTBUFFERMEMORYTESTS_HPP
+#ifndef _VKTMEMORYPIPELINEBARRIERTESTS_HPP
+#define _VKTMEMORYPIPELINEBARRIERTESTS_HPP
 /*-------------------------------------------------------------------------
  * Vulkan Conformance Tests
  * ------------------------
@@ -47,4 +47,4 @@ tcu::TestCaseGroup*           createPipelineBarrierTests              (tcu::TestContext& testCtx);
 } // memory
 } // vkt
 
-#endif // _VKTBUFFERMEMORYTESTS_HPP
+#endif // _VKTMEMORYPIPELINEBARRIERTESTS_HPP