Skip to content

Commit cdd6c53

Browse files
author
nitrocaster
committed
Merge xrCPU_Pipe into xrCore, delete unused sources.
1 parent d5bc9ce commit cdd6c53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+817
-4081
lines changed

‎src/Layers/xrRender/FSkinned.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#pragma warning(default:4995)
77

88
#include "xrCore/FMesh.hpp"
9-
#include "xrCPU_Pipe/xrCPU_Pipe.h"
109
#include "FSkinned.h"
1110
#include "SkeletonX.h"
1211
#include "Layers/xrRenderDX10/dx10BufferUtils.h"

‎src/Layers/xrRender/ParticleEffect.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
#include "ParticleEffect.h"
44
#ifndef _EDITOR
55
#include <xmmintrin.h>
6-
#include "xrCPU_Pipe/ttapi.h"
7-
#pragma comment(lib,"xrCPU_Pipe.lib")
6+
#include "xrCore/Threading/ttapi.h"
87
#endif
98

109
using namespace PAPI;
@@ -539,7 +538,7 @@ void CParticleEffect::Render(float )
539538
FVF::LIT* pv_start = (FVF::LIT*)RCache.Vertex.Lock(p_cnt*4*4,geom->vb_stride,dwOffset);
540539
FVF::LIT* pv = pv_start;
541540

542-
u32 nWorkers = ttapi_GetWorkersCount();
541+
u32 nWorkers = ttapi_GetWorkerCount();
543542

544543
if ( p_cnt < nWorkers * 20 )
545544
nWorkers = 1;
@@ -564,7 +563,7 @@ void CParticleEffect::Render(float )
564563
ttapi_AddWorker( ParticleRenderStream , (LPVOID) &prsParams[i] );
565564
}
566565

567-
ttapi_RunAllWorkers();
566+
ttapi_Run();
568567

569568
dwCount = p_cnt<<2;
570569

‎src/Layers/xrRender/SkeletonX.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
#include "SkeletonX.h"
1818
#include "SkeletonCustom.h"
1919
#include "xrCore/FMesh.hpp"
20-
#include "xrCPU_Pipe/xrCPU_Pipe.h"
20+
#include "xrCore/Math/MathUtil.hpp"
21+
22+
using namespace XRay::Math;
2123

2224
shared_str s_bones_array_const;
2325

