projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5fe6837
f50ff86
)
Merge upstream-vulkan-cts-1.0-dev into master
author
Pyry Haulos
<phaulos@google.com>
Tue, 9 Aug 2016 20:02:10 +0000
(13:02 -0700)
committer
Pyry Haulos
<phaulos@google.com>
Tue, 9 Aug 2016 20:03:01 +0000
(13:03 -0700)
Change-Id: I318218fecd46ac39cc8dd5904d6fae3658bdb771
1
2
android/cts/master/com.drawelements.deqp.vk.xml
patch
|
diff1
|
diff2
|
blob
|
history
android/cts/master/vk-master.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/framework/vulkan/vkNullDriver.cpp
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
android/cts/master/com.drawelements.deqp.vk.xml
Simple merge
diff --cc
android/cts/master/vk-master.txt
Simple merge
diff --cc
external/vulkancts/framework/vulkan/vkNullDriver.cpp
Simple merge
diff --cc
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge