ShaderRenderCase:

* Use vulkan/data dir instead of data/
* Also list .hpp files in CMakeLists.txt

diff --git a/external/vulkancts/modules/vulkan/CMakeLists.txt b/external/vulkancts/modules/vulkan/CMakeLists.txt
index 838ab03..b1f4c32 100644 (file)
--- a/external/vulkancts/modules/vulkan/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@ -59,4 +59,4 @@ endif ()
 
 add_deqp_module(deqp-vk "${DEQP_VK_SRCS}" "${DEQP_VK_LIBS}" vktTestPackageEntry.cpp)
 
-add_data_dir(deqp-vk ../../data/vulkan/data    data)
+add_data_dir(deqp-vk ../../data/vulkan vulkan)

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/CMakeLists.txt b/external/vulkancts/modules/vulkan/shaderrendercase/CMakeLists.txt
index bc38cc2..eb388aa 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/shaderrendercase/CMakeLists.txt
@@ -4,11 +4,15 @@ include_directories(
 
 set(DEQP_VK_SHADERRENDERCASE_SRCS
        vktShaderRenderCase.cpp
+       vktShaderRenderCase.hpp
        vktShaderRenderCaseTests.cpp
+       vktShaderRenderCaseTests.hpp
 
        vktTexture.cpp
+       vktTexture.hpp
 
        vktShaderDiscardTests.cpp
+       vktShaderDiscardTests.hpp
 )
 
 set(DEQP_VK_SHADERRENDERCASE_LIBS

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.cpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.cpp
index edbdf2d..40416fd 100644 (file)
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderDiscardTests.cpp
@@ -100,7 +100,7 @@ ShaderDiscardCaseInstance::ShaderDiscardCaseInstance (Context&                      context,
 {
        if (m_usesTexture)
        {
-               m_brickTexture = Texture2D::create(m_context, m_context.getTestContext().getArchive(), "data/brick.png");
+               m_brickTexture = Texture2D::create(m_context, m_context.getTestContext().getArchive(), "vulkan/data/brick.png");
                m_textures.push_back(TextureBinding(m_brickTexture, tcu::Sampler(tcu::Sampler::CLAMP_TO_EDGE,
                                                                                                                                                tcu::Sampler::CLAMP_TO_EDGE,
                                                                                                                                                tcu::Sampler::CLAMP_TO_EDGE,