Skip to content

Commit 6ef385f

Browse files
CrossVRCrossVR
committed
xrRenderPC_GL: Fix compilation.
1 parent 1feb9f5 commit 6ef385f

File tree

13 files changed

+1177
-220
lines changed

13 files changed

+1177
-220
lines changed

‎src/Externals/glbinding.vcxproj‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313
<PropertyGroup Label="Globals">
1414
<ProjectGUID>{AA714987-A9EB-3322-B3C6-EE1BD242CEC6}</ProjectGUID>
15-
<WindowsTargetPlatformVersion>10.0.10150.0</WindowsTargetPlatformVersion>
15+
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
1616
<Keyword>Win32Proj</Keyword>
1717
<Platform>Win32</Platform>
1818
<ProjectName>glbinding</ProjectName>
@@ -21,14 +21,14 @@
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2222
<ConfigurationType>StaticLibrary</ConfigurationType>
2323
<UseOfMfc>false</UseOfMfc>
24-
<CharacterSet>Unicode</CharacterSet>
2524
<PlatformToolset>v140</PlatformToolset>
25+
<CharacterSet>MultiByte</CharacterSet>
2626
</PropertyGroup>
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2828
<ConfigurationType>StaticLibrary</ConfigurationType>
2929
<UseOfMfc>false</UseOfMfc>
30-
<CharacterSet>Unicode</CharacterSet>
3130
<PlatformToolset>v140</PlatformToolset>
31+
<CharacterSet>MultiByte</CharacterSet>
3232
</PropertyGroup>
3333
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3434
<ImportGroup Label="ExtensionSettings">
@@ -53,13 +53,13 @@
5353
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
5454
</PropertyGroup>
5555
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
56-
<OutDir>$(xrBinDir)</OutDir>
56+
<OutDir>$(xrLibDir)</OutDir>
5757
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
5858
<IgnoreImportLibrary>true</IgnoreImportLibrary>
5959
<LinkIncremental>true</LinkIncremental>
6060
</PropertyGroup>
6161
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
62-
<OutDir>$(xrBinDir)</OutDir>
62+
<OutDir>$(xrLibDir)</OutDir>
6363
<IntDir>$(xrIntDir)$(ProjectName)\</IntDir>
6464
<LinkIncremental>false</LinkIncremental>
6565
</PropertyGroup>
@@ -137,7 +137,8 @@
137137
<WholeProgramOptimization>true</WholeProgramOptimization>
138138
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GLBINDING_STATIC;STRINGS_BY_GL;WIN32;UNICODE;_UNICODE;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
139139
<ObjectFileName>$(IntDir)</ObjectFileName>
140-
<DebugInformationFormat></DebugInformationFormat>
140+
<DebugInformationFormat>
141+
</DebugInformationFormat>
141142
</ClCompile>
142143
<ResourceCompile>
143144
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GLBINDING_STATIC;STRINGS_BY_GL;WIN32;UNICODE;_UNICODE;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;NDEBUG;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -494,32 +495,32 @@
494495
<ClInclude Include="glbinding\source\glbinding\source\Meta_Maps.h" />
495496
<ClInclude Include="glbinding\source\glbinding\source\RingBuffer.h" />
496497
<ClInclude Include="glbinding\source\glbinding\source\RingBuffer.hpp" />
497-
<ClCompile Include="glbinding\source\glbinding\source\callbacks.cpp" />
498-
<ClCompile Include="glbinding\source\glbinding\source\AbstractFunction.cpp" />
499-
<ClCompile Include="glbinding\source\glbinding\source\AbstractValue.cpp" />
500-
<ClCompile Include="glbinding\source\glbinding\source\Binding.cpp" />
501-
<ClCompile Include="glbinding\source\glbinding\source\Binding_objects.cpp" />
502-
<ClCompile Include="glbinding\source\glbinding\source\ProcAddress.cpp" />
503-
<ClCompile Include="glbinding\source\glbinding\source\ContextHandle.cpp" />
504-
<ClCompile Include="glbinding\source\glbinding\source\ContextInfo.cpp" />
505-
<ClCompile Include="glbinding\source\glbinding\source\Value.cpp" />
506-
<ClCompile Include="glbinding\source\glbinding\source\Version.cpp" />
507-
<ClCompile Include="glbinding\source\glbinding\source\Version_ValidVersions.cpp" />
508-
<ClCompile Include="glbinding\source\glbinding\source\Meta.cpp" />
509-
<ClCompile Include="glbinding\source\glbinding\source\Meta_BitfieldsByString.cpp" />
510-
<ClCompile Include="glbinding\source\glbinding\source\Meta_BooleansByString.cpp" />
511-
<ClCompile Include="glbinding\source\glbinding\source\Meta_EnumsByString.cpp" />
512-
<ClCompile Include="glbinding\source\glbinding\source\Meta_ExtensionsByFunctionString.cpp" />
513-
<ClCompile Include="glbinding\source\glbinding\source\Meta_ExtensionsByString.cpp" />
514-
<ClCompile Include="glbinding\source\glbinding\source\Meta_FunctionStringsByExtension.cpp" />
515-
<ClCompile Include="glbinding\source\glbinding\source\Meta_ReqVersionsByExtension.cpp" />
516-
<ClCompile Include="glbinding\source\glbinding\source\Meta_StringsByBitfield.cpp" />
517-
<ClCompile Include="glbinding\source\glbinding\source\Meta_StringsByBoolean.cpp" />
518-
<ClCompile Include="glbinding\source\glbinding\source\Meta_StringsByEnum.cpp" />
519-
<ClCompile Include="glbinding\source\glbinding\source\Meta_StringsByExtension.cpp" />
520-
<ClCompile Include="glbinding\source\glbinding\source\logging.cpp" />
521-
<ClCompile Include="glbinding\source\glbinding\source\gl\functions.cpp" />
522-
<ClCompile Include="glbinding\source\glbinding\source\gl\types.cpp" />
498+
<ClCompile Include="glbinding\source\glbinding\source\callbacks.cpp" />
499+
<ClCompile Include="glbinding\source\glbinding\source\AbstractFunction.cpp" />
500+
<ClCompile Include="glbinding\source\glbinding\source\AbstractValue.cpp" />
501+
<ClCompile Include="glbinding\source\glbinding\source\Binding.cpp" />
502+
<ClCompile Include="glbinding\source\glbinding\source\Binding_objects.cpp" />
503+
<ClCompile Include="glbinding\source\glbinding\source\ProcAddress.cpp" />
504+
<ClCompile Include="glbinding\source\glbinding\source\ContextHandle.cpp" />
505+
<ClCompile Include="glbinding\source\glbinding\source\ContextInfo.cpp" />
506+
<ClCompile Include="glbinding\source\glbinding\source\Value.cpp" />
507+
<ClCompile Include="glbinding\source\glbinding\source\Version.cpp" />
508+
<ClCompile Include="glbinding\source\glbinding\source\Version_ValidVersions.cpp" />
509+
<ClCompile Include="glbinding\source\glbinding\source\Meta.cpp" />
510+
<ClCompile Include="glbinding\source\glbinding\source\Meta_BitfieldsByString.cpp" />
511+
<ClCompile Include="glbinding\source\glbinding\source\Meta_BooleansByString.cpp" />
512+
<ClCompile Include="glbinding\source\glbinding\source\Meta_EnumsByString.cpp" />
513+
<ClCompile Include="glbinding\source\glbinding\source\Meta_ExtensionsByFunctionString.cpp" />
514+
<ClCompile Include="glbinding\source\glbinding\source\Meta_ExtensionsByString.cpp" />
515+
<ClCompile Include="glbinding\source\glbinding\source\Meta_FunctionStringsByExtension.cpp" />
516+
<ClCompile Include="glbinding\source\glbinding\source\Meta_ReqVersionsByExtension.cpp" />
517+
<ClCompile Include="glbinding\source\glbinding\source\Meta_StringsByBitfield.cpp" />
518+
<ClCompile Include="glbinding\source\glbinding\source\Meta_StringsByBoolean.cpp" />
519+
<ClCompile Include="glbinding\source\glbinding\source\Meta_StringsByEnum.cpp" />
520+
<ClCompile Include="glbinding\source\glbinding\source\Meta_StringsByExtension.cpp" />
521+
<ClCompile Include="glbinding\source\glbinding\source\logging.cpp" />
522+
<ClCompile Include="glbinding\source\glbinding\source\gl\functions.cpp" />
523+
<ClCompile Include="glbinding\source\glbinding\source\gl\types.cpp" />
523524
</ItemGroup>
524525
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
525526
<ImportGroup Label="ExtensionTargets">

