Skip to content

Commit f8adcd5

Browse files
Xottab-DUTYXottab-DUTY
committed
Add glslang submodule
1 parent ba6010c commit f8adcd5

13 files changed

+983
-1
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,6 @@
6767
[submodule "Externals/tbb"]
6868
path = Externals/tbb
6969
url = https://github.com/01org/tbb.git
70+
[submodule "Externals/glslang"]
71+
path = Externals/glslang
72+
url = https://github.com/KhronosGroup/glslang.git

‎Externals/HLSL.vcxproj‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGUID>{63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1}</ProjectGUID>
23+
<Platform>Win32</Platform>
24+
<ProjectName>HLSL</ProjectName>
25+
</PropertyGroup>
26+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
28+
<ConfigurationType>StaticLibrary</ConfigurationType>
29+
<CharacterSet>MultiByte</CharacterSet>
30+
<PlatformToolset>v141</PlatformToolset>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33+
<ConfigurationType>StaticLibrary</ConfigurationType>
34+
<CharacterSet>MultiByte</CharacterSet>
35+
<PlatformToolset>v141</PlatformToolset>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38+
<ConfigurationType>StaticLibrary</ConfigurationType>
39+
<CharacterSet>MultiByte</CharacterSet>
40+
<PlatformToolset>v141</PlatformToolset>
41+
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
43+
<ConfigurationType>StaticLibrary</ConfigurationType>
44+
<CharacterSet>MultiByte</CharacterSet>
45+
<PlatformToolset>v141</PlatformToolset>
46+
</PropertyGroup>
47+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
48+
<ImportGroup Label="ExtensionSettings">
49+
</ImportGroup>
50+
<ImportGroup Label="PropertySheets">
51+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52+
<Import Project="$(SolutionDir)Common.props" />
53+
</ImportGroup>
54+
<PropertyGroup Label="UserMacros" />
55+
<ItemDefinitionGroup>
56+
<ClCompile>
57+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
58+
<PreprocessorDefinitions>WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
59+
</ClCompile>
60+
<ResourceCompile>
61+
<PreprocessorDefinitions>WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
62+
</ResourceCompile>
63+
</ItemDefinitionGroup>
64+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
65+
<ClCompile>
66+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
67+
<DebugInformationFormat>
68+
</DebugInformationFormat>
69+
</ClCompile>
70+
<ResourceCompile>
71+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72+
</ResourceCompile>
73+
</ItemDefinitionGroup>
74+
<ItemGroup>
75+
<ClInclude Include="glslang\hlsl\hlslAttributes.h" />
76+
<ClInclude Include="glslang\hlsl\hlslParseHelper.h" />
77+
<ClInclude Include="glslang\hlsl\hlslTokens.h" />
78+
<ClInclude Include="glslang\hlsl\hlslScanContext.h" />
79+
<ClInclude Include="glslang\hlsl\hlslOpMap.h" />
80+
<ClInclude Include="glslang\hlsl\hlslTokenStream.h" />
81+
<ClInclude Include="glslang\hlsl\hlslGrammar.h" />
82+
<ClInclude Include="glslang\hlsl\hlslParseables.h" />
83+
<ClCompile Include="glslang\hlsl\hlslAttributes.cpp" />
84+
<ClCompile Include="glslang\hlsl\hlslParseHelper.cpp" />
85+
<ClCompile Include="glslang\hlsl\hlslScanContext.cpp" />
86+
<ClCompile Include="glslang\hlsl\hlslOpMap.cpp" />
87+
<ClCompile Include="glslang\hlsl\hlslTokenStream.cpp" />
88+
<ClCompile Include="glslang\hlsl\hlslGrammar.cpp" />
89+
<ClCompile Include="glslang\hlsl\hlslParseables.cpp" />
90+
</ItemGroup>
91+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
92+
<ImportGroup Label="ExtensionTargets">
93+
</ImportGroup>
94+
</Project>

