Sophie

Sophie

distrib > Mandriva > cooker > x86_64 > by-pkgid > 9488514cad2bc9bfe7e06a895874abb5 > files > 8

Glide_V3-DRI-2002.04.10-2mdv2009.0.src.rpm

Status: applied

diff -ruN -x Makefile.in -x configure h3/glide3/src/fxcmd.h h3/glide3/src/fxcmd.h
--- h3/glide3/src/fxcmd.h	1999-11-24 22:44:55.000000000 +0100
+++ h3/glide3/src/fxcmd.h	2003-05-18 19:22:32.000000000 +0200
@@ -1312,7 +1312,7 @@
 #define REG_GROUP_SETF_CLAMP(__regBase, __regAddr, __val) \
 do { \
   const FxU32 fpClampVal = FP_FLOAT_CLAMP(__val); \
-  REG_GROUP_ASSERT(__regAddr, fpClampVal, FXTRUE); \  
+  REG_GROUP_ASSERT(__regAddr, fpClampVal, FXTRUE); \
   SET(((FxU32*)(__regBase))[offsetof(SstRegs, __regAddr) >> 2], fpClampVal); \
   GR_INC_SIZE(sizeof(FxU32)); \
 } while(0)
diff -ruN -x Makefile.in -x configure h3/glide3/src/g3df.c h3/glide3/src/g3df.c
--- h3/glide3/src/g3df.c	1999-11-24 22:44:56.000000000 +0100
+++ h3/glide3/src/g3df.c	2003-05-18 19:26:23.000000000 +0200
@@ -72,6 +72,7 @@
 */
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 #include <3dfx.h>
 
 #define FX_DLL_DEFINITION
