Permalink
Browse files

Update SPIRV-Cross to a fresher version.

  • Loading branch information...
hrydgard committed Jul 16, 2018
1 parent e648b7d commit a589a371e67b6ea153623f4b320ec501cb229428
@@ -261,9 +261,11 @@ bool TranslateShader(std::string *dest, ShaderLanguage destLang, TranslatedShade
{
spirv_cross::CompilerHLSL hlsl(spirv);
spirv_cross::CompilerHLSL::Options options{};
options.fixup_clipspace = true;
options.shader_model = 30;
hlsl.set_options(options);
spirv_cross::CompilerGLSL::Options options_common{};
options_common.vertex.fixup_clipspace = true;
hlsl.set_hlsl_options(options);
hlsl.set_common_options(options_common);
*dest = hlsl.compile();
return true;
}
@@ -279,9 +281,11 @@ bool TranslateShader(std::string *dest, ShaderLanguage destLang, TranslatedShade
i++;
}
spirv_cross::CompilerHLSL::Options options{};
options.fixup_clipspace = true;
options.shader_model = 50;
hlsl.set_options(options);
spirv_cross::CompilerGLSL::Options options_common{};
options_common.vertex.fixup_clipspace = true;
hlsl.set_hlsl_options(options);
hlsl.set_common_options(options_common);
std::string raw = hlsl.compile();
*dest = Postprocess(raw, destLang, stage);
return true;
@@ -285,6 +285,7 @@
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cfg.hpp" />
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_common.hpp" />
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross.hpp" />
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_cross_util.hpp" />
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_glsl.hpp" />
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_hlsl.hpp" />
<ClInclude Include="..\..\ext\SPIRV-Cross\spirv_msl.hpp" />
@@ -294,6 +295,7 @@
<ItemGroup>
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cfg.cpp" />
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cross.cpp" />
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_cross_util.cpp" />
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_glsl.cpp" />
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_hlsl.cpp" />
<ClCompile Include="..\..\ext\SPIRV-Cross\spirv_msl.cpp" />
@@ -312,4 +314,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
View
@@ -149,6 +149,7 @@ VULKAN_FILES := \
SPIRV_CROSS_FILES := \
$(SRC)/ext/SPIRV-Cross/spirv_cfg.cpp \
$(SRC)/ext/SPIRV-Cross/spirv_cross.cpp \
$(SRC)/ext/SPIRV-Cross/spirv_cross_util.cpp \
$(SRC)/ext/SPIRV-Cross/spirv_glsl.cpp
EXEC_AND_LIB_FILES := \
Submodule SPIRV-Cross updated 1275 files
@@ -26,6 +26,7 @@ add_library(spirv-cross-core STATIC
${SRCDIR}/spirv.hpp
${SRCDIR}/spirv_cross.hpp
${SRCDIR}/spirv_cross.cpp
${SRCDIR}/spirv_cross_util.cpp
${SRCDIR}/spirv_cfg.hpp
${SRCDIR}/spirv_cfg.cpp)
View
@@ -22,7 +22,8 @@
<ProjectGuid>{4328A62C-F1E9-47ED-B816-A1A81DAF4363}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>SPIRVCross</RootNamespace>
<WindowsTargetPlatformVersion></WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>
</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -153,6 +154,7 @@
<ClInclude Include="SPIRV-Cross\spirv_common.hpp" />
<ClInclude Include="SPIRV-Cross\spirv_cpp.hpp" />
<ClInclude Include="SPIRV-Cross\spirv_cross.hpp" />
<ClInclude Include="SPIRV-Cross\spirv_cross_util.hpp" />
<ClInclude Include="SPIRV-Cross\spirv_glsl.hpp" />
<ClInclude Include="SPIRV-Cross\spirv_hlsl.hpp" />
<ClInclude Include="SPIRV-Cross\spirv_msl.hpp" />
@@ -161,6 +163,7 @@
<ClCompile Include="SPIRV-Cross\spirv_cfg.cpp" />
<ClCompile Include="SPIRV-Cross\spirv_cpp.cpp" />
<ClCompile Include="SPIRV-Cross\spirv_cross.cpp" />
<ClCompile Include="SPIRV-Cross\spirv_cross_util.cpp" />
<ClCompile Include="SPIRV-Cross\spirv_glsl.cpp" />
<ClCompile Include="SPIRV-Cross\spirv_hlsl.cpp" />
<ClCompile Include="SPIRV-Cross\spirv_msl.cpp" />
@@ -9,6 +9,7 @@
<ClInclude Include="SPIRV-Cross\spirv_glsl.hpp" />
<ClInclude Include="SPIRV-Cross\spirv_hlsl.hpp" />
<ClInclude Include="SPIRV-Cross\spirv_msl.hpp" />
<ClInclude Include="SPIRV-Cross\spirv_cross_util.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="SPIRV-Cross\spirv_cfg.cpp" />
@@ -17,5 +18,6 @@
<ClCompile Include="SPIRV-Cross\spirv_glsl.cpp" />
<ClCompile Include="SPIRV-Cross\spirv_hlsl.cpp" />
<ClCompile Include="SPIRV-Cross\spirv_msl.cpp" />
<ClCompile Include="SPIRV-Cross\spirv_cross_util.cpp" />
</ItemGroup>
</Project>
View
@@ -242,6 +242,7 @@ SOURCES_CXX += \
$(EXTDIR)/glslang/SPIRV/SpvBuilder.cpp \
$(EXTDIR)/SPIRV-Cross/spirv_cfg.cpp \
$(EXTDIR)/SPIRV-Cross/spirv_cross.cpp \
$(EXTDIR)/SPIRV-Cross/spirv_cross_util.cpp \
$(EXTDIR)/SPIRV-Cross/spirv_glsl.cpp \
$(EXTDIR)/SPIRV-Cross/spirv_hlsl.cpp

0 comments on commit a589a37

Please sign in to comment.