projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
02297b8
)
ShaderRenderCase: Fix texture support
author
Peter Gal
<pgal.u-szeged@partner.samsung.com>
Tue, 8 Sep 2015 15:55:51 +0000
(17:55 +0200)
committer
Peter Gal
<pgal.u-szeged@partner.samsung.com>
Thu, 12 Nov 2015 18:52:42 +0000
(19:52 +0100)
external/vulkancts/data/vulkan/data/brick.png
[new file with mode: 0644]
patch
|
blob
external/vulkancts/modules/vulkan/CMakeLists.txt
patch
|
blob
|
history
external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCaseTests.cpp
patch
|
blob
|
history
diff --git a/external/vulkancts/data/vulkan/data/brick.png
b/external/vulkancts/data/vulkan/data/brick.png
new file mode 100644
(file)
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
(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
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
(file)
--- 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: