http://ftp.ussg.iu.edu/linux/slackware/slackware-9.0/source/xap/xscreensaver/xscreens...

[xscreensaver] / hacks / glx / sballs.c

diff --git a/hacks/glx/sballs.c b/hacks/glx/sballs.c
index b8c3e74dac2f4774f70dd4c9a023f728aa157bd2..ad77d8c4d5b118060d79227da130f90cfbaed100 100644 (file)
--- a/hacks/glx/sballs.c
+++ b/hacks/glx/sballs.c
@@ -441,7 +441,10 @@ static void inittextures(ModeInfo * mi)
         clear_gl_error();
        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
                     sb->btexture->width, sb->btexture->height, 0,
-                    GL_RGBA, GL_UNSIGNED_BYTE, sb->btexture->data);
+                    GL_RGBA,
+                     /* GL_UNSIGNED_BYTE, */
+                     GL_UNSIGNED_INT_8_8_8_8_REV,
+                     sb->btexture->data);
         check_gl_error("texture");
 
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@@ -472,7 +475,10 @@ static void inittextures(ModeInfo * mi)
         clear_gl_error();
        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
                     sb->ftexture->width, sb->ftexture->height, 0,
-                    GL_RGBA, GL_UNSIGNED_BYTE, sb->ftexture->data);
+                    GL_RGBA,
+                     /* GL_UNSIGNED_BYTE, */
+                     GL_UNSIGNED_INT_8_8_8_8_REV,
+                     sb->ftexture->data);
         check_gl_error("texture");
 
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@@ -707,7 +713,7 @@ static void Init(ModeInfo * mi)
                       MI_NAME(mi),
                       polygons[object].shortname,
                       spheres,
-                      MI_CYCLES(mi),
+                      (int) MI_CYCLES(mi),
                       do_texture ? "on" : "off"
                        );
     }
@@ -855,7 +861,7 @@ void change_sballs(ModeInfo * mi)
                       MI_NAME(mi),
                       polygons[object].shortname,
                       spheres,
-                      MI_CYCLES(mi),
+                      (int) MI_CYCLES(mi),
                       do_texture ? "on" : "off"
                        );
     }