X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fquasicrystal.c;h=5278e6d36b62f61bf8fc2ee468ea2ae6ef0cdbb7;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=2e761e358e2cc4f4663c9fd7c5b6c0da685bbed6;hpb=4361b69d3178d7fc98d0388f9a223af6c2651aba;p=xscreensaver diff --git a/hacks/glx/quasicrystal.c b/hacks/glx/quasicrystal.c index 2e761e35..5278e6d3 100644 --- a/hacks/glx/quasicrystal.c +++ b/hacks/glx/quasicrystal.c @@ -24,7 +24,7 @@ "*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))) @@ -192,7 +192,7 @@ init_quasicrystal (ModeInfo *mi) int tex_width; int i; - MI_INIT (mi, bps, NULL); + MI_INIT (mi, bps); bp = &bps[MI_SCREEN(mi)]; @@ -273,10 +273,7 @@ init_quasicrystal (ModeInfo *mi) glPixelStorei (GL_UNPACK_ALIGNMENT, 1); glTexImage1D (GL_TEXTURE_1D, 0, GL_RGBA, tex_width, 0, - GL_RGBA, - /* GL_UNSIGNED_BYTE, */ - GL_UNSIGNED_INT_8_8_8_8_REV, - tex_data); + GL_RGBA, GL_UNSIGNED_BYTE, tex_data); check_gl_error("texture"); glTexParameterf(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_REPEAT);