Merge branch 'master' into hlsl-frontend
authorJohn Kessenich <cepheus@frii.com>
Mon, 4 Apr 2016 02:36:48 +0000 (20:36 -0600)
committerJohn Kessenich <cepheus@frii.com>
Mon, 4 Apr 2016 02:36:48 +0000 (20:36 -0600)
commit1c7e70763b2dbbbdf36b5ec2ddf5998a91d28fc4
treea60c7da44d37214fa4be18c5902fb674ff85559e
parentaecd497c968d7538a23f3551c6967ecb77f47ed7
parent9c2f1c7bc0bd1c5376f432b0808b2e34cbbe376f
Merge branch 'master' into hlsl-frontend
13 files changed:
CMakeLists.txt
SPIRV/GlslangToSpv.cpp
SPIRV/SpvBuilder.cpp
SPIRV/SpvBuilder.h
StandAlone/CMakeLists.txt
StandAlone/StandAlone.cpp
glslang/MachineIndependent/ParseHelper.cpp
glslang/MachineIndependent/ShaderLang.cpp
glslang/MachineIndependent/localintermediate.h
glslang/MachineIndependent/preprocessor/PpContext.cpp
glslang/MachineIndependent/preprocessor/PpContext.h
glslang/Public/ShaderLang.h
hlsl/hlslParseHelper.cpp