‎src/Externals/glbinding.vcxproj.filters‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<ClCompile Include="glbinding\source\glbinding\source\callbacks.cpp">
@@ -1096,9 +1096,6 @@
10961096
<Filter>Source Files</Filter>
10971097
</ClInclude>
10981098
</ItemGroup>
1099-
<ItemGroup>
1100-
<CustomBuild Include="glbinding\source\glbinding\CMakeLists.txt" />
1101-
</ItemGroup>
11021099
<ItemGroup>
11031100
<Filter Include="Source Files">
11041101
<UniqueIdentifier>{63D0BCF8-46D3-3493-A2B8-38DF82F5AC5A}</UniqueIdentifier>
@@ -1113,4 +1110,4 @@
11131110
<UniqueIdentifier>{E0789C8F-9921-38D7-ABF6-103A579BC1E3}</UniqueIdentifier>
11141111
</Filter>
11151112
</ItemGroup>
1116-
</Project>
1113+
</Project>

‎src/Layers/xrRender/Light_DB.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ void CLight_DB::add_light (light* L)
183183
}
184184
#endif
185185

186-
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
186+
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
187187
void CLight_DB::add_light (light* L)
188188
{
189189
if (Device.dwFrame==L->frame_render) return;
@@ -192,7 +192,7 @@ void CLight_DB::add_light (light* L)
192192
if (L->flags.bStatic && !ps_r2_ls_flags.test(R2FLAG_R1LIGHTS)) return;
193193
L->Export (package);
194194
}
195-
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
195+
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
196196

