xrRenderPC_GL: Fix blender implementation.

OpenXRay · Nov 25, 2015 · 009378b · 009378b
1 parent bdfdf1a
commit 009378b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/Layers/xrRender/Blender_Editor_Selection.cpp b/src/Layers/xrRender/Blender_Editor_Selection.cpp
@@ -33,7 +33,7 @@ void	CBlender_Editor_Selection::Load	( IReader& fs, u16 version	)
 void	CBlender_Editor_Selection::Compile	(CBlender_Compile& C)
 {
 	IBlender::Compile		(C);	
-#if !defined(USE_DX10) && !defined(USE_DX11)
+#if !defined(USE_DX10) && !defined(USE_DX11) && !defined(USE_OGL)
 	if (C.bEditor)	{
 		C.PassBegin		();
 		{

diff --git a/src/Layers/xrRender/Blender_Editor_Wire.cpp b/src/Layers/xrRender/Blender_Editor_Wire.cpp
@@ -33,7 +33,7 @@ void	CBlender_Editor_Wire::Load	( IReader& fs, u16 version	)
 void CBlender_Editor_Wire::Compile	(CBlender_Compile& C)
 {
 	IBlender::Compile		(C);
-#if !defined(USE_DX10) && !defined(USE_DX11)
+#if !defined(USE_DX10) && !defined(USE_DX11) && !defined(USE_OGL)
 	if (C.bEditor)	
 	{
 		C.PassBegin		();

diff --git a/src/Layers/xrRender/Blender_Recorder_R2.cpp b/src/Layers/xrRender/Blender_Recorder_R2.cpp
@@ -26,7 +26,7 @@ void	CBlender_Compile::r_Pass		(LPCSTR _vs, LPCSTR _ps, bool bFog, BOOL bZtest,
     SVS* vs = RImplementation.Resources->_CreateVS(_vs);
 	dest.ps					= ps;
 	dest.vs					= vs;
-#if defined(USE_DX10) || defined(USE_DX11)
+#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
 	SGS* gs					= RImplementation.Resources->_CreateGS			("null");
 	dest.gs					= gs;
 #	ifdef USE_DX11
@@ -66,7 +66,7 @@ void CBlender_Compile::r_ColorWriteEnable( bool cR, bool cG, bool cB, bool cA)
 	RS.SetRS( D3DRS_COLORWRITEENABLE3, Mask);
 }
 
-#if !defined(USE_DX10) && !defined(USE_DX11)
+#if !defined(USE_DX10) && !defined(USE_DX11) && !defined(USE_OGL)
 u32		CBlender_Compile::i_Sampler		(LPCSTR _name)
 {
 	//

diff --git a/src/Layers/xrRender/Blender_Screen_SET.cpp b/src/Layers/xrRender/Blender_Screen_SET.cpp
@@ -93,7 +93,7 @@ void	CBlender_Screen_SET::Load	( IReader& fs, u16 version)
 	}
 }
 
-#if defined(USE_DX10) || defined(USE_DX11)
+#if defined(USE_DX10) || defined(USE_DX11) || defined(USE_OGL)
 
 void	CBlender_Screen_SET::Compile	(CBlender_Compile& C)
 {

diff --git a/src/Layers/xrRender/blenders/Blender_Recorder.cpp b/src/Layers/xrRender/blenders/Blender_Recorder.cpp
@@ -288,7 +288,7 @@ void	CBlender_Compile::StageSET_Alpha	(u32 a1, u32 op, u32 a2)
 {
 	RS.SetAlpha	(Stage(),a1,op,a2);
 }
-#if !defined(USE_DX10) && !defined(USE_DX11)
+#if !defined(USE_DX10) && !defined(USE_DX11) && !defined(USE_OGL)
 void	CBlender_Compile::StageSET_TMC		(LPCSTR T, LPCSTR M, LPCSTR C, int UVW_channel)
 {
 	Stage_Texture		(T);