‎Externals/HLSL.vcxproj.filters‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<ClCompile Include="glslang\hlsl\hlslAttributes.cpp">
5+
<Filter>Source</Filter>
6+
</ClCompile>
7+
<ClCompile Include="glslang\hlsl\hlslParseHelper.cpp">
8+
<Filter>Source</Filter>
9+
</ClCompile>
10+
<ClCompile Include="glslang\hlsl\hlslScanContext.cpp">
11+
<Filter>Source</Filter>
12+
</ClCompile>
13+
<ClCompile Include="glslang\hlsl\hlslOpMap.cpp">
14+
<Filter>Source</Filter>
15+
</ClCompile>
16+
<ClCompile Include="glslang\hlsl\hlslTokenStream.cpp">
17+
<Filter>Source</Filter>
18+
</ClCompile>
19+
<ClCompile Include="glslang\hlsl\hlslGrammar.cpp">
20+
<Filter>Source</Filter>
21+
</ClCompile>
22+
<ClCompile Include="glslang\hlsl\hlslParseables.cpp">
23+
<Filter>Source</Filter>
24+
</ClCompile>
25+
</ItemGroup>
26+
<ItemGroup>
27+
<ClInclude Include="glslang\hlsl\hlslAttributes.h">
28+
<Filter>Source</Filter>
29+
</ClInclude>
30+
<ClInclude Include="glslang\hlsl\hlslParseHelper.h">
31+
<Filter>Source</Filter>
32+
</ClInclude>
33+
<ClInclude Include="glslang\hlsl\hlslTokens.h">
34+
<Filter>Source</Filter>
35+
</ClInclude>
36+
<ClInclude Include="glslang\hlsl\hlslScanContext.h">
37+
<Filter>Source</Filter>
38+
</ClInclude>
39+
<ClInclude Include="glslang\hlsl\hlslOpMap.h">
40+
<Filter>Source</Filter>
41+
</ClInclude>
42+
<ClInclude Include="glslang\hlsl\hlslTokenStream.h">
43+
<Filter>Source</Filter>
44+
</ClInclude>
45+
<ClInclude Include="glslang\hlsl\hlslGrammar.h">
46+
<Filter>Source</Filter>
47+
</ClInclude>
48+
<ClInclude Include="glslang\hlsl\hlslParseables.h">
49+
<Filter>Source</Filter>
50+
</ClInclude>
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Filter Include="Source">
54+
<UniqueIdentifier>{8A834F98-CCB3-3380-B2C7-38BD5A22185D}</UniqueIdentifier>
55+
</Filter>
56+
</ItemGroup>
57+
</Project>

‎Externals/OGLCompiler.vcxproj‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGUID>{D4C49E20-DE3E-36FE-8BFA-0517A87FDB47}</ProjectGUID>
23+
<Platform>Win32</Platform>
24+
<ProjectName>OGLCompiler</ProjectName>
25+
</PropertyGroup>
26+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
28+
<ConfigurationType>StaticLibrary</ConfigurationType>
29+
<CharacterSet>MultiByte</CharacterSet>
30+
<PlatformToolset>v141</PlatformToolset>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33+
<ConfigurationType>StaticLibrary</ConfigurationType>
34+
<CharacterSet>MultiByte</CharacterSet>
35+
<PlatformToolset>v141</PlatformToolset>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38+
<ConfigurationType>StaticLibrary</ConfigurationType>
39+
<CharacterSet>MultiByte</CharacterSet>
40+
<PlatformToolset>v141</PlatformToolset>
41+
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
43+
<ConfigurationType>StaticLibrary</ConfigurationType>
44+
<CharacterSet>MultiByte</CharacterSet>
45+
<PlatformToolset>v141</PlatformToolset>
46+
</PropertyGroup>
47+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
48+
<ImportGroup Label="ExtensionSettings">
49+
</ImportGroup>
50+
<ImportGroup Label="PropertySheets">
51+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52+
<Import Project="$(SolutionDir)Common.props" />
53+
</ImportGroup>
54+
<PropertyGroup Label="UserMacros" />
55+
<ItemDefinitionGroup>
56+
<ClCompile>
57+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
58+
<PreprocessorDefinitions>WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
59+
</ClCompile>
60+
<ResourceCompile>
61+
<PreprocessorDefinitions>WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
62+
</ResourceCompile>
63+
</ItemDefinitionGroup>
64+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
65+
<ClCompile>
66+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
67+
<DebugInformationFormat>
68+
</DebugInformationFormat>
69+
</ClCompile>
70+
<ResourceCompile>
71+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72+
</ResourceCompile>
73+
</ItemDefinitionGroup>
74+
<ItemGroup>
75+
<ClInclude Include="glslang\OGLCompilersDLL\InitializeDll.h" />
76+
<ClCompile Include="glslang\OGLCompilersDLL\InitializeDll.cpp" />
77+
</ItemGroup>
78+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
79+
<ImportGroup Label="ExtensionTargets">
80+
</ImportGroup>
81+
</Project>

