-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Dieter Nützel wrote:
> i830_metaops.c: In function `i830TryTextureDrawPixels':
> i830_metaops.c:628: error: structure has no member named `OcclusionTest'
> make[6]: *** [i830_metaops.o] Fehler 1
> make[6]: Leaving directory `/opt/Mesa/src/mesa/drivers/dri/i915'
>
> -DGLX_DIRECT_RENDERING -DHAVE_ALIAS r200_pixel.c -o r200_pixel.o
> r200_pixel.c: In function `check_color_per_fragment_ops':
> r200_pixel.c:97: error: structure has no member named `OcclusionTest'
> make[6]: *** [r200_pixel.o] Fehler 1
Try the attached patch.
985408c07ede00d7bd062b59c953d322 occlusion-01.patch
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
iD8DBQFDDhwqX1gOwKyEAw8RAsrLAJ0QcraWtAF7OB+Y3NMg3GEh1RXCHwCgmH+d
jhQF9Aqqq6exb1xN4HeIVkg=
=NYOo
-----END PGP SIGNATURE-----
Index: src/mesa/drivers/dri/i915/i830_metaops.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i915/i830_metaops.c,v
retrieving revision 1.4
diff -u -d -r1.4 i830_metaops.c
--- src/mesa/drivers/dri/i915/i830_metaops.c 4 May 2005 20:11:37 -0000 1.4
+++ src/mesa/drivers/dri/i915/i830_metaops.c 25 Aug 2005 19:28:02 -0000
@@ -625,7 +625,7 @@
!ctx->Color.ColorMask[3] ||
ctx->Color.ColorLogicOpEnabled ||
ctx->Texture._EnabledUnits ||
- ctx->Depth.OcclusionTest) {
+ ctx->Occlusion.Active) {
fprintf(stderr, "%s: other tests failed\n", __FUNCTION__);
return GL_FALSE;
}
Index: src/mesa/drivers/dri/i915/intel_pixel.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i915/intel_pixel.c,v
retrieving revision 1.4
diff -u -d -r1.4 intel_pixel.c
--- src/mesa/drivers/dri/i915/intel_pixel.c 9 May 2005 17:42:18 -0000 1.4
+++ src/mesa/drivers/dri/i915/intel_pixel.c 25 Aug 2005 19:28:02 -0000
@@ -87,7 +87,7 @@
!ctx->Color.ColorMask[3] ||
ctx->Color.ColorLogicOpEnabled ||
ctx->Texture._EnabledUnits ||
- ctx->Depth.OcclusionTest
+ ctx->Occlusion.Active
) &&
ctx->Current.RasterPosValid);
Index: src/mesa/drivers/dri/mga/mgapixel.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/mga/mgapixel.c,v
retrieving revision 1.8
diff -u -d -r1.8 mgapixel.c
--- src/mesa/drivers/dri/mga/mgapixel.c 12 May 2005 23:15:38 -0000 1.8
+++ src/mesa/drivers/dri/mga/mgapixel.c 25 Aug 2005 19:28:02 -0000
@@ -141,7 +141,7 @@
!ctx->Color.ColorMask[3] ||
ctx->Color.ColorLogicOpEnabled ||
ctx->Texture._EnabledUnits ||
- ctx->Depth.OcclusionTest
+ ctx->Occlusion.Active
) &&
ctx->Current.RasterPosValid &&
ctx->Pixel.ZoomX == 1.0F &&
Index: src/mesa/drivers/dri/r200/r200_pixel.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/r200/r200_pixel.c,v
retrieving revision 1.7
diff -u -d -r1.7 r200_pixel.c
--- src/mesa/drivers/dri/r200/r200_pixel.c 31 Jul 2004 08:14:50 -0000 1.7
+++ src/mesa/drivers/dri/r200/r200_pixel.c 25 Aug 2005 19:28:02 -0000
@@ -94,7 +94,7 @@
!ctx->Color.ColorMask[3] ||
ctx->Color.ColorLogicOpEnabled ||
ctx->Texture._EnabledUnits ||
- ctx->Depth.OcclusionTest
+ ctx->Occlusion.Active
) &&
ctx->Current.RasterPosValid);
Index: src/mesa/drivers/dri/tdfx/tdfx_pixels.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/tdfx/tdfx_pixels.c,v
retrieving revision 1.4
diff -u -d -r1.4 tdfx_pixels.c
--- src/mesa/drivers/dri/tdfx/tdfx_pixels.c 4 May 2005 20:11:39 -0000 1.4
+++ src/mesa/drivers/dri/tdfx/tdfx_pixels.c 25 Aug 2005 19:28:03 -0000
@@ -618,7 +618,7 @@
!ctx->Color.ColorMask[3] ||
ctx->Color.ColorLogicOpEnabled ||
ctx->Texture._EnabledUnits ||
- ctx->Depth.OcclusionTest ||
+ ctx->Occlusion.Active ||
fxMesa->Fallback)
{
_swrast_DrawPixels( ctx, x, y, width, height, format, type,