@@ -120,7 +122,7 @@ void CSkeletonX::_Render_soft (ref_geom& hGeom, u32 vCount, u32 iOffset, u32 pCo
120122
RDEVICE.Statistic->RenderDUMP_SKIN.Begin ();
121123
if (*Vertices1W)
122124
{
123-
PSGP.skin1W(
125+
Skin1W(
124126
Dest, // dest
125127
*Vertices1W, // source
126128
vCount, // count
@@ -129,7 +131,7 @@ void CSkeletonX::_Render_soft (ref_geom& hGeom, u32 vCount, u32 iOffset, u32 pCo
129131
}else
130132
if(*Vertices2W)
131133
{
132-
PSGP.skin2W(
134+
Skin2W(
133135
Dest, // dest
134136
*Vertices2W, // source
135137
vCount, // count
@@ -138,7 +140,7 @@ void CSkeletonX::_Render_soft (ref_geom& hGeom, u32 vCount, u32 iOffset, u32 pCo
138140
}else
139141
if(*Vertices3W)
140142
{
141-
PSGP.skin3W(
143+
Skin3W(
142144
Dest, // dest
143145
*Vertices3W, // source
144146
vCount, // count
@@ -147,7 +149,7 @@ void CSkeletonX::_Render_soft (ref_geom& hGeom, u32 vCount, u32 iOffset, u32 pCo
147149
}else
148150
if(*Vertices4W)
149151
{
150-
PSGP.skin4W(
152+
Skin4W(
151153
Dest, // dest
152154
*Vertices4W, // source
153155
vCount, // count

‎src/Layers/xrRenderPC_R1/FStaticRender.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "Layers/xrRender/dxWallMarkArray.h"
1616
#include "Layers/xrRender/dxUIShader.h"
1717
#ifndef _EDITOR
18-
#include "xrCPU_Pipe/ttapi.h"
18+
#include "xrCore/Threading/ttapi.h"
1919
#endif
2020

2121
using namespace R_dsgraph;

‎src/Layers/xrRenderPC_R1/LightProjector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "Layers/xrRender/LightTrack.h"
1010

1111
#ifndef _EDITOR
12-
#include "xrCPU_Pipe/ttapi.h"
12+
#include "xrCore/Threading/ttapi.h"
1313
#endif
1414

1515

‎src/Layers/xrRenderPC_R1/LightShadows.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
#include "Layers/xrRender/FBasicVisual.h"
66
#include "xrEngine/CustomHUD.h"
77
#ifndef _EDITOR
8-
#include "xrCPU_Pipe/ttapi.h"
8+
#include "xrCore/Threading/ttapi.h"
99
#endif
10+
#include "xrCore/Math/MathUtil.hpp"
11+
using namespace XRay::Math;
1012

1113
const float S_distance = 48;
1214
const float S_distance2 = S_distance*S_distance;
@@ -513,7 +515,7 @@ void CLightShadows::render ()
513515
*/
514516
int c0,c1,c2;
515517

516-
PSGP.PLC_calc3(c0,c1,c2,Device,v,TT.N,S.L,Le,S.C);
518+
PLCCalc(c0, c1, c2, Device.vCameraPosition, v, TT.N, S.L, Le, S.C);
517519

518520
if (c0>S_clip && c1>S_clip && c2>S_clip) continue;
519521
clamp (c0,S_ambient,255);

‎src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,6 @@
473473
<Project>{cc52e0b3-cc35-4934-9302-035b748f3f2c}</Project>
474474
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
475475
</ProjectReference>
476-
<ProjectReference Include="$(SolutionDir)xrCPU_Pipe\xrCPU_Pipe.vcxproj">
477-
<Project>{ca0649dd-d089-423a-981c-46b57a884eb9}</Project>
478-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
479-
</ProjectReference>
480476
<ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
481477
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
482478
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,10 +509,6 @@
509509
<Text Include="todo.txt" />
510510
</ItemGroup>
511511
<ItemGroup>
512-
<ProjectReference Include="$(SolutionDir)xrCPU_Pipe\xrCPU_Pipe.vcxproj">
513-
<Project>{ca0649dd-d089-423a-981c-46b57a884eb9}</Project>
514-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
515-
</ProjectReference>
516512
<ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
517513
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
518514
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,10 +560,6 @@
560560
<ClCompile Include="xrRender_R3.cpp" />
561561
</ItemGroup>
562562
<ItemGroup>
563-
<ProjectReference Include="$(SolutionDir)xrCPU_Pipe\xrCPU_Pipe.vcxproj">
564-
<Project>{ca0649dd-d089-423a-981c-46b57a884eb9}</Project>
565-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
566-
</ProjectReference>
567563
<ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
568564
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
569565
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>

‎src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,10 +579,6 @@
579579
<Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
580580
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
581581
</ProjectReference>
582-
<ProjectReference Include="$(SolutionDir)xrCPU_Pipe\xrCPU_Pipe.vcxproj">
583-
<Project>{ca0649dd-d089-423a-981c-46b57a884eb9}</Project>
584-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
585-
</ProjectReference>
586582
</ItemGroup>
587583
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
588584
<ImportGroup Label="ExtensionTargets">

‎src/engine.sln

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrCDB", "xrCDB\xrCDB.vcxpro
5858
EndProject
5959
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrCore", "xrCore\xrCore.vcxproj", "{A0F7D1FB-59A7-4717-A7E4-96F37E91998E}"
6060
EndProject
61-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrCPU_Pipe", "xrCPU_Pipe\xrCPU_Pipe.vcxproj", "{CA0649DD-D089-423A-981C-46B57A884EB9}"
62-
EndProject
6361
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrGame", "xrGame\xrGame.vcxproj", "{200652A6-043E-4634-8837-87983B3BD5E0}"
6462
ProjectSection(ProjectDependencies) = postProject
6563
{EFB76D6F-0092-439C-A783-C0BE10BD17C9} = {EFB76D6F-0092-439C-A783-C0BE10BD17C9}
@@ -510,27 +508,6 @@ Global
510508
{A0F7D1FB-59A7-4717-A7E4-96F37E91998E}.Release|Mixed Platforms.Build.0 = Release|Win32
511509
{A0F7D1FB-59A7-4717-A7E4-96F37E91998E}.Release|Win32.ActiveCfg = Release|Win32
512510
{A0F7D1FB-59A7-4717-A7E4-96F37E91998E}.Release|Win32.Build.0 = Release|Win32
513-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
514-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
515-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32
516-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
517-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
518-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Debug|Win32.ActiveCfg = Debug|Win32
519-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Debug|Win32.Build.0 = Debug|Win32
520-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Mixed_Dedicated|Mixed Platforms.ActiveCfg = Mixed|Win32
521-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Mixed_Dedicated|Mixed Platforms.Build.0 = Mixed|Win32
522-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Mixed_Dedicated|Win32.ActiveCfg = Mixed|Win32
523-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Mixed|Mixed Platforms.ActiveCfg = Mixed|Win32
524-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Mixed|Mixed Platforms.Build.0 = Mixed|Win32
525-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Mixed|Win32.ActiveCfg = Mixed|Win32
526-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Mixed|Win32.Build.0 = Mixed|Win32
527-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Release_Dedicated|Mixed Platforms.ActiveCfg = Release_SecuROM|Win32
528-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Release_Dedicated|Mixed Platforms.Build.0 = Release_SecuROM|Win32
529-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
530-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
531-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Release|Mixed Platforms.Build.0 = Release|Win32
532-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Release|Win32.ActiveCfg = Release|Win32
533-
{CA0649DD-D089-423A-981C-46B57A884EB9}.Release|Win32.Build.0 = Release|Win32
534511
{200652A6-043E-4634-8837-87983B3BD5E0}.Debug_Dedicated|Mixed Platforms.ActiveCfg = Debug|Win32
535512
{200652A6-043E-4634-8837-87983B3BD5E0}.Debug_Dedicated|Mixed Platforms.Build.0 = Debug|Win32
536513
{200652A6-043E-4634-8837-87983B3BD5E0}.Debug_Dedicated|Win32.ActiveCfg = Debug|Win32

‎src/utils/xrLC/xrLight.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "utils/xrLC_Light/xrLC_GlobalData.h"
77
#include "utils/xrLC_Light/xrLightVertex.h"
88

9-
#include "xrCore/xrSyncronize.h"
9+
#include "xrCore/Threading/xrSyncronize.h"
1010
#include "net.h"
1111

1212
#include "utils/xrLC_Light/lcnet_task_manager.h"

‎src/utils/xrLC/xrPhase_GI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "utils/xrLC_Light/xrLC_GlobalData.h"
66
#include "utils/xrLC_Light/xrface.h"
77

8-
#include "xrCore/xrSyncronize.h"
8+
#include "xrCore/Threading/xrSyncronize.h"
99
#include "xrCDB/xrCDB.h"
1010

1111

‎src/utils/xrLC_Light/mu_model_light_threads.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515

1616
#include "utils/xrLCUtil/xrThread.hpp"
17-
#include "xrCore/xrSyncronize.h"
17+
#include "xrCore/Threading/xrSyncronize.h"
1818

1919

2020

‎src/utils/xrLC_Light/net_cl_data_prepare.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "xrlc_globaldata.h"
1010
#include "mu_light_net.h"
1111
#include "utils/xrLCUtil/xrThread.hpp"
12-
#include "xrCore/xrSyncronize.h"
12+
#include "xrCore/Threading/xrSyncronize.h"
1313

1414
bool global_compile_data_initialized = false;
1515
bool base_global_compile_data_initialized = false;

‎src/xrCDB/ISpatial.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
//#pragma once
55
#include "xrCore/xrPool.h"
6-
76
#include "xr_collide_defs.h"
87

98
#pragma pack(push,4)

0 commit comments

Comments
 (0)