X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fflurry.h;h=ba9cc9219d0569c9c7aac1a204a2c7f0dc7462ce;hb=f0261d8acab611f3433160e4f07367b870439739;hp=3221006482c2cc6d51476f127dda682baf698db0;hpb=4cecfc89e5e889c7232693897c06168fb378bd5c;p=xscreensaver

diff --git a/hacks/glx/flurry.h b/hacks/glx/flurry.h
index 32210064..ba9cc921 100644
--- a/hacks/glx/flurry.h
+++ b/hacks/glx/flurry.h
@@ -68,16 +68,20 @@ typedef struct _flurry_info_t flurry_info_t;
 
 typedef union {
     float		f[4];
+#if 0
 #if __VEC__
     vector float	v;
 #endif
+#endif /* 0 */
 } floatToVector;
 
 typedef union {
     unsigned int	i[4];
+#if 0
 #if __VEC__
     vector unsigned int	v;
 #endif
+#endif /* 0 */
 } intToVector;
 
 typedef struct SmokeParticleV  
@@ -110,6 +114,7 @@ typedef struct SmokeV
 void InitSmoke(SmokeV *s);
 
 void UpdateSmoke_ScalarBase(global_info_t *global, flurry_info_t *flurry, SmokeV *s);
+#if 0
 #ifdef __ppc__
 void UpdateSmoke_ScalarFrsqrte(global_info_t *global, flurry_info_t *flurry, SmokeV *s);
 #endif
@@ -117,6 +122,7 @@ void UpdateSmoke_ScalarFrsqrte(global_info_t *global, flurry_info_t *flurry, Smo
 void UpdateSmoke_VectorBase(global_info_t *global, flurry_info_t *flurry, SmokeV *s);
 void UpdateSmoke_VectorUnrolled(global_info_t *global, flurry_info_t *flurry, SmokeV *s);
 #endif
+#endif /* 0 */
 
 void DrawSmoke_Scalar(global_info_t *global, flurry_info_t *flurry, SmokeV *s, float);
 void DrawSmoke_Vector(global_info_t *global, flurry_info_t *flurry, SmokeV *s, float);
@@ -156,7 +162,7 @@ void DrawSpark(global_info_t *info, flurry_info_t *flurry, Spark *s);
 /* int fieldIncoherence = 0; */
 /* int ifieldSpeed = 120; */
 
-static __inline__ float FastDistance2D(float x, float y)
+static inline float FastDistance2D(float x, float y)
 {
         /* this function computes the distance from 0,0 to x,y with ~3.5% error */
 	float mn;
@@ -171,6 +177,7 @@ static __inline__ float FastDistance2D(float x, float y)
 	return(x+y-(mn*0.5f)-(mn*0.25f)+(mn*0.0625f));
 }
 
+#if 0
 #ifdef __VEC__
 
 static vector float FastDistance2DV(vector float x, vector float y) {
@@ -185,6 +192,7 @@ static vector float FastDistance2DV(vector float x, vector float y) {
 }
 
 #endif
+#endif /* 0 */
 
 #define RandFlt(min, max) ((min) + frand((max) - (min)))
 
@@ -196,6 +204,7 @@ void MakeTexture(void);
 
 #define OPT_MODE_SCALAR_BASE		0x0
 
+#if 0
 #ifdef __ppc__
 #define OPT_MODE_SCALAR_FRSQRTE		0x1
 #endif
@@ -204,6 +213,7 @@ void MakeTexture(void);
 #define OPT_MODE_VECTOR_SIMPLE		0x2
 #define OPT_MODE_VECTOR_UNROLLED	0x3
 #endif
+#endif /* 0 */
 
 typedef enum _ColorModes
 {
@@ -259,9 +269,6 @@ struct _global_info_t {
   /* system values */
 	GLXContext *glx_context;
 	Window window;
-	rotator *rot;
-	trackball_state *trackball;
-	Bool button_down_p;
         int optMode;
 
 	float sys_glWidth;