From: Peter Gal <pgal.u-szeged@partner.samsung.com>
Date: Tue, 8 Sep 2015 15:55:51 +0000 (+0200)
Subject: ShaderRenderCase: Fix texture support
X-Git-Tag: upstream/0.1.0~812^2~521^2~6^2~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca7fa8a27f79d94429f722284b24febce952eb36;p=platform%2Fupstream%2FVK-GL-CTS.git

ShaderRenderCase: Fix texture support
---

diff --git a/external/vulkancts/data/vulkan/data/brick.png b/external/vulkancts/data/vulkan/data/brick.png
new file mode 100644
index 0000000..2dbc654
Binary files /dev/null and b/external/vulkancts/data/vulkan/data/brick.png differ
diff --git a/external/vulkancts/modules/vulkan/CMakeLists.txt b/external/vulkancts/modules/vulkan/CMakeLists.txt
index b1f4c32..838ab03 100644
--- 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	vulkan)
+add_data_dir(deqp-vk ../../data/vulkan/data	data)
diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp
index d751cce..b197acb 100644
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp
@@ -97,12 +97,16 @@ public:
 													UniformSetup& uniformSetup,
 													AttributeSetupFunc attribFunc)
 						: ShaderRenderCaseInstance(context, isVertexCase, evaluator, uniformSetup, attribFunc)
+						, m_brickTexture(DE_NULL)
 					{}
 
 	virtual			~DummyShaderRenderCaseInstance	(void)
 					{
-						delete m_brickTexture;
-						m_brickTexture = DE_NULL;
+						if (m_brickTexture)
+						{
+							delete m_brickTexture;
+							m_brickTexture = DE_NULL;
+						}
 					}
 
 protected: