Skip to content

Commit 91cec0b

Browse files
q4aq4a
committed
Merge remote-tracking branch 'upstream/xd_dev' into xd_dev
2 parents 6da29d8 + e061f14 commit 91cec0b

File tree

22 files changed

+29696
-203
lines changed

22 files changed

+29696
-203
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@
6060
[submodule "Externals/pugixml"]
6161
path = Externals/pugixml
6262
url = https://github.com/zeux/pugixml.git
63-
[submodule "Externals/glew"]
64-
path = Externals/glew
65-
url = https://github.com/Armada651/glew.git
66-
branch = build
6763
[submodule "Externals/gli"]
6864
path = Externals/gli
6965
url = https://github.com/g-truc/gli.git

‎Externals/SPIRV.vcxproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,17 @@
9595
<ClInclude Include="glslang\SPIRV\SPVRemapper.h" />
9696
</ItemGroup>
9797
<ItemGroup>
98+
<ProjectReference Include="glslang.vcxproj">
99+
<Project>{8559bc92-bc07-32ef-beed-0c50fe6ca3c3}</Project>
100+
</ProjectReference>
98101
<ProjectReference Include="HLSL.vcxproj">
99-
<Project>63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1</Project>
100-
<Name>HLSL</Name>
102+
<Project>{63ceee7d-2a82-3fdb-af79-23f77bb29ac1}</Project>
101103
</ProjectReference>
102104
<ProjectReference Include="OGLCompiler.vcxproj">
103-
<Project>D4C49E20-DE3E-36FE-8BFA-0517A87FDB47</Project>
104-
<Name>OGLCompiler</Name>
105+
<Project>{d4c49e20-de3e-36fe-8bfa-0517a87fdb47}</Project>
105106
</ProjectReference>
106107
<ProjectReference Include="OSDependent.vcxproj">
107-
<Project>0165B392-9E93-3AA3-89F3-20ACB545095D</Project>
108-
<Name>OSDependent</Name>
109-
</ProjectReference>
110-
<ProjectReference Include="glslang.vcxproj">
111-
<Project>8559BC92-BC07-32EF-BEED-0C50FE6CA3C3</Project>
112-
<Name>glslang</Name>
108+
<Project>{0165b392-9e93-3aa3-89f3-20acb545095d}</Project>
113109
</ProjectReference>
114110
</ItemGroup>
115111
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎Externals/glew‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Externals/glslang‎

Submodule glslang updated 772 files

‎Externals/glslang.vcxproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
</ResourceCompile>
7373
</ItemDefinitionGroup>
7474
<ItemGroup>
75+
<ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp" />
7576
<ClCompile Include="glslang\glslang\MachineIndependent\Constant.cpp" />
7677
<ClCompile Include="glslang\glslang\MachineIndependent\glslang_tab.cpp" />
7778
<ClCompile Include="glslang\glslang\MachineIndependent\InfoSink.cpp" />
@@ -98,6 +99,7 @@
9899
<ClCompile Include="glslang\glslang\MachineIndependent\ShaderLang.cpp" />
99100
<ClCompile Include="glslang\glslang\MachineIndependent\SymbolTable.cpp" />
100101
<ClCompile Include="glslang\glslang\MachineIndependent\Versions.cpp" />
102+
<ClInclude Include="glslang\glslang\MachineIndependent\attribute.h" />
101103
<ClInclude Include="glslang\glslang\MachineIndependent\glslang_tab.cpp.h" />
102104
<ClInclude Include="glslang\glslang\MachineIndependent\gl_types.h" />
103105
<ClInclude Include="glslang\glslang\MachineIndependent\Initialize.h" />
@@ -131,23 +133,20 @@
131133
<ClCompile Include="glslang\glslang\GenericCodeGen\CodeGen.cpp" />
132134
<ClCompile Include="glslang\glslang\GenericCodeGen\Link.cpp" />
133135
</ItemGroup>
136+
<ItemGroup>
137+
<None Include="glslang\glslang\MachineIndependent\glslang.y" />
138+
</ItemGroup>
134139
<ItemGroup>
135140
<ProjectReference Include="HLSL.vcxproj">
136-
<Project>63CEEE7D-2A82-3FDB-AF79-23F77BB29AC1</Project>
137-
<Name>HLSL</Name>
141+
<Project>{63ceee7d-2a82-3fdb-af79-23f77bb29ac1}</Project>
138142
</ProjectReference>
139143
<ProjectReference Include="OGLCompiler.vcxproj">
140-
<Project>D4C49E20-DE3E-36FE-8BFA-0517A87FDB47</Project>
141-
<Name>OGLCompiler</Name>
144+
<Project>{d4c49e20-de3e-36fe-8bfa-0517a87fdb47}</Project>
142145
</ProjectReference>
143146
<ProjectReference Include="OSDependent.vcxproj">
144-
<Project>0165B392-9E93-3AA3-89F3-20ACB545095D</Project>
145-
<Name>OSDependent</Name>
147+
<Project>{0165b392-9e93-3aa3-89f3-20acb545095d}</Project>
146148
</ProjectReference>
147149
</ItemGroup>
148-
<ItemGroup>
149-
<None Include="glslang\glslang\MachineIndependent\glslang.y" />
150-
</ItemGroup>
151150
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
152151
<ImportGroup Label="ExtensionTargets">
153152
</ImportGroup>