‎Externals/OGLCompiler.vcxproj.filters‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<ClCompile Include="glslang\OGLCompilersDLL\InitializeDll.cpp">
5+
<Filter>Source</Filter>
6+
</ClCompile>
7+
</ItemGroup>
8+
<ItemGroup>
9+
<ClInclude Include="glslang\OGLCompilersDLL\InitializeDll.h">
10+
<Filter>Source</Filter>
11+
</ClInclude>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<Filter Include="Source">
15+
<UniqueIdentifier>{8A834F98-CCB3-3380-B2C7-38BD5A22185D}</UniqueIdentifier>
16+
</Filter>
17+
</ItemGroup>
18+
</Project>

‎Externals/OSDependent.vcxproj‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<ProjectGUID>{0165B392-9E93-3AA3-89F3-20ACB545095D}</ProjectGUID>
23+
<Platform>Win32</Platform>
24+
<ProjectName>OSDependent</ProjectName>
25+
</PropertyGroup>
26+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
27+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
28+
<ConfigurationType>StaticLibrary</ConfigurationType>
29+
<CharacterSet>MultiByte</CharacterSet>
30+
<PlatformToolset>v141</PlatformToolset>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33+
<ConfigurationType>StaticLibrary</ConfigurationType>
34+
<CharacterSet>MultiByte</CharacterSet>
35+
<PlatformToolset>v141</PlatformToolset>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
38+
<ConfigurationType>StaticLibrary</ConfigurationType>
39+
<CharacterSet>MultiByte</CharacterSet>
40+
<PlatformToolset>v141</PlatformToolset>
41+
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
43+
<ConfigurationType>StaticLibrary</ConfigurationType>
44+
<CharacterSet>MultiByte</CharacterSet>
45+
<PlatformToolset>v141</PlatformToolset>
46+
</PropertyGroup>
47+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
48+
<ImportGroup Label="ExtensionSettings">
49+
</ImportGroup>
50+
<ImportGroup Label="PropertySheets">
51+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
52+
<Import Project="$(SolutionDir)Common.props" />
53+
</ImportGroup>
54+
<PropertyGroup Label="UserMacros" />
55+
<ItemDefinitionGroup>
56+
<ClCompile>
57+
<PrecompiledHeader>NotUsing</PrecompiledHeader>
58+
<PreprocessorDefinitions>WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
59+
</ClCompile>
60+
<ResourceCompile>
61+
<PreprocessorDefinitions>WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
62+
</ResourceCompile>
63+
</ItemDefinitionGroup>
64+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
65+
<ClCompile>
66+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
67+
<DebugInformationFormat>
68+
</DebugInformationFormat>
69+
</ClCompile>
70+
<ResourceCompile>
71+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
72+
</ResourceCompile>
73+
</ItemDefinitionGroup>
74+
<ItemGroup>
75+
<ClInclude Include="glslang\glslang\OSDependent\osinclude.h" />
76+
<ClCompile Include="glslang\glslang\OSDependent\Windows\ossource.cpp" />
77+
</ItemGroup>
78+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
79+
<ImportGroup Label="ExtensionTargets">
80+
</ImportGroup>
81+
</Project>

‎Externals/OSDependent.vcxproj.filters‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<ClCompile Include="glslang\glslang\OSDependent\Windows\ossource.cpp">
5+
<Filter>Source</Filter>
6+
</ClCompile>
7+
</ItemGroup>
8+
<ItemGroup>
9+
<ClInclude Include="glslang\glslang\OSDependent\osinclude.h">
10+
<Filter>Source</Filter>
11+
</ClInclude>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<Filter Include="Source">
15+
<UniqueIdentifier>{8A834F98-CCB3-3380-B2C7-38BD5A22185D}</UniqueIdentifier>
16+
</Filter>
17+
</ItemGroup>
18+
</Project>

0 commit comments

Comments
 (0)