Wine 0.9.6 glext.h / DirectX Compiler Error

[Roland Kaser]

Hello all

I just tried to compile 0.9.6 on a SuSE 10 system and got the following
compiler error:

/usr/X11R6/include/GL/glext.h:1167:1: warning: this is the location of the
previous definition
device.c: In function ‘IDirect3DDevice8Impl_SetRenderState’:
device.c:3106: error: ‘GL_ARB_multisample’ undeclared (first use in this
function)
device.c:3106: error: (Each undeclared identifier is reported only once
device.c:3106: error: for each function it appears in.)
make[2]: *** [device.o] Fehler 1
make[2]: Leaving directory `/install/wine-0.9.6/dlls/d3d8'
make[1]: *** [d3d8] Fehler 2
make[1]: Leaving directory `/install/wine-0.9.6/dlls'
make: *** [dlls] Fehler 2

This is the first time i got such an error. 0.9,3, 0.9.4 and 0.9.5 compile
clean on that system. 

Roland Kaeser

[Vitaly Budovski]

Hi,

Could you try applying this patch. This may fix it.
Also, would you let me know what the value of GL_GLEXT_VERSION is
as defined in your glext.h header?


Vitaly


Roland Kaser wrote:
> Hello all
>
> I just tried to compile 0.9.6 on a SuSE 10 system and got the following
> compiler error:
>
> /usr/X11R6/include/GL/glext.h:1167:1: warning: this is the location of the
> previous definition
> device.c: In function ‘IDirect3DDevice8Impl_SetRenderState’:
> device.c:3106: error: ‘GL_ARB_multisample’ undeclared (first use in this
> function)
> device.c:3106: error: (Each undeclared identifier is reported only once
> device.c:3106: error: for each function it appears in.)
> make[2]: *** [device.o] Fehler 1
> make[2]: Leaving directory `/install/wine-0.9.6/dlls/d3d8'
> make[1]: *** [d3d8] Fehler 2
> make[1]: Leaving directory `/install/wine-0.9.6/dlls'
> make: *** [dlls] Fehler 2
>
> This is the first time i got such an error. 0.9,3, 0.9.4 and 0.9.5 compile
> clean on that system.
>
> Roland Kaeser

Index: d3dcore_gl.h
===================================================================
RCS file: /home/wine/wine/dlls/d3d8/d3dcore_gl.h,v
retrieving revision 1.20
diff -u -r1.20 d3dcore_gl.h
--- d3dcore_gl.h	19 Jan 2006 11:49:39 -0000	1.20
+++ d3dcore_gl.h	20 Jan 2006 09:15:16 -0000
@@ -599,6 +599,19 @@
 #define GL_COORD_REPLACE_ARB              0x8862
 #endif
 
+/* GL_ARB_multisample */
+#ifndef GL_ARB_multisample
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+#endif
+
 /*******
  * OpenGL Official Version 
  *  defines

Wine 0.9.6 glext.h / DirectX Compiler Error

[H. Verbeet]

On 20/01/06, Vitaly Budovski <vbudovsk(a)cs.rmit.edu.au> wrote:
> +/* GL_ARB_multisample */
> +#ifndef GL_ARB_multisample
> +#define GL_MULTISAMPLE_ARB                0x809D
> +#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
> +#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
> +#define GL_SAMPLE_COVERAGE_ARB            0x80A0
> +#define GL_SAMPLE_BUFFERS_ARB             0x80A8
> +#define GL_SAMPLES_ARB                    0x80A9
> +#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
> +#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
> +#define GL_MULTISAMPLE_BIT_ARB            0x20000000
> +#endif
> You probably want to add a
> #define GL_ARB_multisample 1
> somewhere in there as well.
> Roland Kaser wrote:
> > /usr/X11R6/include/GL/glext.h:1167:1: warning: this is the location of the
> > previous definition
> > What definition is that line referring to?

Wine 0.9.6 glext.h / DirectX Compiler Error

[H. Verbeet]

Actually, looking at the code for the original patch a bit closer, the
original patch is incorrect. GL_SUPPORT should get passed a memeber of
the enum GL_SupportedExt. Wether an extension is supported should be
initialised in IDirect3D8Impl_FillGLCaps in directx.c.