projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
59bf515
8328b00
)
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
author
Alexander Galazin
<alexander.galazin@arm.com>
Fri, 24 Aug 2018 11:30:25 +0000
(13:30 +0200)
committer
Alexander Galazin
<alexander.galazin@arm.com>
Fri, 24 Aug 2018 11:30:25 +0000
(13:30 +0200)
Change-Id: Id857ed995a1e8cbf7ef706095407eb84f5d1d34b
1
2
AndroidGen.mk
patch
|
diff1
|
diff2
|
blob
|
history
android/cts/master/vk-master.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/framework/vulkan/vkStructTypes.inl
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/mustpass/1.1.3/vk-default.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/scripts/src/vulkan.h.in
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
AndroidGen.mk
Simple merge
diff --cc
android/cts/master/vk-master.txt
Simple merge
diff --cc
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
Simple merge
diff --cc
external/vulkancts/framework/vulkan/vkStructTypes.inl
Simple merge
diff --cc
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
Simple merge
diff --cc
external/vulkancts/mustpass/1.1.3/vk-default.txt
Simple merge
diff --cc
external/vulkancts/scripts/src/vulkan.h.in
Simple merge