Blender_Recorder_GL: Consistently use DX identifiers.

OpenXRay · Mar 6, 2016 · e82c4b0 · e82c4b0
1 parent 11d9066
commit e82c4b0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/src/Layers/xrRender/xrD3DDefs.h b/src/Layers/xrRender/xrD3DDefs.h
@@ -15,14 +15,16 @@ typedef enum D3D_CLEAR_FLAG {
 	D3D_CLEAR_STENCIL = 0x2L
 } D3D_CLEAR_FLAG;
 
-#define	D3D_COMPARISON_NEVER			GL_NEVER
-#define	D3D_COMPARISON_LESS				GL_LESS
-#define	D3D_COMPARISON_EQUAL			GL_EQUAL
-#define	D3D_COMPARISON_LESS_EQUAL		GL_LEQUAL
-#define	D3D_COMPARISON_GREATER			GL_GREATER
-#define	D3D_COMPARISON_NOT_EQUAL		GL_NEQUAL
-#define	D3D_COMPARISON_GREATER_EQUAL	GL_GEQUAL
-#define	D3D_COMPARISON_ALWAYS			GL_ALWAYS
+typedef enum D3D_COMPARISON_FUNC { 
+  D3D_COMPARISON_NEVER          = GL_NEVER,
+  D3D_COMPARISON_LESS           = GL_LESS,
+  D3D_COMPARISON_EQUAL          = GL_EQUAL,
+  D3D_COMPARISON_LESS_EQUAL     = GL_LEQUAL,
+  D3D_COMPARISON_GREATER        = GL_GREATER,
+  D3D_COMPARISON_NOT_EQUAL      = GL_NOTEQUAL,
+  D3D_COMPARISON_GREATER_EQUAL  = GL_GEQUAL,
+  D3D_COMPARISON_ALWAYS         = GL_ALWAYS
+} D3D_COMPARISON_FUNC;
 
 #define DX10_ONLY(expr)			do {} while (0)
 

diff --git a/src/Layers/xrRenderGL/Blender_Recorder_GL.cpp b/src/Layers/xrRenderGL/Blender_Recorder_GL.cpp
@@ -32,8 +32,8 @@ void CBlender_Compile::r_CullMode(D3DCULL Mode)
 
 void	CBlender_Compile::i_Comparison(u32 s, u32 func)
 {
-	RS.SetSAMP(s, (u32)GL_TEXTURE_COMPARE_MODE, (u32)GL_COMPARE_REF_TO_TEXTURE);
-	RS.SetSAMP(s, (u32)GL_TEXTURE_COMPARE_FUNC, func);
+	RS.SetSAMP(s, XRDX10SAMP_COMPARISONFILTER, TRUE);
+	RS.SetSAMP(s, XRDX10SAMP_COMPARISONFUNC, func);
 }
 
 void	CBlender_Compile::r_Sampler_cmp(LPCSTR name, LPCSTR texture, bool b_ps1x_ProjectiveDivide)

diff --git a/src/Layers/xrRenderGL/glState.cpp b/src/Layers/xrRenderGL/glState.cpp
@@ -254,8 +254,7 @@ void glState::UpdateSamplerState(u32 stage, u32 name, u32 value)
 			CHK_GL(glSamplerParameteri(m_samplerArray[stage], GL_TEXTURE_COMPARE_FUNC, value));
 			break;
 		default:
-			// Assume this is an OpenGL sampler parameter
-			CHK_GL(glSamplerParameteri(m_samplerArray[stage], (GLenum)name, value));
+			VERIFY(!"Sampler state not implemented");
 			break;
 	}
 }
diff --git a/src/Layers/xrRenderPC_GL/glResourceManager_Scripting.cpp b/src/Layers/xrRenderPC_GL/glResourceManager_Scripting.cpp
@@ -54,7 +54,7 @@ class	adopt_sampler
 	adopt_sampler&			_fmag_none		()						{ if (C) C->i_Filter_Mag(stage,D3DTEXF_NONE);										return *this;	}
 	adopt_sampler&			_fmag_point		()						{ if (C) C->i_Filter_Mag(stage,D3DTEXF_POINT);										return *this;	}
 	adopt_sampler&			_fmag_linear	()						{ if (C) C->i_Filter_Mag(stage,D3DTEXF_LINEAR);										return *this;	}
-	adopt_sampler&			_comp_less		()						{ if (C) C->i_Comparison(stage,D3DCMP_LESS);										return *this;	}
+	adopt_sampler&			_comp_less		()						{ if (C) C->i_Comparison(stage,D3D_COMPARISON_LESS_EQUAL);							return *this;	}
 };	
 
 #pragma warning( push )