projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
17398f6
cd2d856
)
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
author
Alexander Galazin
<alexander.galazin@arm.com>
Sun, 18 Jun 2017 14:42:18 +0000
(16:42 +0200)
committer
Alexander Galazin
<alexander.galazin@arm.com>
Sun, 18 Jun 2017 14:42:18 +0000
(16:42 +0200)
Change-Id: I139603a8755afc3a543fffa4b8035070fb40d297
1
2
AndroidGen.mk
patch
|
diff1
|
diff2
|
blob
|
history
android/cts/master/vk-master.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/mustpass/1.0.2/src/master.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/mustpass/1.0.2/vk-default.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/mustpass/1.0.3/vk-default.txt
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/modules/vulkan/shaderexecutor/vktOpaqueTypeIndexingTests.cpp
Simple merge
diff --cc
external/vulkancts/mustpass/1.0.2/src/master.txt
Simple merge
diff --cc
external/vulkancts/mustpass/1.0.2/vk-default.txt
Simple merge
diff --cc
external/vulkancts/mustpass/1.0.3/vk-default.txt
Simple merge