X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fgflux.c;fp=hacks%2Fglx%2Fgflux.c;h=172f4061925ab86aa9c9b52e63d67502e0c9e1cd;hb=a94197e76a5dea5cb60542840809d6c20d0abbf3;hp=2e9f067037b0564e01beff16234688a488073f46;hpb=8eb2873d7054e705c4e83f22d18c40946a9e2529;p=xscreensaver

diff --git a/hacks/glx/gflux.c b/hacks/glx/gflux.c
index 2e9f0670..172f4061 100644
--- a/hacks/glx/gflux.c
+++ b/hacks/glx/gflux.c
@@ -76,13 +76,6 @@
 
 #ifdef USE_GL /* whole file */
 
-#ifdef HAVE_XPM
-# include <X11/xpm.h>
-# ifndef PIXEL_ALREADY_TYPEDEFED
-# define PIXEL_ALREADY_TYPEDEFED /* Sigh, Xmu/Drawing.h needs this... */
-# endif
-#endif
-
 #ifdef HAVE_XMU
 # ifndef VMS
 #  include <X11/Xmu/Drawing.h>
@@ -428,9 +421,11 @@ void initTexture(void)
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+
+    clear_gl_error();
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, gflux->imageWidth,
 			gflux->imageHeight, 0, GL_RGB, GL_UNSIGNED_BYTE, *(gflux->image));
-	
+    check_gl_error("texture");
 }
 
 #else /* HAVE_PPM FALSE */