X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fcarousel.c;h=d5de4924a4aa031485d6b5bd02037f59214654c8;hp=4fd1b2fcb2266856b203223004a9c97871ed239d;hb=c494fd2e6b3b25582375d62e40f4f5cc984ca424;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439

diff --git a/hacks/glx/carousel.c b/hacks/glx/carousel.c
index 4fd1b2fc..d5de4924 100644
--- a/hacks/glx/carousel.c
+++ b/hacks/glx/carousel.c
@@ -1,4 +1,4 @@
-/* carousel, Copyright (c) 2005-2006 Jamie Zawinski <jwz@jwz.org>
+/* carousel, Copyright (c) 2005-2007 Jamie Zawinski <jwz@jwz.org>
  * Loads a sequence of images and rotates them around.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -50,6 +50,14 @@
 #  include <X11/Intrinsic.h>     /* for XrmDatabase in -debug mode */
 # endif
 
+/* Should be in <GL/glext.h> */
+# ifndef  GL_TEXTURE_MAX_ANISOTROPY_EXT
+#  define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+# endif
+# ifndef  GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT
+#  define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+# endif
+
 typedef struct {
   double x, y, w, h;
 } rect;
@@ -80,6 +88,7 @@ typedef struct {
 
 typedef struct {
   GLXContext *glx_context;
+  GLfloat anisotropic;
   rotator *rot;
   trackball_state *trackball;
   Bool button_down_p;
@@ -218,11 +227,15 @@ load_image (ModeInfo *mi, image_frame *frame)
   if (wire)
     image_loaded_cb (0, 0, 0, 0, 0, 0, frame);
   else
-    load_texture_async (mi->xgwa.screen, mi->window, *ss->glx_context,
-                        (MI_WIDTH(mi)  / 2) - 1,
-                        (MI_HEIGHT(mi) / 2) - 1,
-                        mipmap_p, frame->loading.texid, 
-                        image_loaded_cb, frame);
+    {
+      int w = (MI_WIDTH(mi)  / 2) - 1;
+      int h = (MI_HEIGHT(mi) / 2) - 1;
+      if (w <= 10) w = 10;
+      if (h <= 10) h = 10;
+      load_texture_async (mi->xgwa.screen, mi->window, *ss->glx_context, w, h,
+                          mipmap_p, frame->loading.texid, 
+                          image_loaded_cb, frame);
+    }
 }
 
 
@@ -255,6 +268,10 @@ image_loaded_cb (const char *filename, XRectangle *geom,
   glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
                    mipmap_p ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR);
 
+  if (ss->anisotropic >= 1.0)
+    glTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 
+                     ss->anisotropic);
+
   glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
   glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
@@ -574,6 +591,12 @@ init_carousel (ModeInfo *mi)
     ss->trackball = gltrackball_init ();
   }
 
+  if (strstr ((char *) glGetString(GL_EXTENSIONS),
+              "GL_EXT_texture_filter_anisotropic"))
+    glGetFloatv (GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &ss->anisotropic);
+  else
+    ss->anisotropic = 0.0;
+
   glDisable (GL_LIGHTING);
   glEnable (GL_DEPTH_TEST);
   glDisable (GL_CULL_FACE);