projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
75f9abc
e43070b
)
Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-1.2.2
author
Alexander Galazin
<alexander.galazin@arm.com>
Fri, 12 Jun 2020 11:16:47 +0000
(13:16 +0200)
committer
Alexander Galazin
<alexander.galazin@arm.com>
Fri, 12 Jun 2020 11:16:47 +0000
(13:16 +0200)
Change-Id: Iea70c56e33f9ff0916b9b7536112ac21a71f7ffc
1
2
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
Simple merge
diff --cc
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
Simple merge