projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz
[xscreensaver]
/
hacks
/
glx
/
stairs.c
diff --git
a/hacks/glx/stairs.c
b/hacks/glx/stairs.c
index 49a1542fc81509a26867916824757714ea846c0d..7b6fbe2fe2aaf199f097ece2ed42c5dbd2be7722 100644
(file)
--- a/
hacks/glx/stairs.c
+++ b/
hacks/glx/stairs.c
@@
-71,8
+71,8
@@
static const char sccsid[] = "@(#)stairs.c 4.07 97/11/24 xlockmore";
#if 0
#include "e_textures.h"
#else
#if 0
#include "e_textures.h"
#else
-#include "x
pm-ximage
.h"
-#include "
../images/wood.xpm
"
+#include "x
image-loader
.h"
+#include "
images/gen/wood_png.h
"
#endif
#include "sphere.h"
#endif
#include "sphere.h"
@@
-412,16
+412,11
@@
pinit(ModeInfo *mi)
check_gl_error("mipmapping");
#else
{
check_gl_error("mipmapping");
#else
{
- XImage *img = xpm_to_ximage (mi->dpy,
- mi->xgwa.visual,
- mi->xgwa.colormap,
- wood_texture);
+ XImage *img = image_data_to_ximage (mi->dpy, mi->xgwa.visual,
+ wood_png, sizeof(wood_png));
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
img->width, img->height, 0,
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
img->width, img->height, 0,
- GL_RGBA,
- /* GL_UNSIGNED_BYTE, */
- GL_UNSIGNED_INT_8_8_8_8_REV,
- img->data);
+ GL_RGBA, GL_UNSIGNED_BYTE, img->data);
check_gl_error("texture");
XDestroyImage (img);
}
check_gl_error("texture");
XDestroyImage (img);
}