Merge xrCPU_Pipe into xrCore, delete unused sources.

Author: nitrocaster

src/Layers/xrRender/FSkinned.cpp

@@ -6,7 +6,6 @@
 #pragma warning(default:4995)
 
 #include "xrCore/FMesh.hpp"
-#include "xrCPU_Pipe/xrCPU_Pipe.h"
 #include "FSkinned.h"
 #include "SkeletonX.h"
 #include "Layers/xrRenderDX10/dx10BufferUtils.h"

src/Layers/xrRender/ParticleEffect.cpp

@@ -3,8 +3,7 @@
 #include "ParticleEffect.h"
 #ifndef _EDITOR
 #include <xmmintrin.h>
-#include "xrCPU_Pipe/ttapi.h"
-#pragma comment(lib,"xrCPU_Pipe.lib")
+#include "xrCore/Threading/ttapi.h"
 #endif
 
 using namespace PAPI;
@@ -539,7 +538,7 @@ void CParticleEffect::Render(float )
 			FVF::LIT* pv_start	= (FVF::LIT*)RCache.Vertex.Lock(p_cnt*4*4,geom->vb_stride,dwOffset);
 			FVF::LIT* pv		= pv_start;
 
-			u32 nWorkers = ttapi_GetWorkersCount();
+			u32 nWorkers = ttapi_GetWorkerCount();
 
 			if ( p_cnt < nWorkers * 20 )
 				nWorkers = 1;
@@ -564,7 +563,7 @@ void CParticleEffect::Render(float )
 				ttapi_AddWorker( ParticleRenderStream , (LPVOID) &prsParams[i] );
 			}
 
-			ttapi_RunAllWorkers();
+			ttapi_Run();
 
 			dwCount = p_cnt<<2;
 

src/Layers/xrRender/SkeletonX.cpp

@@ -17,7 +17,9 @@
 #include "SkeletonX.h"
 #include "SkeletonCustom.h"
 #include "xrCore/FMesh.hpp"
-#include "xrCPU_Pipe/xrCPU_Pipe.h"
+#include "xrCore/Math/MathUtil.hpp"
+
+using namespace XRay::Math;
 
 shared_str	s_bones_array_const;
 
@@ -120,7 +122,7 @@ void CSkeletonX::_Render_soft	(ref_geom& hGeom, u32 vCount, u32 iOffset, u32 pCo
 		RDEVICE.Statistic->RenderDUMP_SKIN.Begin	();
 		if (*Vertices1W)
 		{
-			PSGP.skin1W(
+			Skin1W(
 				Dest,										// dest
 				*Vertices1W,								// source
 				vCount,										// count
@@ -129,7 +131,7 @@ void CSkeletonX::_Render_soft	(ref_geom& hGeom, u32 vCount, u32 iOffset, u32 pCo
 		}else 
 		if(*Vertices2W)
 		{
-			PSGP.skin2W(
+			Skin2W(
 				Dest,										// dest
 				*Vertices2W,								// source
 				vCount,										// count
@@ -138,7 +140,7 @@ void CSkeletonX::_Render_soft	(ref_geom& hGeom, u32 vCount, u32 iOffset, u32 pCo
 		}else
 		if(*Vertices3W)
 		{
-			PSGP.skin3W(
+			Skin3W(
 				Dest,										// dest
 				*Vertices3W,								// source
 				vCount,										// count
@@ -147,7 +149,7 @@ void CSkeletonX::_Render_soft	(ref_geom& hGeom, u32 vCount, u32 iOffset, u32 pCo
 		}else
 		if(*Vertices4W)
 		{
-			PSGP.skin4W(
+			Skin4W(
 				Dest,										// dest
 				*Vertices4W,								// source
 				vCount,										// count

src/Layers/xrRenderPC_R1/FStaticRender.cpp

@@ -15,7 +15,7 @@
 #include "Layers/xrRender/dxWallMarkArray.h"
 #include "Layers/xrRender/dxUIShader.h"
 #ifndef _EDITOR
-#include "xrCPU_Pipe/ttapi.h"
+#include "xrCore/Threading/ttapi.h"
 #endif
 
 using	namespace		R_dsgraph;

src/Layers/xrRenderPC_R1/LightProjector.cpp

@@ -9,7 +9,7 @@
 #include "Layers/xrRender/LightTrack.h"
 
 #ifndef _EDITOR
-#include "xrCPU_Pipe/ttapi.h"
+#include "xrCore/Threading/ttapi.h"
 #endif
 
 

src/Layers/xrRenderPC_R1/LightShadows.cpp

@@ -5,8 +5,10 @@
 #include "Layers/xrRender/FBasicVisual.h"
 #include "xrEngine/CustomHUD.h"
 #ifndef _EDITOR
-#include "xrCPU_Pipe/ttapi.h"
+#include "xrCore/Threading/ttapi.h"
 #endif
+#include "xrCore/Math/MathUtil.hpp"
+using namespace XRay::Math;
 
 const	float		S_distance		= 48;
 const	float		S_distance2		= S_distance*S_distance;
@@ -513,7 +515,7 @@ void CLightShadows::render	()
 			*/
 			int	c0,c1,c2;
 
-			PSGP.PLC_calc3(c0,c1,c2,Device,v,TT.N,S.L,Le,S.C);
+			PLCCalc(c0, c1, c2, Device.vCameraPosition, v, TT.N, S.L, Le, S.C);
 
 			if (c0>S_clip && c1>S_clip && c2>S_clip)		continue;	
 			clamp		(c0,S_ambient,255);

src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj

@@ -473,10 +473,6 @@
       <Project>{cc52e0b3-cc35-4934-9302-035b748f3f2c}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)xrCPU_Pipe\xrCPU_Pipe.vcxproj">
-      <Project>{ca0649dd-d089-423a-981c-46b57a884eb9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
       <Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj

@@ -509,10 +509,6 @@
     <Text Include="todo.txt" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)xrCPU_Pipe\xrCPU_Pipe.vcxproj">
-      <Project>{ca0649dd-d089-423a-981c-46b57a884eb9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
       <Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj

@@ -560,10 +560,6 @@
     <ClCompile Include="xrRender_R3.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)xrCPU_Pipe\xrCPU_Pipe.vcxproj">
-      <Project>{ca0649dd-d089-423a-981c-46b57a884eb9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
     <ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
       <Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj

@@ -579,10 +579,6 @@
       <Project>{a0f7d1fb-59a7-4717-a7e4-96f37e91998e}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
-    <ProjectReference Include="$(SolutionDir)xrCPU_Pipe\xrCPU_Pipe.vcxproj">
-      <Project>{ca0649dd-d089-423a-981c-46b57a884eb9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">