projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cd4b5f8
abbf1c4
)
Merge 302-tessellation-shader-tests into vulkan-cts-1.0-dev
author
Pyry Haulos
<phaulos@google.com>
Thu, 12 May 2016 20:38:12 +0000
(13:38 -0700)
committer
Pyry Haulos
<phaulos@google.com>
Thu, 12 May 2016 20:38:12 +0000
(13:38 -0700)
1
2
external/fetch_sources.py
patch
|
diff1
|
diff2
|
blob
|
history
external/glslang/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
external/vulkancts/mustpass/1.0.0/vk-default.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
external/fetch_sources.py
Simple merge
diff --cc
external/glslang/CMakeLists.txt
index 9ad57e0270f9b31dc39d9ddc8830874be765826a,9ad29736803327222e3d5fe3e19d087ecf9492bb..034f357c7a0451b61732f6281e2e48c33d18e280
---
1
/
external/glslang/CMakeLists.txt
---
2
/
external/glslang/CMakeLists.txt
+++ b/
external/glslang/CMakeLists.txt
@@@
-29,9
-29,9
+29,10
@@@
if (EXISTS ${GLSLANG_ABS_PATH}/glslang/
${GLSLANG_ABS_PATH}/glslang/MachineIndependent
${GLSLANG_ABS_PATH}/glslang/GenericCodeGen
${GLSLANG_ABS_PATH}/glslang/OSDependent
+ ${GLSLANG_ABS_PATH}/hlsl
${GLSLANG_ABS_PATH}/OGLCompilersDLL
${GLSLANG_ABS_PATH}/SPIRV
+ ${GLSLANG_ABS_PATH}/hlsl
)
set(GLSLANG_SRCS
diff --cc
external/vulkancts/mustpass/1.0.0/vk-default.txt
Simple merge