rpms/Glide3/devel Glide3-warn.patch,1.1,1.2

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8603

Modified Files:
	Glide3-warn.patch 
Log Message:
Fix non-asm compile in Glide3-warn.patch

Glide3-warn.patch:

Index: Glide3-warn.patch
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3-warn.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Glide3-warn.patch	16 Jan 2006 15:54:52 -0000	1.1
+++ Glide3-warn.patch	16 Jan 2006 20:39:33 -0000	1.2
@@ -393,9 +393,46 @@
              DA_SETF(fbx);
              DA_SETF(fby - _GlideRoot.pool.fHalf);
              DA_VP_SETFS(b,oowb);
-Only in Glide3/cvg/glide3/src: gdraw.c.warn
-Only in Glide3: debugfiles.list
-Only in Glide3: debugsources.list
+--- Glide3/cvg/glide3/src/gxdraw.c~	2006-01-16 21:33:38.000000000 +0100
++++ Glide3/cvg/glide3/src/gxdraw.c	2006-01-16 21:33:38.000000000 +0100
+@@ -213,31 +213,31 @@
+     dyBC = fb[yindex] - fc[yindex];
+     
+     /* Stash the area in the float pool for easy access */
+-    _GlideRoot.pool.ftemp1 = dxAB * dyBC - dxBC * dyAB;
++    _GlideRoot.pool.temp1.f = dxAB * dyBC - dxBC * dyAB;
+     
+ #define FloatVal(__f) (((__f) < 786432.875) ? (__f) : ((__f) - 786432.875))
+     {
+-      const FxI32 j = *(FxI32*)&_GlideRoot.pool.ftemp1;
+       const FxU32 culltest = (gc->state.cull_mode << 31UL);
+       
+       /* Zero-area triangles are BAD!! */
+-      if ((j & 0x7FFFFFFF) == 0) {
++      if ((_GlideRoot.pool.temp1.i & 0x7FFFFFFF) == 0) {
+         GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                   FloatVal(fa[0]), FloatVal(fa[1]), 
+                   FloatVal(fb[0]), FloatVal(fb[1]), 
+                   FloatVal(fc[0]), FloatVal(fc[1]), 
+-                  _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
++                  _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
+         
+         return 0;
+       }
+       
+       /* Backface culling, use sign bit as test */
+-      if ((gc->state.cull_mode != GR_CULL_DISABLE) && (((FxI32)(j ^ culltest)) >= 0)) {
++      if ((gc->state.cull_mode != GR_CULL_DISABLE) &&
++          (((FxI32)(_GlideRoot.pool.temp1.i ^ culltest)) >= 0)) {
+         GDBG_INFO(291, FN_NAME": Culling (%g %g) (%g %g) (%g %g) : (%g : 0x%X : 0x%X)\n",
+                   FloatVal(fa[0]), FloatVal(fa[1]), 
+                   FloatVal(fb[0]), FloatVal(fb[1]), 
+                   FloatVal(fc[0]), FloatVal(fc[1]), 
+-                  _GlideRoot.pool.ftemp1, gc->state.cull_mode, culltest);
++                  _GlideRoot.pool.temp1.f, gc->state.cull_mode, culltest);
+         
+         return -1;
+       }
 diff -ur Glide3.orig/h3/glide3/src/fxcmd.h Glide3/h3/glide3/src/fxcmd.h
 --- Glide3.orig/h3/glide3/src/fxcmd.h	2005-06-09 20:32:28.000000000 +0200
 +++ Glide3/h3/glide3/src/fxcmd.h	2006-01-16 16:43:14.000000000 +0100