Merge vulkan-cts-1.0 into vulkan-cts-1.0-dev
authorPyry Haulos <phaulos@google.com>
Thu, 7 Jul 2016 18:03:51 +0000 (11:03 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 7 Jul 2016 18:03:51 +0000 (11:03 -0700)
1  2 
external/fetch_sources.py
external/glslang/CMakeLists.txt
external/vulkancts/README.md
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp

Simple merge
@@@ -52,8 -51,8 +52,9 @@@ if (EXISTS ${GLSLANG_ABS_PATH}/glslang/
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/limits.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/linkValidate.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/parseConst.cpp
 +              ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/propagateNoContraction.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/reflection.cpp
+               ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/propagateNoContraction.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/Pp.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpAtom.cpp
                ${GLSLANG_ABS_PATH}/glslang/MachineIndependent/preprocessor/PpContext.cpp
@@@ -64,9 -63,8 +65,8 @@@
                ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/CodeGen.cpp
                ${GLSLANG_ABS_PATH}/glslang/GenericCodeGen/Link.cpp
                ${GLSLANG_ABS_PATH}/OGLCompilersDLL/InitializeDll.cpp
--              
++
                ${GLSLANG_ABS_PATH}/hlsl/hlslGrammar.cpp
-               ${GLSLANG_ABS_PATH}/hlsl/hlslOpMap.cpp
                ${GLSLANG_ABS_PATH}/hlsl/hlslParseHelper.cpp
                ${GLSLANG_ABS_PATH}/hlsl/hlslScanContext.cpp
                ${GLSLANG_ABS_PATH}/hlsl/hlslTokenStream.cpp
Simple merge