Stefan Dösinger : wined3d: Remove some #ifdefs.
Alexandre Julliard
julliard at winehq.org
Tue Jul 22 09:35:33 CDT 2008
Module: wine
Branch: master
Commit: 212ff6ff57c5de76bf1881b821a180bff47a5938
URL: http://source.winehq.org/git/wine.git/?a=commit;h=212ff6ff57c5de76bf1881b821a180bff47a5938
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Sat Jul 12 11:26:36 2008 -0500
wined3d: Remove some #ifdefs.
---
dlls/wined3d/utils.c | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 40c154d..245c2c2 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1545,24 +1545,12 @@ static void get_src_and_opr(DWORD arg, BOOL is_alpha, GLenum* source, GLenum* op
/* Set texture operations up - The following avoids lots of ifdefs in this routine!*/
#if defined (GL_VERSION_1_3)
# define useext(A) A
-# define combine_ext 1
#elif defined (GL_EXT_texture_env_combine)
# define useext(A) A##_EXT
-# define combine_ext 1
#elif defined (GL_ARB_texture_env_combine)
# define useext(A) A##_ARB
-# define combine_ext 1
-#else
-# undef combine_ext
#endif
-#if !defined(combine_ext)
-void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)
-{
- FIXME("Requires opengl combine extensions to work\n");
- return;
-}
-#else
/* Setup the texture operations texture stage states */
void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP op, DWORD arg1, DWORD arg2, DWORD arg3)
{
@@ -2623,7 +2611,6 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, WINED3DTEXTUREOP
FIXME("Unhandled texture operation %s\n", debug_d3dtop(op));
#undef GLINFO_LOCATION
}
-#endif
/* Setup this textures matrix according to the texture flags*/
void set_texture_matrix(const float *smat, DWORD flags, BOOL calculatedCoords, BOOL transformed, DWORD coordtype)
More information about the wine-cvs
mailing list