Implemented some texture operations using ATI_texture_env_combine3.

Fixed D3DTOP_LERP. Fixed some checkGLcall error messages.

Implemented some texture operations using ATI_texture_env_combine3.
5b75c15b · Christian Costa · Alexandre Julliard · 0a5f3934 · 5b75c15b · 5b75c15b
Commit 5b75c15b authored May 28, 2004 by Christian Costa Committed by Alexandre Julliard May 28, 2004
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 173 additions and 11 deletions

d3dcore_gl.h dlls/d3d8/d3dcore_gl.h +9 -0

utils.c dlls/d3d8/utils.c +164 -11

No files found.
--- a/dlls/d3d8/d3dcore_gl.h
+++ b/dlls/d3d8/d3dcore_gl.h
@@ -594,6 +594,15 @@ typedef void (APIENTRY * PGLFNGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, 
 #define GL_SIGNED_HILO8_NV                0x885F
 #define GL_FORCE_BLUE_TO_ONE_NV           0x8860
 #endif
+/* GL_ATI_texture_env_combine3 */
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+/* #define ONE */
+/* #define ZERO */
+#endif

 /*******
 * OpenGL Official Version 

--- a/dlls/d3d8/utils.c
+++ b/dlls/d3d8/utils.c