On Friday 17 December 2004 01:01, Bill Medland wrote: > (Jason?) > > Currently (after many weeks without concentrating) wine doesn't build; it > fails in dlls/wined3d/drawprim.c line 594 with GL_TEXTURE0 undefined. > > That's because of the definition of GL_MULTITEXCOORD... in > wined3d_private.h for the non-GL_VERSION_1_3 case. > > I can see a linguistically obvious fix that gets me thorugh the compilation > but since I haven't the faintest idea about d3d and GL I don't know if it > is correct, so I won't submit it.
Hi Bill, can you try with this patch ? Regards, Raphael
Index: wined3d_private.h
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/wined3d_private.h,v
retrieving revision 1.18
diff -u -r1.18 wined3d_private.h
--- wined3d_private.h 14 Dec 2004 11:54:27 -0000 1.18
+++ wined3d_private.h 17 Dec 2004 08:59:14 -0000
@@ -105,13 +105,13 @@
glActiveTextureARB(GL_TEXTURE0_ARB + textureNo); \
checkGLcall("glActiveTextureARB");
#define GLMULTITEXCOORD1F(a,b) \
- glMultiTexCoord1fARB(GL_TEXTURE0 + a, b);
+ glMultiTexCoord1fARB(GL_TEXTURE0_ARB + a, b);
#define GLMULTITEXCOORD2F(a,b,c) \
- glMultiTexCoord2fARB(GL_TEXTURE0 + a, b, c);
+ glMultiTexCoord2fARB(GL_TEXTURE0_ARB + a, b, c);
#define GLMULTITEXCOORD3F(a,b,c,d) \
- glMultiTexCoord3fARB(GL_TEXTURE0 + a, b, c, d);
+ glMultiTexCoord3fARB(GL_TEXTURE0_ARB + a, b, c, d);
#define GLMULTITEXCOORD4F(a,b,c,d,e) \
- glMultiTexCoord4fARB(GL_TEXTURE0 + a, b, c, d, e);
+ glMultiTexCoord4fARB(GL_TEXTURE0_ARB + a, b, c, d, e);
#endif
/* DirectX Device Limits */
pgpUXO6saG7wU.pgp
Description: PGP signature
