From bdfdf1ab3a18623a1b076222a857f450effd4186 Mon Sep 17 00:00:00 2001
From: Jules Blok <jules.blok@gmail.com>
Date: Thu, 26 Nov 2015 00:01:58 +0100
Subject: [PATCH] xrRenderDX10: Move dx10MinMaxSMBlender to xrRenderDX10.

---
 src/Layers/xrRender/r__screenshot.cpp         |  8 ++++++-
 .../dx10MinMaxSMBlender.cpp                   |  0
 .../dx10MinMaxSMBlender.h                     |  0
 .../xrRenderPC_GL/glMinMaxSMBlender.cpp       | 23 -------------------
 src/Layers/xrRenderPC_GL/glMinMaxSMBlender.h  | 15 ------------
 src/Layers/xrRenderPC_GL/gl_rendertarget.cpp  |  1 +
 src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj  |  5 ++--
 .../xrRenderPC_GL/xrRender_GL.vcxproj.filters | 13 +++++++----
 src/Layers/xrRenderPC_R3/r3_rendertarget.cpp  |  2 +-
 src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj  |  4 ++--
 .../xrRenderPC_R3/xrRender_R3.vcxproj.filters | 12 +++++-----
 11 files changed, 28 insertions(+), 55 deletions(-)
 rename src/Layers/{xrRenderPC_R3 => xrRenderDX10}/dx10MinMaxSMBlender.cpp (100%)
 rename src/Layers/{xrRenderPC_R3 => xrRenderDX10}/dx10MinMaxSMBlender.h (100%)
 delete mode 100644 src/Layers/xrRenderPC_GL/glMinMaxSMBlender.cpp
 delete mode 100644 src/Layers/xrRenderPC_GL/glMinMaxSMBlender.h