‎Externals/glslang.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@
8585
<ClCompile Include="glslang\glslang\MachineIndependent\Versions.cpp">
8686
<Filter>MachineIndependent</Filter>
8787
</ClCompile>
88+
<ClCompile Include="glslang\glslang\MachineIndependent\attribute.cpp">
89+
<Filter>MachineIndependent</Filter>
90+
</ClCompile>
8891
</ItemGroup>
8992
<ItemGroup>
9093
<ClInclude Include="glslang\glslang\Public\ShaderLang.h">
@@ -177,6 +180,9 @@
177180
<ClInclude Include="glslang\glslang\MachineIndependent\Versions.h">
178181
<Filter>MachineIndependent</Filter>
179182
</ClInclude>
183+
<ClInclude Include="glslang\glslang\MachineIndependent\attribute.h">
184+
<Filter>MachineIndependent</Filter>
185+
</ClInclude>
180186
</ItemGroup>
181187
<ItemGroup>
182188
<Filter Include="Public">

‎res/gamedata/shaders/gl/common_defines.h‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,23 @@
22
#define common_defines_h_included
33

44
//////////////////////////////////////////////////////////////////////////////////////////
5-
// Defines
5+
// Defines //
66
#define def_gloss float(2.f /255.f)
77
#define def_aref float(200.f/255.f)
88
#define def_dbumph float(0.333f)
99
#define def_virtualh float(0.05f) // 5cm
10-
#define def_distort float(0.05f) // we get -0.5 .. 0.5 range, this is -512 .. 512 for 1024, so scale it
11-
#define def_hdr float(9.f) // hight luminance range float(3.h)
12-
#define def_hdr_clip float(0.75f) //
10+
#define def_distort float(0.05f) // we get -0.5 .. 0.5 range, this is -512 .. 512 for 1024, so scale it
11+
#define def_hdr float(9.f) // hight luminance range float(3.h)
12+
#define def_hdr_clip float(0.75f) //
1313

1414
#define LUMINANCE_VECTOR float3(0.3f, 0.38f, 0.22f)
1515

1616
//////////////////////////////////////////////////////////////////////////////////////////
17-
// skyloader: if you want to resize smaps in renderer, then do not forget to change this file too
18-
#ifndef SMAP_QUALITY
19-
const float SMAP_size = 2048.f;
20-
#elif SMAP_QUALITY == 1
21-
const float SMAP_size = 1536.f;
22-
#elif SMAP_QUALITY == 2
23-
const float SMAP_size = 2048.f;
24-
#elif SMAP_QUALITY == 3
25-
const float SMAP_size = 2560.f;
26-
#elif SMAP_QUALITY == 4
27-
const float SMAP_size = 3072.f;
28-
#elif SMAP_QUALITY == 5
29-
const float SMAP_size = 4096.f;
17+
#ifndef SMAP_size
18+
#define SMAP_size 1024
3019
#endif
31-
//////////////////////////////////////////////////////////////////////////////////////////
32-
#define PARALLAX_H float(0.02f)
33-
#define parallax float2(PARALLAX_H, -PARALLAX_H/2)
20+
#define PARALLAX_H 0.02
21+
#define parallax float2(PARALLAX_H, -PARALLAX_H/2)
3422
//////////////////////////////////////////////////////////////////////////////////////////
3523

36-
#endif // common_defines_h_included
24+
#endif // common_defines_h_included

0 commit comments

Comments
 (0)