xrRenderPC_GL: Fix blender implementation.

CrossVR · CrossVR · commit 009378b6ecd4 · 2015-11-26T00:02:30.000+01:00
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);

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ void CBlender_Editor_Selection::Load ( IReader& fs, u16 version )`
`33`	`33`	`void CBlender_Editor_Selection::Compile (CBlender_Compile& C)`
`34`	`34`	`{`
`35`	`35`	`IBlender::Compile (C);`
`36`		`-#if !defined(USE_DX10) && !defined(USE_DX11)`
	`36`	`+#if !defined(USE_DX10) && !defined(USE_DX11) && !defined(USE_OGL)`
`37`	`37`	`if (C.bEditor) {`
`38`	`38`	`C.PassBegin ();`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void CBlender_Screen_SET::Load ( IReader& fs, u16 version)`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`-#if defined(USE_DX10) \|\| defined(USE_DX11)`
	`96`	`+#if defined(USE_DX10) \|\| defined(USE_DX11) \|\| defined(USE_OGL)`
`97`	`97`
`98`	`98`	`void CBlender_Screen_SET::Compile (CBlender_Compile& C)`
`99`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ void CBlender_Compile::StageSET_Alpha (u32 a1, u32 op, u32 a2)`
`288`	`288`	`{`
`289`	`289`	`RS.SetAlpha (Stage(),a1,op,a2);`
`290`	`290`	`}`
`291`		`-#if !defined(USE_DX10) && !defined(USE_DX11)`
	`291`	`+#if !defined(USE_DX10) && !defined(USE_DX11) && !defined(USE_OGL)`
`292`	`292`	`void CBlender_Compile::StageSET_TMC (LPCSTR T, LPCSTR M, LPCSTR C, int UVW_channel)`
`293`	`293`	`{`
`294`	`294`	`Stage_Texture (T);`