197197
void CLight_DB::Update ()
198198
{

‎src/Layers/xrRender/Light_Package.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ void light_Package::clear ()
88
v_shadowed.clear ();
99
}
1010

11-
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
11+
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
1212
IC bool pred_light_cmp (light* _1, light* _2)
1313
{
1414
if (_1->vis.pending)
@@ -28,4 +28,4 @@ void light_Package::sort ()
2828
std::stable_sort (v_spot.begin(), v_spot.end(), pred_light_cmp);
2929
std::stable_sort (v_shadowed.begin(),v_shadowed.end(), pred_light_cmp);
3030
}
31-
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
31+
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)

‎src/Layers/xrRender/PSLibrary.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void CPSLibrary::OnDestroy()
3636
for (PS::PEDIt e_it = m_PEDs.begin(); e_it!=m_PEDs.end(); e_it++)
3737
(*e_it)->DestroyShader();
3838

39-
for (e_it = m_PEDs.begin(); e_it!=m_PEDs.end(); e_it++)
39+
for (PS::PEDIt e_it = m_PEDs.begin(); e_it!=m_PEDs.end(); e_it++)
4040
xr_delete (*e_it);
4141
m_PEDs.clear ();
4242

‎src/Layers/xrRender/light.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ light::light (void) : SpatialBase(g_SpatialSpace)
2727

2828
frame_render = 0;
2929

30-
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
30+
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
3131
ZeroMemory (omnipart,sizeof(omnipart));
3232
s_spot = NULL;
3333
s_point = NULL;
@@ -36,24 +36,24 @@ light::light (void) : SpatialBase(g_SpatialSpace)
3636
vis.query_order = 0;
3737
vis.visible = true;
3838
vis.pending = false;
39-
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
39+
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
4040
}
4141

