X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fglblur.c;h=59b0870d31ada815b1c40a079d6c7c7545b70709;hb=9c9d475ff889ed8be02e8ce8c17da28b93278fca;hp=2ed914f10760ce99d09b04f181f93a8e4f6e3792;hpb=c28aecf9fc41e3a03494bacf7279745425e2fa18;p=xscreensaver

diff --git a/hacks/glx/glblur.c b/hacks/glx/glblur.c
index 2ed914f1..59b0870d 100644
--- a/hacks/glx/glblur.c
+++ b/hacks/glx/glblur.c
@@ -1,5 +1,5 @@
 /* glblur --- radial blur using GL textures
- * Copyright (c) 2002 Jamie Zawinski <jwz@jwz.org>
+ * Copyright (c) 2002-2004 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -115,9 +115,9 @@ static XrmOptionDescRec opts[] = {
 };
 
 static argtype vars[] = {
-  {(caddr_t *) &do_spin,   "spin",   "Spin",   DEF_SPIN,   t_String},
-  {(caddr_t *) &do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
-  {(caddr_t *) &blursize,  "blurSize","BlurSize", DEF_BLURSIZE,  t_Int},
+  {&do_spin,   "spin",   "Spin",   DEF_SPIN,   t_String},
+  {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
+  {&blursize,  "blurSize","BlurSize", DEF_BLURSIZE,  t_Int},
 };
 
 ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL};
@@ -258,7 +258,10 @@ init_texture (ModeInfo *mi)
   glGenTextures (1, &bp->texture);
   glBindTexture (GL_TEXTURE_2D, bp->texture);
   glTexImage2D (GL_TEXTURE_2D, 0, 4, 128, 128, 0,
-		GL_RGBA, GL_UNSIGNED_BYTE, bp->tex_data);
+		GL_RGBA,
+                /* GL_UNSIGNED_BYTE, */
+                GL_UNSIGNED_INT_8_8_8_8_REV,
+                bp->tex_data);
   glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 }
@@ -327,7 +330,7 @@ overlay_blur_texture (ModeInfo *mi)
     {
       glColor4f (1, 1, 1, alpha);
       glTexCoord2f (0+spost, 1-spost); glVertex2f (0, 0);
-      glTexCoord2f (0+spost, 0+spost); glVertex2f (0, w);
+      glTexCoord2f (0+spost, 0+spost); glVertex2f (0, h);
       glTexCoord2f (1-spost, 0+spost); glVertex2f (w, h);
       glTexCoord2f (1-spost, 1-spost); glVertex2f (w, 0);
       spost += inc;