Improve file and namespace names

diff --git a/external/vulkancts/modules/vulkan/CMakeLists.txt b/external/vulkancts/modules/vulkan/CMakeLists.txt
index b1f4c32..d1ae9ae 100644 (file)
--- a/external/vulkancts/modules/vulkan/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@ -4,14 +4,14 @@ add_subdirectory(api)
 add_subdirectory(pipeline)
 add_subdirectory(binding_model)
 add_subdirectory(spirv_assembly)
-add_subdirectory(shaderrendercase)
+add_subdirectory(shaderrender)
 
 include_directories(
        api
        pipeline
        binding_model
        spirv_assembly
-       shaderrendercase
+       shaderrender
        )
 
 set(DEQP_VK_COMMON_SRCS
@@ -37,7 +37,7 @@ set(DEQP_VK_COMMON_LIBS
        deqp-vk-pipeline
        deqp-vk-binding-model
        deqp-vk-spirv-assembly
-       deqp-vk-shaderrendercase
+       deqp-vk-shaderrender
        )
 
 if (DE_OS_IS_WIN32 OR DE_OS_IS_UNIX OR DE_OS_IS_OSX)

diff --git a/external/vulkancts/modules/vulkan/shaderrender/CMakeLists.txt b/external/vulkancts/modules/vulkan/shaderrender/CMakeLists.txt
new file mode 100644 (file)
index 0000000..97058ca
--- /dev/null
+++ b/external/vulkancts/modules/vulkan/shaderrender/CMakeLists.txt
@@ -0,0 +1,21 @@
+include_directories(
+       ..
+)
+
+set(DEQP_VK_SHADERRENDER_SRCS
+       vktShaderRender.cpp
+       vktShaderRender.hpp
+       vktShaderRenderTests.cpp
+       vktShaderRenderTests.hpp
+
+       vktShaderRenderDiscardTests.cpp
+       vktShaderRenderDiscardTests.hpp
+)
+
+set(DEQP_VK_SHADERRENDER_LIBS
+       tcutil
+       vkutil
+)
+
+add_library(deqp-vk-shaderrender STATIC ${DEQP_VK_SHADERRENDER_SRCS})
+target_link_libraries(deqp-vk-shaderrender ${DEQP_VK_SHADERRENDER_LIBS})

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
similarity index 99%
rename from external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp
rename to external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
index 64b6c0f..9cf22db 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
@@ -33,7 +33,7 @@
  * \brief Vulkan ShaderRenderCase
  *//*--------------------------------------------------------------------*/
 
-#include "vktShaderRenderCase.hpp"
+#include "vktShaderRender.hpp"
 
 #include "tcuImageCompare.hpp"
 #include "tcuImageIO.hpp"
@@ -59,7 +59,7 @@
 
 namespace vkt
 {
-namespace shaderrendercase
+namespace sr
 {
 
 using namespace vk;
@@ -1828,5 +1828,5 @@ bool ShaderRenderCaseInstance::compareImages (const tcu::Surface& resImage, cons
        return tcu::fuzzyCompare(m_context.getTestContext().getLog(), "ComparisonResult", "Image comparison result", refImage, resImage, errorThreshold, tcu::COMPARE_LOG_RESULT);
 }
 
-} // shaderrendercase
+} // sr
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp
similarity index 98%
rename from external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp
rename to external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp
index 068b25a..bb4aebd 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp
@@ -1,5 +1,5 @@
-#ifndef _VKTSHADERRENDERCASE_HPP
-#define _VKTSHADERRENDERCASE_HPP
+#ifndef _VKTSHADERRENDER_HPP
+#define _VKTSHADERRENDER_HPP
 /*------------------------------------------------------------------------
  * Vulkan Conformance Tests
  * ------------------------
@@ -52,7 +52,7 @@
 
 namespace vkt
 {
-namespace shaderrendercase
+namespace sr
 {
 
 class QuadGrid;
@@ -530,7 +530,7 @@ void ShaderRenderCaseInstance::addUniform (deUint32 bindingLocation, vk::VkDescr
        addUniform(bindingLocation, descriptorType, sizeof(T), &data);
 }
 
-} // shaderrendercase
+} // sr
 } // vkt
 
-#endif // _VKTSHADERRENDERCASE_HPP
+#endif // _VKTSHADERRENDER_HPP

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp
similarity index 99%
rename from external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.cpp
rename to external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp
index 07eecba..c8da5e8 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.cpp
@@ -33,7 +33,7 @@
  * \brief Shader discard statement tests.
  *//*--------------------------------------------------------------------*/
 
-#include "vktShaderDiscardTests.hpp"
+#include "vktShaderRenderDiscardTests.hpp"
 #include "tcuStringTemplate.hpp"
 #include "gluTexture.hpp"
 
@@ -43,7 +43,7 @@ using tcu::StringTemplate;
 
 namespace vkt
 {
-namespace shaderrendercase
+namespace sr
 {
 namespace
 {
@@ -385,5 +385,5 @@ void ShaderDiscardTests::init (void)
                        addChild(makeDiscardCase(m_testCtx, (DiscardTemplate)tmpl, (DiscardMode)mode).release());
 }
 
-} // shaderrendercase
+} // sr
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.hpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.hpp
similarity index 91%
rename from external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.hpp
rename to external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.hpp
index a11b0e8..530e11d 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.hpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderDiscardTests.hpp
@@ -1,5 +1,5 @@
-#ifndef _VKTSHADERDISCARDTESTS_HPP
-#define _VKTSHADERDISCARDTESTS_HPP
+#ifndef _VKTSHADERRENDERDISCARDTESTS_HPP
+#define _VKTSHADERREMDERDISCARDTESTS_HPP
 /*------------------------------------------------------------------------
  * Vulkan Conformance Tests
  * ------------------------
@@ -35,11 +35,11 @@
  * \brief Shader discard statement tests.
  *//*--------------------------------------------------------------------*/
 
-#include "vktShaderRenderCase.hpp"
+#include "vktShaderRender.hpp"
 
 namespace vkt
 {
-namespace shaderrendercase
+namespace sr
 {
 
 class ShaderDiscardTests : public tcu::TestCaseGroup
@@ -55,7 +55,7 @@ private:
        ShaderDiscardTests&             operator=                               (const ShaderDiscardTests&);            // not allowed!
 };
 
-} // shaderrendercase
+} // sr
 } // vkt
 
