X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fboxed.c;h=6a2d79a68c37939c9880c562b98eab77ec465c84;hp=f1a409a1f775dfb4c66a4766ecec57105994bf0f;hb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;hpb=ec8d2b32b63649e6d32bdfb306eda062769af823

diff --git a/hacks/glx/boxed.c b/hacks/glx/boxed.c
index f1a409a1..6a2d79a6 100644
--- a/hacks/glx/boxed.c
+++ b/hacks/glx/boxed.c
@@ -982,6 +982,8 @@ static void draw(ModeInfo * mi)
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    glLoadIdentity();
    
+   glRotatef(current_device_rotation(), 0, 0, 1);
+
    gp->tic += 0.01f;
    gp->camtic += 0.01f + 0.01f * sin(gp->tic * speed);
    
@@ -1192,6 +1194,7 @@ pinit(ModeInfo * mi)
    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
    clear_gl_error();
+#if 0
    i = gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 256, 256,
                          GL_RGB, GL_UNSIGNED_BYTE, gp->tex1);
    if (i)
@@ -1202,6 +1205,12 @@ pinit(ModeInfo * mi)
        exit (1);
      }
    check_gl_error("mipmapping");
+#else
+   glTexImage2D (GL_TEXTURE_2D, 0, GL_RGB, 256, 256, 0,
+		       GL_RGB, GL_UNSIGNED_BYTE,
+                 gp->tex1);
+   check_gl_error("texture");
+#endif
 
    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);