X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fblocktube.c;h=f32c7b1e4a0d56241beebc06351f5f02eef381c3;hb=bbd0773f2adde4927a6196361d4061e70bf48cd9;hp=2542973a9e047cce05b042b6ff434f19194a1531;hpb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930;p=xscreensaver diff --git a/hacks/glx/blocktube.c b/hacks/glx/blocktube.c index 2542973a..f32c7b1e 100644 --- a/hacks/glx/blocktube.c +++ b/hacks/glx/blocktube.c @@ -127,6 +127,7 @@ ModStruct blocktube_description = "A shifting tunnel of reflective blocks", 0, NULL}; #endif /* USE_MODULES */ +#if defined( I_HAVE_XPM ) static Bool LoadGLTextures(ModeInfo *mi) { Bool status; @@ -135,7 +136,7 @@ static Bool LoadGLTextures(ModeInfo *mi) glGenTextures(1, &envTexture); glBindTexture(GL_TEXTURE_2D, envTexture); texti = xpm_to_ximage(MI_DISPLAY(mi), MI_VISUAL(mi), MI_COLORMAP(mi), - envImage_xpm); + blocktube_xpm); if (!texti) { status = False; } else { @@ -149,6 +150,7 @@ static Bool LoadGLTextures(ModeInfo *mi) } return status; } +#endif static void newTargetColor(void) {