projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d8d0613
77d19cf
)
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
author
Alexander Galazin
<alexander.galazin@arm.com>
Fri, 20 Oct 2017 09:13:01 +0000
(11:13 +0200)
committer
Alexander Galazin
<alexander.galazin@arm.com>
Fri, 20 Oct 2017 09:13:01 +0000
(11:13 +0200)
Change-Id: Idc483ba07b1f343dbd56002b429fb242fd69e963
1
2
android/cts/master/vk-master.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/mustpass/1.1.0/vk-default.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
android/cts/master/vk-master.txt
index
cb0e470
,
5b27f97
..
8761387
mode 100755,100644..100755
---
1
/
android/cts/master/vk-master.txt
---
2
/
android/cts/master/vk-master.txt
+++ b/
android/cts/master/vk-master.txt
diff --cc
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
diff --cc
external/vulkancts/mustpass/1.1.0/vk-default.txt
index
5804101
,
a55691f
..
200fadc
mode 100755,100644..100755
---
1
/
external/vulkancts/mustpass/1.1.0/vk-default.txt
---
2
/
external/vulkancts/mustpass/1.0.3/vk-default.txt
+++ b/
external/vulkancts/mustpass/1.1.0/vk-default.txt