review.tizen.org Git - platform/upstream/VK-GL-CTS.git/commit

projects / platform / upstream / VK-GL-CTS.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a7db98c 0fcc6de)

author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 12 Apr 2019 11:04:18 +0000 (13:04 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 12 Apr 2019 11:04:18 +0000 (13:04 +0200)
commit	c7940263e7060d2e011a7bf5b3ef210e294a1fe6
tree	12c74e2427de2c87ae7b7260123758109eff4bd0	tree \| snapshot
parent	a7db98c20a6dd4e2366e4fc3ddd368a1fa08b98e	commit \| diff
parent	0fcc6de59289d11f3aa88adfabccae1775f56eeb	commit \| diff

Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ia8a9bb4d37b3d483be20d79d5ab92bd0f477034d

17 files changed:

AndroidGen.mk	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master.txt	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkBasicTypes.inl	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkDeviceFeatures.inl	\|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkExtensionFunctions.inl	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkPrograms.cpp	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStrUtil.inl	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStructTypes.inl	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkVulkan_c.inl	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/vktTestCase.cpp	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/vktTestCase.hpp	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.1.5/vk-default-no-waivers.txt	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.1.5/vk-default.txt	diff1 \|	diff2 \|	blob \| history
external/vulkancts/scripts/src/vulkan.h.in	diff1 \|	diff2 \|	blob \| history

Domain: Graphics System / GL;