[PATCH] WineD3D: Remove some #ifdefs=0A=

Stefan Doesinger stefan at codeweavers.com
Sat Jul 12 11:26:36 CDT 2008


=0A=
I don't think we'll ever have a situation where the definitions=0A=
aren't there at compile time since we have our own opengl header=0A=
now... At some point we may want to solve the=0A=
GL_EXT_texture_env_combine vs GL_ARB_texture_env_combine vs=0A=
opengl 1.3 selection using the extension management as well=0A=
---=0A=
 dlls/wined3d/utils.c |   13 -------------=0A=
 1 files changed, 0 insertions(+), 13 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c=0A=
index 40c154d..245c2c2 100644=0A=
--- a/dlls/wined3d/utils.c=0A=
+++ b/dlls/wined3d/utils.c=0A=
@@ -1545,24 +1545,12 @@ static void get_src_and_opr(DWORD arg, BOOL =
is_alpha, GLenum* source, GLenum* op=0A=
 /* Set texture operations up - The following avoids lots of ifdefs in =
this routine!*/=0A=
 #if defined (GL_VERSION_1_3)=0A=
 # define useext(A) A=0A=
-# define combine_ext 1=0A=
 #elif defined (GL_EXT_texture_env_combine)=0A=
 # define useext(A) A##_EXT=0A=
-# define combine_ext 1=0A=
 #elif defined (GL_ARB_texture_env_combine)=0A=
 # define useext(A) A##_ARB=0A=
-# define combine_ext 1=0A=
-#else=0A=
-# undef combine_ext=0A=
 #endif=0A=
 =0A=
-#if !defined(combine_ext)=0A=
-void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, =
WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)=0A=
-{=0A=
-        FIXME("Requires opengl combine extensions to work\n");=0A=
-        return;=0A=
-}=0A=
-#else=0A=
 /* Setup the texture operations texture stage states */=0A=
 void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, =
WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)=0A=
 {=0A=
@@ -2623,7 +2611,6 @@ void set_tex_op(IWineD3DDevice *iface, BOOL =
isAlpha, int Stage, WINED3DTEXTUREOP=0A=
         FIXME("Unhandled texture operation %s\n", debug_d3dtop(op));=0A=
 #undef GLINFO_LOCATION=0A=
 }=0A=
-#endif=0A=
 =0A=
 /* Setup this textures matrix according to the texture flags*/=0A=
 void set_texture_matrix(const float *smat, DWORD flags, BOOL =
calculatedCoords, BOOL transformed, DWORD coordtype)=0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_0005_01C8EB1E.DEACC530--




More information about the wine-patches mailing list