diff --git a/src/Layers/xrRender/r__screenshot.cpp b/src/Layers/xrRender/r__screenshot.cpp
index 6ed06bfcd0c..cb9b0e2df72 100644
--- a/src/Layers/xrRender/r__screenshot.cpp
+++ b/src/Layers/xrRender/r__screenshot.cpp
@@ -38,7 +38,13 @@ IC void MouseRayFromPoint	( Fvector& direction, int x, int y, Fmatrix& m_CamMat
 #define SM_FOR_SEND_WIDTH 640
 #define SM_FOR_SEND_HEIGHT 480
 
-#if defined(USE_DX10) || defined(USE_DX11)
+#if defined(USE_OGL)
+void CRender::ScreenshotImpl(ScreenshotMode mode, LPCSTR name, CMemoryWriter* memory_writer)
+{
+	// TODO: OGL: Implement screenshot feature.
+}
+
+#elif defined(USE_DX10) || defined(USE_DX11)
 void CRender::ScreenshotImpl	(ScreenshotMode mode, LPCSTR name, CMemoryWriter* memory_writer)
 {
 	ID3DResource		*pSrcTexture;
diff --git a/src/Layers/xrRenderPC_R3/dx10MinMaxSMBlender.cpp b/src/Layers/xrRenderDX10/dx10MinMaxSMBlender.cpp
similarity index 100%
rename from src/Layers/xrRenderPC_R3/dx10MinMaxSMBlender.cpp
rename to src/Layers/xrRenderDX10/dx10MinMaxSMBlender.cpp
diff --git a/src/Layers/xrRenderPC_R3/dx10MinMaxSMBlender.h b/src/Layers/xrRenderDX10/dx10MinMaxSMBlender.h
similarity index 100%
rename from src/Layers/xrRenderPC_R3/dx10MinMaxSMBlender.h
rename to src/Layers/xrRenderDX10/dx10MinMaxSMBlender.h
diff --git a/src/Layers/xrRenderPC_GL/glMinMaxSMBlender.cpp b/src/Layers/xrRenderPC_GL/glMinMaxSMBlender.cpp
deleted file mode 100644
index 8adb0b4b612..00000000000
--- a/src/Layers/xrRenderPC_GL/glMinMaxSMBlender.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "stdafx.h"
-#include "./dx10MinMaxSMBlender.h"
-
-void CBlender_createminmax::Compile(CBlender_Compile& C)
-{
-	IBlender::Compile	(C);
-
-	switch (C.iElement) 
-	{
-   case 0:
-		C.r_Pass	("stub_notransform_2uv", "create_minmax_sm", false,	FALSE,	FALSE, FALSE);
-		C.PassSET_ZB		(FALSE,FALSE,FALSE	);
-
-		C.r_dx10Texture		("s_smap",		r2_RT_smap_depth);
-
-		C.r_dx10Sampler		("smp_nofilter");
-
-		C.r_End				();
-
-		break;
-	}
-
-}
\ No newline at end of file
diff --git a/src/Layers/xrRenderPC_GL/glMinMaxSMBlender.h b/src/Layers/xrRenderPC_GL/glMinMaxSMBlender.h
deleted file mode 100644
index 0d1ef7aebd0..00000000000
--- a/src/Layers/xrRenderPC_GL/glMinMaxSMBlender.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef	dx10MinMaxSMBlender_included
-#define	dx10MinMaxSMBlender_included
-
-
-class CBlender_createminmax	: public IBlender  
-{
-public:
-	virtual		LPCSTR		getComment()	{ return "INTERNAL: DX10 minmax sm blender";	}
-	virtual		BOOL		canBeDetailed()	{ return FALSE;	}
-	virtual		BOOL		canBeLMAPped()	{ return FALSE;	}
-
-	virtual		void		Compile			(CBlender_Compile& C);
-};
-
-#endif
\ No newline at end of file
diff --git a/src/Layers/xrRenderPC_GL/gl_rendertarget.cpp b/src/Layers/xrRenderPC_GL/gl_rendertarget.cpp
index 500689eca5f..f430d75359f 100644
--- a/src/Layers/xrRenderPC_GL/gl_rendertarget.cpp
+++ b/src/Layers/xrRenderPC_GL/gl_rendertarget.cpp
@@ -10,6 +10,7 @@
 #include "blender_bloom_build.h"
 #include "blender_luminance.h"
 #include "blender_ssao.h"
+#include "Layers/xrRenderDX10/dx10MinMaxSMBlender.h"
 #include "Layers/xrRenderDX10/msaa/dx10MSAABlender.h"
 #include "Layers/xrRenderDX10/DX10 Rain/dx10RainBlender.h"
 
diff --git a/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj b/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj
index 05bb1789e20..9f961604b5f 100644
--- a/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj
+++ b/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj
@@ -205,6 +205,7 @@
   <ItemGroup>
     <ClCompile Include="..\xrRenderDX10\Blender_Recorder_R3.cpp" />
     <ClCompile Include="..\xrRenderDX10\DX10 Rain\dx10RainBlender.cpp" />
+    <ClCompile Include="..\xrRenderDX10\dx10MinMaxSMBlender.cpp" />
     <ClCompile Include="..\xrRenderGL\glHW.cpp" />
     <ClCompile Include="..\xrRenderGL\glBufferUtils.cpp" />
     <ClCompile Include="..\xrRenderGL\glDetailManager_VS.cpp" />
@@ -254,6 +255,7 @@
     <ClCompile Include="..\xrRender\Light_Render_Direct_ComputeXFS.cpp" />
     <ClCompile Include="..\xrRender\ModelPool.cpp" />
     <ClCompile Include="..\xrRender\R_DStreams.cpp" />
+    <ClCompile Include="..\xrRender\r__screenshot.cpp" />
     <ClCompile Include="..\xrRender\Shader.cpp" />
     <ClCompile Include="blender_bloom_build.cpp" />
     <ClCompile Include="blender_combine.cpp" />
@@ -268,7 +270,6 @@
     <ClCompile Include="blender_light_spot.cpp" />
     <ClCompile Include="blender_luminance.cpp" />
     <ClCompile Include="blender_ssao.cpp" />
-    <ClCompile Include="glMinMaxSMBlender.cpp" />
     <ClCompile Include="gl_loader.cpp" />
     <ClCompile Include="gl_rendertarget_accum_direct.cpp" />
     <ClCompile Include="gl_rendertarget_accum_omnipart_geom.cpp" />
@@ -404,6 +405,7 @@
     <ClInclude Include="..\..\Include\xrRender\UIShader.h" />
     <ClInclude Include="..\..\Include\xrRender\WallMarkArray.h" />
     <ClInclude Include="..\xrRenderDX10\DX10 Rain\dx10RainBlender.h" />
+    <ClInclude Include="..\xrRenderDX10\dx10MinMaxSMBlender.h" />
     <ClInclude Include="..\xrRenderGL\glBufferUtils.h" />
     <ClInclude Include="..\xrRenderGL\glR_Backend_Runtime.h" />
     <ClInclude Include="..\xrRenderGL\glr_constants_cache.h" />
@@ -517,7 +519,6 @@
     <ClInclude Include="..\xrRender\uber_deffer.h" />
     <ClInclude Include="..\xrRender\WallmarksEngine.h" />
     <ClInclude Include="..\xrRender\xrRender_console.h" />
-    <ClInclude Include="glMinMaxSMBlender.h" />
     <ClInclude Include="gl_rendertarget_wallmarks.h" />
     <ClInclude Include="r2_types.h" />
     <ClInclude Include="gl_rendertarget.h" />
diff --git a/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj.filters b/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj.filters
index 39e52d3ec62..16124eeb21a 100644
--- a/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj.filters
+++ b/src/Layers/xrRenderPC_GL/xrRender_GL.vcxproj.filters
@@ -660,12 +660,15 @@
     <ClCompile Include="gl_rendertarget_phase_ssao.cpp">
       <Filter>Core_Target</Filter>
     </ClCompile>
-    <ClCompile Include="glMinMaxSMBlender.cpp">
-      <Filter>Shading templates</Filter>
+    <ClCompile Include="..\xrRender\r__screenshot.cpp">
+      <Filter>Core</Filter>
     </ClCompile>
     <ClCompile Include="..\xrRender\Debug\dxPixEventWrapper.cpp">
       <Filter>Debug</Filter>
     </ClCompile>
+    <ClCompile Include="..\xrRenderDX10\dx10MinMaxSMBlender.cpp">
+      <Filter>Shading templates</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h">
@@ -1094,11 +1097,11 @@
     <ClInclude Include="gl_rendertarget_wallmarks.h">
       <Filter>Core_Target</Filter>
     </ClInclude>
-    <ClInclude Include="glMinMaxSMBlender.h">
-      <Filter>Shading templates</Filter>
-    </ClInclude>
     <ClInclude Include="..\xrRender\Debug\dxPixEventWrapper.h">
       <Filter>Debug</Filter>
     </ClInclude>
+    <ClInclude Include="..\xrRenderDX10\dx10MinMaxSMBlender.h">
+      <Filter>Shading templates</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Layers/xrRenderPC_R3/r3_rendertarget.cpp b/src/Layers/xrRenderPC_R3/r3_rendertarget.cpp
index 1cf7e7e908a..e3180932c24 100644
--- a/src/Layers/xrRenderPC_R3/r3_rendertarget.cpp
+++ b/src/Layers/xrRenderPC_R3/r3_rendertarget.cpp
@@ -10,7 +10,7 @@
 #include "blender_bloom_build.h"
 #include "blender_luminance.h"
 #include "blender_ssao.h"
-#include "dx10MinMaxSMBlender.h"
+#include "Layers/xrRenderDX10/dx10MinMaxSMBlender.h"
 #include "Layers/xrRenderDX10/msaa/dx10MSAABlender.h"
 #include "Layers/xrRenderDX10/DX10 Rain/dx10RainBlender.h"
 #include <D3DX10Tex.h>
diff --git a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj
index 5f03b484818..623a6d9149d 100644
--- a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj
+++ b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj
@@ -215,6 +215,7 @@
     <ClInclude Include="..\xrRenderDX10\dx10BufferUtils.h" />
     <ClInclude Include="..\xrRenderDX10\dx10ConstantBuffer.h" />
     <ClInclude Include="..\xrRenderDX10\dx10ConstantBuffer_impl.h" />
+    <ClInclude Include="..\xrRenderDX10\dx10MinMaxSMBlender.h" />
     <ClInclude Include="..\xrRenderDX10\dx10R_Backend_Runtime.h" />
     <ClInclude Include="..\xrRenderDX10\dx10r_constants_cache.h" />
     <ClInclude Include="..\xrRenderDX10\dx10StateUtils.h" />
@@ -343,7 +344,6 @@
     <ClInclude Include="blender_light_spot.h" />
     <ClInclude Include="blender_luminance.h" />
     <ClInclude Include="blender_ssao.h" />
-    <ClInclude Include="dx10MinMaxSMBlender.h" />
     <ClInclude Include="..\xrRender\light_gi.h" />
     <ClInclude Include="..\xrRender\Light_Render_Direct.h" />
     <ClInclude Include="..\xrRender\light_smapvis.h" />
@@ -370,6 +370,7 @@
     <ClCompile Include="..\xrRenderDX10\dx10ConstantBuffer.cpp" />
     <ClCompile Include="..\xrRenderDX10\dx10DetailManager_VS.cpp" />
     <ClCompile Include="..\xrRenderDX10\dx10HW.cpp" />
+    <ClCompile Include="..\xrRenderDX10\dx10MinMaxSMBlender.cpp" />
     <ClCompile Include="..\xrRenderDX10\dx10ResourceManager_Resources.cpp" />
     <ClCompile Include="..\xrRenderDX10\dx10ResourceManager_Scripting.cpp" />
     <ClCompile Include="..\xrRenderDX10\dx10r_constants.cpp" />
@@ -505,7 +506,6 @@
     <ClCompile Include="blender_light_spot.cpp" />
     <ClCompile Include="blender_luminance.cpp" />
     <ClCompile Include="blender_ssao.cpp" />
-    <ClCompile Include="dx10MinMaxSMBlender.cpp" />
     <ClCompile Include="..\xrRender\light_GI.cpp" />
     <ClCompile Include="..\xrRender\Light_Render_Direct.cpp" />
     <ClCompile Include="..\xrRender\Light_Render_Direct_ComputeXFS.cpp" />
diff --git a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj.filters b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj.filters
index 08024126de9..b1eef2124af 100644
--- a/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj.filters
+++ b/src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj.filters
@@ -309,9 +309,6 @@
     <ClInclude Include="blender_ssao.h">
       <Filter>Shading templates</Filter>
     </ClInclude>
-    <ClInclude Include="dx10MinMaxSMBlender.h">
-      <Filter>Shading templates</Filter>
-    </ClInclude>
     <ClInclude Include="..\xrRender\uber_deffer.h">
       <Filter>Shading templates</Filter>
     </ClInclude>
@@ -705,6 +702,9 @@
     <ClInclude Include="..\xrRender\D3DXRenderBase.h">
       <Filter>Core</Filter>
     </ClInclude>
+    <ClInclude Include="..\xrRenderDX10\dx10MinMaxSMBlender.h">
+      <Filter>Shading templates</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -887,9 +887,6 @@
     <ClCompile Include="blender_ssao.cpp">
       <Filter>Shading templates</Filter>
     </ClCompile>
-    <ClCompile Include="dx10MinMaxSMBlender.cpp">
-      <Filter>Shading templates</Filter>
-    </ClCompile>
     <ClCompile Include="..\xrRender\uber_deffer.cpp">
       <Filter>Shading templates</Filter>
     </ClCompile>
@@ -1283,5 +1280,8 @@
     <ClCompile Include="..\xrRender\RenderAllocator.cpp">
       <Filter>Core</Filter>
     </ClCompile>
+    <ClCompile Include="..\xrRenderDX10\dx10MinMaxSMBlender.cpp">
+      <Filter>Shading templates</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file