Merge 302-tessellation-shader-tests into vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Thu, 12 May 2016 20:38:12 +0000 (13:38 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 12 May 2016 20:38:12 +0000 (13:38 -0700)
1  2 
external/fetch_sources.py
external/glslang/CMakeLists.txt
external/vulkancts/mustpass/1.0.0/vk-default.txt

Simple merge
index 9ad57e0270f9b31dc39d9ddc8830874be765826a,9ad29736803327222e3d5fe3e19d087ecf9492bb..034f357c7a0451b61732f6281e2e48c33d18e280
@@@ -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