-#endif // _VKTSHADERDISCARDTESTS_HPP
+#endif // _VKTSHADERRENDERDISCARDTESTS_HPP

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTests.cpp
similarity index 92%
rename from external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp
rename to external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTests.cpp
index 1abecaa..45fe711 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTests.cpp
@@ -30,16 +30,16 @@
  * \brief Vulkan shader render test cases
  *//*--------------------------------------------------------------------*/
 
-#include "vktShaderRenderCaseTests.hpp"
+#include "vktShaderRenderTests.hpp"
 
 #include "deUniquePtr.hpp"
 
-#include "vktShaderRenderCase.hpp"
-#include "vktShaderDiscardTests.hpp"
+#include "vktShaderRender.hpp"
+#include "vktShaderRenderDiscardTests.hpp"
 
 namespace vkt
 {
-namespace shaderrendercase
+namespace sr
 {
 
 tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx)
@@ -51,5 +51,5 @@ tcu::TestCaseGroup* createTests (tcu::TestContext& testCtx)
        return shaderRenderCaseTests.release();
 }
 
-} // shaderrendercase
+} // sr
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.hpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTests.hpp
similarity index 93%
rename from external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.hpp
rename to external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTests.hpp
index 67e55cb..2efe0f0 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.hpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderTests.hpp
@@ -1,4 +1,4 @@
-#ifndef _VKTSHADERRENDERCASETESTS_HPP
+#ifndef _VKTSHADERRENDERTESTS_HPP
 /*------------------------------------------------------------------------
  * Copyright (c) 2015 The Khronos Group Inc.
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -36,12 +36,12 @@
 
 namespace vkt
 {
-namespace shaderrendercase
+namespace sr
 {
 
 tcu::TestCaseGroup*            createTests                     (tcu::TestContext& testCtx);
 
-} // shaderrendercase
+} // sr
 } // vkt
 
-#endif // _VKTSHADERRENDERCASETESTS_HPP
+#endif // _VKTSHADERRENDERTESTS_HPP

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/CMakeLists.txt b/external/vulkancts/modules/vulkan/shaderrendercase/CMakeLists.txt
deleted file mode 100644 (file)
index ac491ca..0000000
--- a/external/vulkancts/modules/vulkan/shaderrendercase/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-include_directories(
-       ..
-)
-
-set(DEQP_VK_SHADERRENDERCASE_SRCS
-       vktShaderRenderCase.cpp
-       vktShaderRenderCase.hpp
-       vktShaderRenderCaseTests.cpp
-       vktShaderRenderCaseTests.hpp
-
-       vktShaderDiscardTests.cpp
-       vktShaderDiscardTests.hpp
-)
-
-set(DEQP_VK_SHADERRENDERCASE_LIBS
-       tcutil
-       vkutil
-)
-
-add_library(deqp-vk-shaderrendercase STATIC ${DEQP_VK_SHADERRENDERCASE_SRCS})
-target_link_libraries(deqp-vk-shaderrendercase ${DEQP_VK_SHADERRENDERCASE_LIBS})

diff --git a/external/vulkancts/modules/vulkan/vktTestPackage.cpp b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
index 50cc7bd..55e5d12 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktTestPackage.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
@@ -53,7 +53,7 @@
 #include "vktSpvAsmTests.hpp"
 #include "vktShaderLibrary.hpp"
 #include "vktRenderPassTests.hpp"
-#include "vktShaderRenderCaseTests.hpp"
+#include "vktShaderRenderTests.hpp"
 
 #include <vector>
 #include <sstream>
@@ -286,7 +286,7 @@ void TestPackage::init (void)
        addChild(SpirVAssembly::createTests     (m_testCtx));
        addChild(new GlslGroup                          (m_testCtx));
        addChild(createRenderPassTests          (m_testCtx));
-       addChild(shaderrendercase::createTests  (m_testCtx));
+       addChild(sr::createTests                        (m_testCtx));
 }
 
 } // vkt