4242
light::~light ()
4343
{
44-
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
44+
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
4545
for (int f=0; f<6; f++) xr_delete(omnipart[f]);
46-
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
46+
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
4747
set_active (false);
4848

4949
// remove from Lights_LastFrame
50-
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
50+
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
5151
for (u32 it=0; it<RImplementation.Lights_LastFrame.size(); it++)
5252
if (this==RImplementation.Lights_LastFrame[it]) RImplementation.Lights_LastFrame[it]=0;
53-
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
53+
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
5454
}
5555

56-
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
56+
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
5757
void light::set_texture (LPCSTR name)
5858
{
5959
if ((0==name) || (0==name[0]))
@@ -72,9 +72,9 @@ void light::set_texture (LPCSTR name)
7272
//strconcat(sizeof(temp),temp,"_nomsaa",name);
7373
s_spot.create (RImplementation.Target->b_accum_spot,temp,name);
7474

75-
#if (RENDER!=R_R3) && (RENDER!=R_R4)
75+
#if (RENDER!=R_R3) && (RENDER!=R_R4) && (RENDER!=R_GL)
7676
s_volumetric.create ("accum_volumetric", name);
77-
#else // (RENDER!=R_R3) && (RENDER!=R_R4)
77+
#else // (RENDER!=R_R3) && (RENDER!=R_R4) && (RENDER!=R_GL)
7878
s_volumetric.create ("accum_volumetric_nomsaa", name);
7979
if( RImplementation.o.dx10_msaa )
8080
{
@@ -89,7 +89,7 @@ void light::set_texture (LPCSTR name)
8989
s_volumetric_msaa[i].create (RImplementation.Target->b_accum_volumetric_msaa[i],strconcat(sizeof(temp),temp,"r2\\accum_volumetric_",name),name);
9090
}
9191
}
92-
#endif // (RENDER!=R_R3) || (RENDER!=R_R4)
92+
#endif // (RENDER!=R_R3) || (RENDER!=R_R4) || (RENDER!=R_GL)
9393
}
9494
#endif
9595

@@ -215,7 +215,7 @@ Fvector light::spatial_sector_point ()
215215
}
216216

217217
//////////////////////////////////////////////////////////////////////////
218-
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
218+
#if (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
219219
// Xforms
220220
void light::xform_calc ()
221221
{
@@ -311,7 +311,7 @@ void light::Export (light_Package& package)
311311
L->s_point = s_point ;
312312

313313
// Holger - do we need to export msaa stuff as well ?
314-
#if (RENDER==R_R3) || (RENDER==R_R4)
314+
#if (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
315315
if( RImplementation.o.dx10_msaa )
316316
{
317317
int bound = 1;
@@ -326,7 +326,7 @@ void light::Export (light_Package& package)
326326
//L->s_volumetric_msaa[i] = s_volumetric_msaa[i];
327327
}
328328
}
329-
#endif // (RENDER==R_R3) || (RENDER==R_R4)
329+
#endif // (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
330330

331331
// Igor: add volumetric support
332332
L->set_volumetric(flags.bVolumetric);
@@ -358,7 +358,7 @@ void light::set_attenuation_params (float a0, float a1, float a2, float fo)
358358
falloff = fo;
359359
}
360360

361-
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4)
361+
#endif // (RENDER==R_R2) || (RENDER==R_R3) || (RENDER==R_R4) || (RENDER==R_GL)
362362

363363
extern float r_ssaGLOD_start, r_ssaGLOD_end;
364364
extern float ps_r2_slight_fade;

‎src/Layers/xrRenderGL/glHW.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ void free_vid_mode_list()
285285
GlobalEnv.vid_mode_token = NULL;
286286
}
287287

288-
void fill_vid_mode_list()
288+
void fill_vid_mode_list(CHW* _hw)
289289
{
290290
if (GlobalEnv.vid_mode_token != NULL) return;
291291
xr_vector<LPCSTR> _tmp;

0 commit comments

Comments
 (0)