projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2fbb73b
bf6ca63
)
Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/opengl-cts-dev
author
Pyry Haulos
<phaulos@google.com>
Tue, 24 Jan 2017 00:32:35 +0000
(16:32 -0800)
committer
Pyry Haulos
<phaulos@google.com>
Tue, 24 Jan 2017 00:32:35 +0000
(16:32 -0800)
Change-Id: Iad6867155d0e94a63b4dfd259f17a811baab5520
1
2
Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/draw/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Android.mk
Simple merge
diff --cc
external/vulkancts/modules/vulkan/draw/CMakeLists.txt
Simple merge
diff --cc
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge