projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4eac053
7e26f68
)
Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/opengl-cts-dev
author
Pyry Haulos
<phaulos@google.com>
Thu, 19 Jan 2017 19:43:08 +0000
(11:43 -0800)
committer
Pyry Haulos
<phaulos@google.com>
Thu, 19 Jan 2017 19:43:08 +0000
(11:43 -0800)
Change-Id: I54cbd7d0021d911bad32411f54437fb270a60b64
1
2
external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/gles31/functional/es31fStencilTexturingTests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/gles31/functional/es31fTextureFilteringTests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
external/vulkancts/modules/vulkan/pipeline/CMakeLists.txt
Simple merge
diff --cc
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
diff --cc
modules/gles31/functional/es31fStencilTexturingTests.cpp
Simple merge
diff --cc
modules/gles31/functional/es31fTextureFilteringTests.cpp
Simple merge