X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fquasicrystal.c;h=5190da32586dde74df95c5b6c97e15ee5dcba3b7;hb=39809ded547bdbb08207d3e514950425215b4410;hp=d2d3f5c16b0b3c73c5787a9f9244bf2cb14ca375;hpb=d5186197bc394e10a4402f7f6d23fbb14103bc50;p=xscreensaver diff --git a/hacks/glx/quasicrystal.c b/hacks/glx/quasicrystal.c index d2d3f5c1..5190da32 100644 --- a/hacks/glx/quasicrystal.c +++ b/hacks/glx/quasicrystal.c @@ -22,8 +22,9 @@ "*contrast: 30 \n" \ "*showFPS: False \n" \ "*wireframe: False \n" \ + "*suppressRotationAnimation: True\n" \ -# define refresh_quasicrystal 0 +# define free_quasicrystal 0 # define release_quasicrystal 0 #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) @@ -191,14 +192,7 @@ init_quasicrystal (ModeInfo *mi) int tex_width; int i; - if (!bps) { - bps = (quasicrystal_configuration *) - calloc (MI_NUM_SCREENS(mi), sizeof (quasicrystal_configuration)); - if (!bps) { - fprintf(stderr, "%s: out of memory\n", progname); - exit(1); - } - } + MI_INIT (mi, bps); bp = &bps[MI_SCREEN(mi)]; @@ -328,7 +322,9 @@ draw_quasicrystal (ModeInfo *mi) if (!wire) { glEnable (GL_TEXTURE_1D); - glEnable (GL_TEXTURE_2D); /* jwzgles needs this too, bleh. */ +# ifdef HAVE_JWZGLES + glEnable (GL_TEXTURE_2D); /* jwzgles needs this, bleh. */ +# endif } glEnable (GL_BLEND);