projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c39e702
4514355
)
Merge gerrit/vulkan-cts-1.0.2 into gerrit/vulkan-cts-1.0.2-extensions
author
Pyry Haulos
<phaulos@google.com>
Tue, 10 Jan 2017 20:18:31 +0000
(12:18 -0800)
committer
Pyry Haulos
<phaulos@google.com>
Tue, 10 Jan 2017 20:18:31 +0000
(12:18 -0800)
Change-Id: I9149408b579c01cd5d7c16bdcdf408aae6819501
1
2
android/cts/master/vk-master.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/mustpass/1.0.2/vk-default.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
android/cts/master/vk-master.txt
Simple merge
diff --cc
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc
external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
Simple merge
diff --cc
external/vulkancts/mustpass/1.0.2/vk-default.txt
Simple merge