diff -ruN -x Makefile.in -x configure h3/glide3/src/gsplash.c h3/glide3/src/gsplash.c
--- h3/glide3/src/gsplash.c	1999-11-24 22:44:57.000000000 +0100
+++ h3/glide3/src/gsplash.c	2003-05-18 19:23:38.000000000 +0200
@@ -185,8 +185,7 @@
 {
 #define FN_NAME "grSplash"
   GR_BEGIN_NOFIFOCHECK("grSplash", 85);
-  GDBG_INFO_MORE(gc->myLevel,"(%f,%f,%f,%f,%d)\n",
-                 x, y, w, h, frameNumber);
+  GDBG_INFO_MORE(gc->myLevel,"(%f,%f,%f,%f,%d)\n", x, y, w, h, frameNumber);
 
 #if (GLIDE_PLATFORM & GLIDE_OS_WIN32)
   {
diff -ruN -x Makefile.in -x configure h3/minihwc/fxhwc.h h3/minihwc/fxhwc.h
--- h3/minihwc/fxhwc.h	1999-11-24 22:45:03.000000000 +0100
+++ h3/minihwc/fxhwc.h	2003-05-19 14:59:10.000000000 +0200
@@ -38,8 +38,8 @@
 /*
 **  I/O Macros
 */
-#define HWC_IO_LOAD(regInfo, reg, val)
-GDBG_INFO(120, "%s:  Storing 0x%x to IO Register %s\n", 
+#define HWC_IO_LOAD(regInfo, reg, val) \
+GDBG_INFO(120, "%s:  Storing 0x%x to IO Register %s\n", \
 ((SstIORegs *) regInfo.ioMemBase)->
 
 
diff -ruN -x Makefile.in -x configure h5/glide3/src/fxcmd.h h5/glide3/src/fxcmd.h
--- h5/glide3/src/fxcmd.h	2000-12-14 04:12:49.000000000 +0100
+++ h5/glide3/src/fxcmd.h	2003-05-19 14:47:12.000000000 +0200
@@ -1425,7 +1425,7 @@
 #define REG_GROUP_SETF_CLAMP(__regBase, __regAddr, __val) \
 do { \
   const FxU32 fpClampVal = FP_FLOAT_CLAMP(__val); \
-  REG_GROUP_ASSERT(__regAddr, fpClampVal, FXTRUE); \  
+  REG_GROUP_ASSERT(__regAddr, fpClampVal, FXTRUE); \
   SET(((FxU32*)(__regBase))[offsetof(SstRegs, __regAddr) >> 2], fpClampVal); \
   GR_INC_SIZE(sizeof(FxU32)); \
 } while(0)
diff -ruN -x Makefile.in -x configure h5/minihwc/fxhwc.h h5/minihwc/fxhwc.h
--- h5/minihwc/fxhwc.h	2000-12-14 04:12:52.000000000 +0100
+++ h5/minihwc/fxhwc.h	2003-05-19 14:59:30.000000000 +0200
@@ -38,8 +38,8 @@
 /*
 **  I/O Macros
 */
-#define HWC_IO_LOAD(regInfo, reg, val)
-GDBG_INFO(120, "%s:  Storing 0x%x to IO Register %s\n", 
+#define HWC_IO_LOAD(regInfo, reg, val) \
+GDBG_INFO(120, "%s:  Storing 0x%x to IO Register %s\n", \
 ((SstIORegs *) regInfo.ioMemBase)->
 
 
diff -ruN -x Makefile.in -x configure h3/glide3/src/gsst.c.dri h3/glide3/src/gsst.c.dri
--- h3/glide3/src/gsst.c.dri	1999-11-24 22:45:01.000000000 +0100
+++ h3/glide3/src/gsst.c.dri	2003-05-31 19:48:14.000000000 +0200
@@ -542,30 +542,30 @@
 
 ResEntry
 _resTable[] = {
-  GR_RESOLUTION_320x200, 320, 200, /* 0x0 */
-  GR_RESOLUTION_320x240, 320,  240, /*   0x1 */
-  GR_RESOLUTION_400x256, 400,  256, /*   0x2 */
-  GR_RESOLUTION_512x384, 512,  384, /*   0x3 */
-  GR_RESOLUTION_640x200, 640,  200, /*   0x4 */
-  GR_RESOLUTION_640x350, 640,  350, /*   0x5 */
-  GR_RESOLUTION_640x400, 640,  400, /*   0x6 */
-  GR_RESOLUTION_640x480, 640,  480, /*   0x7 */
-  GR_RESOLUTION_800x600, 800,  600, /*   0x8 */
-  GR_RESOLUTION_960x720, 960,  720, /*   0x9 */
-  GR_RESOLUTION_856x480, 856,  480, /*   0xa */
-  GR_RESOLUTION_512x256, 512,  256, /*   0xb */
-  GR_RESOLUTION_1024x768, 1024,  768, /*  0xC */
-  GR_RESOLUTION_1280x1024, 1280,  1024, /* 0xD */
-  GR_RESOLUTION_1600x1200, 1600,  1200, /* 0xE */
-  GR_RESOLUTION_400x300, 400,  300, /*   0xF */
-  GR_RESOLUTION_1152x864, 1152,  864, /*  0x10 */
-  GR_RESOLUTION_1280x960, 1280,  960, /*  0x11 */
-  GR_RESOLUTION_1600x1024, 1600,  1024, /* 0x12 */
-  GR_RESOLUTION_1792x1344, 1792,  1344, /* 0x13 */
-  GR_RESOLUTION_1856x1392, 1856,  1392, /* 0x14 */
-  GR_RESOLUTION_1920x1440, 1920,  1440, /* 0x15 */
-  GR_RESOLUTION_2048x1536, 2048,  1536, /* 0x16 */
-  GR_RESOLUTION_2048x2048, 2048,  2048 /* 0x17 */
+  {GR_RESOLUTION_320x200, 320, 200}, /* 0x0 */
+  {GR_RESOLUTION_320x240, 320,  240}, /*   0x1 */
+  {GR_RESOLUTION_400x256, 400,  256}, /*   0x2 */
+  {GR_RESOLUTION_512x384, 512,  384}, /*   0x3 */
+  {GR_RESOLUTION_640x200, 640,  200}, /*   0x4 */
+  {GR_RESOLUTION_640x350, 640,  350}, /*   0x5 */
+  {GR_RESOLUTION_640x400, 640,  400}, /*   0x6 */
+  {GR_RESOLUTION_640x480, 640,  480}, /*   0x7 */
+  {GR_RESOLUTION_800x600, 800,  600}, /*   0x8 */
+  {GR_RESOLUTION_960x720, 960,  720}, /*   0x9 */
+  {GR_RESOLUTION_856x480, 856,  480}, /*   0xa */
+  {GR_RESOLUTION_512x256, 512,  256}, /*   0xb */
+  {GR_RESOLUTION_1024x768, 1024,  768}, /*  0xC */
+  {GR_RESOLUTION_1280x1024, 1280,  1024}, /* 0xD */
+  {GR_RESOLUTION_1600x1200, 1600,  1200}, /* 0xE */
+  {GR_RESOLUTION_400x300, 400,  300}, /*   0xF */
+  {GR_RESOLUTION_1152x864, 1152,  864}, /*  0x10 */
+  {GR_RESOLUTION_1280x960, 1280,  960}, /*  0x11 */
+  {GR_RESOLUTION_1600x1024, 1600,  1024}, /* 0x12 */
+  {GR_RESOLUTION_1792x1344, 1792,  1344}, /* 0x13 */
+  {GR_RESOLUTION_1856x1392, 1856,  1392}, /* 0x14 */
+  {GR_RESOLUTION_1920x1440, 1920,  1440}, /* 0x15 */
+  {GR_RESOLUTION_2048x1536, 2048,  1536}, /* 0x16 */
+  {GR_RESOLUTION_2048x2048, 2048,  2048} /* 0x17 */
 };
 
 /* ---------------------------------------------
@@ -1190,7 +1190,7 @@
     gc->tBuffer.bufBPP = 0xffffffff; /* Don't matter to me */
 
     GDBG_INFO(1, "autoBump: 0x%x\n", _GlideRoot.environment.autoBump);
-    if (gc->cmdTransportInfo.autoBump = _GlideRoot.environment.autoBump) {
+    if ((gc->cmdTransportInfo.autoBump = _GlideRoot.environment.autoBump)) {
       if (!hwcInitFifo( bInfo, gc->cmdTransportInfo.autoBump)) {
         hwcRestoreVideo(bInfo);
         GrErrorCallback(hwcGetErrorString(), FXFALSE);
diff -ruN -x Makefile.in -x configure h3/glide3/src/xdraw2.S h3/glide3/src/xdraw2.S
--- h3/glide3/src/xdraw2.S	2000-02-15 23:35:59.000000000 +0100
+++ h3/glide3/src/xdraw2.S	2003-05-31 19:58:51.000000000 +0200
@@ -172,12 +172,14 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
-#define GLIDE_CLIP_COORDS 0
-#define GLIDE_VALIDATE_STATE 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+#undef GLIDE_CLIP_COORDS
+#undef GLIDE_VALIDATE_STATE
+
+#undef LOCAL
 
 END_PROC_TYPE(clip_nocull_invalid):
 .size PROC_TYPE(clip_nocull_invalid),END_PROC_TYPE(clip_nocull_invalid)-PROC_TYPE(clip_nocull_invalid)
@@ -196,12 +198,14 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
-#define GLIDE_CLIP_COORDS 0
-#define GLIDE_VALIDATE_STATE 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+#undef GLIDE_CLIP_COORDS
+#undef GLIDE_VALIDATE_STATE
+
+#undef LOCAL
 
 END_PROC_TYPE(clip_cull_invalid):
 .size PROC_TYPE(clip_cull_invalid),END_PROC_TYPE(clip_cull_invalid)-PROC_TYPE(clip_cull_invalid)
@@ -220,12 +224,14 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
-#define GLIDE_CLIP_COORDS 0
-#define GLIDE_VALIDATE_STATE 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+#undef GLIDE_CLIP_COORDS
+#undef GLIDE_VALIDATE_STATE
+
+#undef LOCAL
 
 END_PROC_TYPE(clip_cull_valid):
 .size PROC_TYPE(clip_cull_valid),END_PROC_TYPE(clip_cull_valid)-PROC_TYPE(clip_cull_valid)
@@ -244,12 +250,14 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
-#define GLIDE_CLIP_COORDS 0
-#define GLIDE_VALIDATE_STATE 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+#undef GLIDE_CLIP_COORDS
+#undef GLIDE_VALIDATE_STATE
+
+#undef LOCAL
 
 END_PROC_TYPE(clip_nocull_valid):
 .size PROC_TYPE(clip_nocull_valid),END_PROC_TYPE(clip_nocull_valid)-PROC_TYPE(clip_nocull_valid)
@@ -268,12 +276,14 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
-#define GLIDE_CLIP_COORDS 0
-#define GLIDE_VALIDATE_STATE 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+#undef GLIDE_CLIP_COORDS
+#undef GLIDE_VALIDATE_STATE
+
+#undef LOCAL
 
 END_PROC_TYPE(win_nocull_invalid):
 .size PROC_TYPE(win_nocull_invalid),END_PROC_TYPE(win_nocull_invalid)-PROC_TYPE(win_nocull_invalid)
@@ -293,12 +303,14 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
-#define GLIDE_CLIP_COORDS 0
-#define GLIDE_VALIDATE_STATE 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+#undef GLIDE_CLIP_COORDS
+#undef GLIDE_VALIDATE_STATE
+
+#undef LOCAL
 
 END_PROC_TYPE(win_cull_invalid):
 .size PROC_TYPE(win_cull_invalid),END_PROC_TYPE(win_cull_invalid)-PROC_TYPE(win_cull_invalid)
@@ -317,12 +329,14 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
-#define GLIDE_CLIP_COORDS 0
-#define GLIDE_VALIDATE_STATE 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+#undef GLIDE_CLIP_COORDS
+#undef GLIDE_VALIDATE_STATE
+
+#undef LOCAL
 
 END_PROC_TYPE(win_cull_valid):
 .size PROC_TYPE(win_cull_valid),END_PROC_TYPE(win_cull_valid)-PROC_TYPE(win_cull_valid)
@@ -341,12 +355,14 @@
 #define GLIDE_PACK_ALPHA 0
 #define GLIDE_GENERIC_SETUP 0
 #include "xdraw2.inc.S"
-#define GLIDE_GENERIC_SETUP 0
-#define GLIDE_PACK_ALPHA 0
-#define GLIDE_PACK_RGB 0
-#define GLIDE_CULLING 0
-#define GLIDE_CLIP_COORDS 0
-#define GLIDE_VALIDATE_STATE 0
+#undef GLIDE_GENERIC_SETUP
+#undef GLIDE_PACK_ALPHA
+#undef GLIDE_PACK_RGB
+#undef GLIDE_CULLING
+#undef GLIDE_CLIP_COORDS
+#undef GLIDE_VALIDATE_STATE
+
+#undef LOCAL
 
 END_PROC_TYPE(win_nocull_valid):
 .size PROC_TYPE(win_nocull_valid),END_PROC_TYPE(win_nocull_valid)-PROC_TYPE(win_nocull_valid)
diff -ruN -x Makefile.in -x configure h3/glide3/src/xdraw3.S h3/glide3/src/xdraw3.S
--- h3/glide3/src/xdraw3.S	2000-10-20 21:07:00.000000000 +0200
+++ h3/glide3/src/xdraw3.S	2003-05-31 20:27:28.000000000 +0200
@@ -2462,6 +2462,7 @@
 
 #define gc esi	/*  points to graphics context */
 #define fifo ecx	/*  points to next entry in fifo */
+#undef vertexPtr
 #define vertexPtr edx	/*  pointer to vertex or vertex array */
 
 .align 32
@@ -2910,6 +2911,7 @@
 
 #define gc esi	/*  points to graphics context */
 #define fifo ecx	/*  points to next entry in fifo */
+#undef vertexPtr
 #define vertexPtr edi	/*  Current vertex pointer */
 
 /*  NB:  All of the base triangle procs expect to have the gc */
diff -ruN -x Makefile.in -x configure h5/glide3/src/g3df.c h5/glide3/src/g3df.c
--- h5/glide3/src/g3df.c	2000-11-16 00:32:53.000000000 +0100
+++ h5/glide3/src/g3df.c	2003-05-31 20:35:36.000000000 +0200
@@ -101,6 +101,9 @@
 */
 #include <stdio.h>
 #include <string.h>
+#ifdef __GNUC__
+#include <ctype.h>
+#endif
 #include <3dfx.h>
 
 #define FX_DLL_DEFINITION
diff -ruN -x Makefile.in -x configure h5/glide3/src/gsst.c h5/glide3/src/gsst.c
--- h5/glide3/src/gsst.c	2000-11-17 22:31:05.000000000 +0100
+++ h5/glide3/src/gsst.c	2003-05-31 20:40:59.000000000 +0200
@@ -849,30 +849,30 @@
 
 ResEntry
 _resTable[] = {
-  GR_RESOLUTION_320x200, 320, 200, /* 0x0 */
-  GR_RESOLUTION_320x240, 320,  240, /*   0x1 */
-  GR_RESOLUTION_400x256, 400,  256, /*   0x2 */
-  GR_RESOLUTION_512x384, 512,  384, /*   0x3 */
-  GR_RESOLUTION_640x200, 640,  200, /*   0x4 */
-  GR_RESOLUTION_640x350, 640,  350, /*   0x5 */
-  GR_RESOLUTION_640x400, 640,  400, /*   0x6 */
-  GR_RESOLUTION_640x480, 640,  480, /*   0x7 */
-  GR_RESOLUTION_800x600, 800,  600, /*   0x8 */
-  GR_RESOLUTION_960x720, 960,  720, /*   0x9 */
-  GR_RESOLUTION_856x480, 856,  480, /*   0xa */
-  GR_RESOLUTION_512x256, 512,  256, /*   0xb */
-  GR_RESOLUTION_1024x768, 1024,  768, /*  0xC */
-  GR_RESOLUTION_1280x1024, 1280,  1024, /* 0xD */
-  GR_RESOLUTION_1600x1200, 1600,  1200, /* 0xE */
-  GR_RESOLUTION_400x300, 400,  300, /*   0xF */
-  GR_RESOLUTION_1152x864, 1152,  864, /*  0x10 */
-  GR_RESOLUTION_1280x960, 1280,  960, /*  0x11 */
-  GR_RESOLUTION_1600x1024, 1600,  1024, /* 0x12 */
-  GR_RESOLUTION_1792x1344, 1792,  1344, /* 0x13 */
-  GR_RESOLUTION_1856x1392, 1856,  1392, /* 0x14 */
-  GR_RESOLUTION_1920x1440, 1920,  1440, /* 0x15 */
-  GR_RESOLUTION_2048x1536, 2048,  1536, /* 0x16 */
-  GR_RESOLUTION_2048x2048, 2048,  2048  /* 0x17 */
+  {GR_RESOLUTION_320x200, 320, 200}, /* 0x0 */
+  {GR_RESOLUTION_320x240, 320,  240}, /*   0x1 */
+  {GR_RESOLUTION_400x256, 400,  256}, /*   0x2 */
+  {GR_RESOLUTION_512x384, 512,  384}, /*   0x3 */
+  {GR_RESOLUTION_640x200, 640,  200}, /*   0x4 */
+  {GR_RESOLUTION_640x350, 640,  350}, /*   0x5 */
+  {GR_RESOLUTION_640x400, 640,  400}, /*   0x6 */
+  {GR_RESOLUTION_640x480, 640,  480}, /*   0x7 */
+  {GR_RESOLUTION_800x600, 800,  600}, /*   0x8 */
+  {GR_RESOLUTION_960x720, 960,  720}, /*   0x9 */
+  {GR_RESOLUTION_856x480, 856,  480}, /*   0xa */
+  {GR_RESOLUTION_512x256, 512,  256}, /*   0xb */
+  {GR_RESOLUTION_1024x768, 1024,  768}, /*  0xC */
+  {GR_RESOLUTION_1280x1024, 1280,  1024}, /* 0xD */
+  {GR_RESOLUTION_1600x1200, 1600,  1200}, /* 0xE */
+  {GR_RESOLUTION_400x300, 400,  300}, /*   0xF */
+  {GR_RESOLUTION_1152x864, 1152,  864}, /*  0x10 */
+  {GR_RESOLUTION_1280x960, 1280,  960}, /*  0x11 */
+  {GR_RESOLUTION_1600x1024, 1600,  1024}, /* 0x12 */
+  {GR_RESOLUTION_1792x1344, 1792,  1344}, /* 0x13 */
+  {GR_RESOLUTION_1856x1392, 1856,  1392}, /* 0x14 */
+  {GR_RESOLUTION_1920x1440, 1920,  1440}, /* 0x15 */
+  {GR_RESOLUTION_2048x1536, 2048,  1536}, /* 0x16 */
+  {GR_RESOLUTION_2048x2048, 2048,  2048}  /* 0x17 */
 };
 
 /* ---------------------------------------------
diff -ruN -x Makefile.in -x configure h5/glide3/src/xdraw3.s h5/glide3/src/xdraw3.s
--- h5/glide3/src/xdraw3.s	2000-10-20 21:07:00.000000000 +0200
+++ h5/glide3/src/xdraw3.s	2003-05-31 20:46:21.000000000 +0200
@@ -2925,6 +2925,7 @@
 
 #define gc esi	/*  points to graphics context */
 #define fifo ecx	/*  points to next entry in fifo */
+#undef vertexPtr
 #define vertexPtr edi	/*  Current vertex pointer */
 
 /*  NB:  All of the base triangle procs expect to have the gc */