No go here (Re: [D3D] Added native and emulated S3TC support (take 2))

[Christian Costa]

Andreas Mohr wrote:

>Hi,
>
>On Sat, Jul 31, 2004 at 01:16:45PM +0200, Lionel Ulmer wrote:
>  
>
>>Fixed in the attached patch... At least we know now that Alexandre finally
>>installed some OpenGL stuff on his development box :-)
>>    
>>
>Works. :)
>
>Oh, wait... just when I *wanted* to say it works, I switched back to the
>console compiling Wine, and:
>
>make[2]: Entering directory `/usr/src/apps/CVS/wine/dlls/ddraw'
>gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__  -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith  -g -O2 -o main.o main.c
>main.c:123: error: parse error before "fetch_2d_texel_rgba_dxt1"
>main.c:123: warning: type defaults to `int' in declaration of `fetch_2d_texel_rgba_dxt1'
>main.c:123: warning: data definition has no type or storage class
>main.c:124: error: parse error before "fetch_2d_texel_rgba_dxt3"
>main.c:124: warning: type defaults to `int' in declaration of `fetch_2d_texel_rgba_dxt3'
>main.c:124: warning: data definition has no type or storage class
>main.c:123: error: parse error before "fetch_2d_texel_rgba_dxt1"
>main.c:123: warning: type defaults to `int' in declaration of `fetch_2d_texel_rgba_dxt1'
>main.c:123: warning: data definition has no type or storage class
>main.c:124: error: parse error before "fetch_2d_texel_rgba_dxt3"
>main.c:124: warning: type defaults to `int' in declaration of `fetch_2d_texel_rgba_dxt3'
>main.c:124: warning: data definition has no type or storage class
>main.c:125: error: parse error before "fetch_2d_texel_rgba_dxt5"
>main.c:125: warning: type defaults to `int' in declaration of `fetch_2d_texel_rgba_dxt5'
>main.c:125: warning: data definition has no type or storage class
>main.c: In function `DDRAW_bind_to_s3tc':
>main.c:148: warning: assignment makes integer from pointer without a cast
>main.c:148: warning: comparison between pointer and integer
>main.c:149: warning: assignment makes integer from pointer without a cast
>main.c:149: warning: comparison between pointer and integer
>main.c:150: warning: assignment makes integer from pointer without a cast
>main.c:150: warning: comparison between pointer and integer
>make[2]: *** [main.o] Error 1
>make[2]: Leaving directory `/usr/src/apps/CVS/wine/dlls/ddraw'
>make[1]: *** [ddraw] Error 2
>make[1]: Leaving directory `/usr/src/apps/CVS/wine/dlls'
>make: *** [dlls] Error 2
>
>Take (more ;) care,
>
>Andreas
>
>
>  
>
Does this help?

Changelog:
Moved libtxc_dxt definitions into ddraw headers.


-------------- next part --------------
Index: d3d_private.h
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/d3d_private.h,v
retrieving revision 1.39
diff -u -r1.39 d3d_private.h
--- d3d_private.h	30 Jul 2004 18:54:32 -0000	1.39
+++ d3d_private.h	31 Jul 2004 12:40:33 -0000
@@ -276,12 +276,4 @@
 
 extern const float id_mat[16];
 
-typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT1)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel);
-typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT3)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel);
-typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT5)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel);
-
-extern FUNC_FETCH_2D_TEXEL_RGBA_DXT1 fetch_2d_texel_rgba_dxt1;
-extern FUNC_FETCH_2D_TEXEL_RGBA_DXT3 fetch_2d_texel_rgba_dxt3;
-extern FUNC_FETCH_2D_TEXEL_RGBA_DXT5 fetch_2d_texel_rgba_dxt5;
-
 #endif /* __GRAPHICS_WINE_D3D_PRIVATE_H */
Index: ddraw_private.h
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/ddraw_private.h,v
retrieving revision 1.43
diff -u -r1.43 ddraw_private.h
--- ddraw_private.h	30 Jul 2004 18:54:32 -0000	1.43
+++ ddraw_private.h	31 Jul 2004 12:40:34 -0000
@@ -381,6 +381,14 @@
 extern BOOL opengl_initialized;
 extern BOOL s3tc_initialized;
 
+typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT1)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel);
+typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT3)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel);
+typedef void (*FUNC_FETCH_2D_TEXEL_RGBA_DXT5)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel);
+
+extern FUNC_FETCH_2D_TEXEL_RGBA_DXT1 fetch_2d_texel_rgba_dxt1;
+extern FUNC_FETCH_2D_TEXEL_RGBA_DXT3 fetch_2d_texel_rgba_dxt3;
+extern FUNC_FETCH_2D_TEXEL_RGBA_DXT5 fetch_2d_texel_rgba_dxt5;
+
 /******************************************************************************
  * Structure conversion (for thunks)
  */