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
/
winduprobot.c
diff --git
a/hacks/glx/winduprobot.c
b/hacks/glx/winduprobot.c
index d8b7f649be421bce409b5c5bb1155073579cf1ed..61091cfce9cdb34f048c3329a7aae8a0b2c9f4aa 100644
(file)
--- a/
hacks/glx/winduprobot.c
+++ b/
hacks/glx/winduprobot.c
@@
-1,4
+1,4
@@
-/* winduprobot, Copyright (c) 2014-201
7
Jamie Zawinski <jwz@jwz.org>
+/* winduprobot, Copyright (c) 2014-201
8
Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-81,7
+81,7
@@
#include "xlockmore.h"
#include "gltrackball.h"
#include "xlockmore.h"
#include "gltrackball.h"
-#include "x
pm-ximage
.h"
+#include "x
image-loader
.h"
#include "involute.h"
#include "sphere.h"
#include "involute.h"
#include "sphere.h"
@@
-97,7
+97,7
@@
#endif
#ifdef HAVE_TEXTURE
#endif
#ifdef HAVE_TEXTURE
-# include "
../images/chromesphere.xpm
"
+# include "
images/gen/chromesphere_png.h
"
#endif
#ifdef USE_GL /* whole file */
#endif
#ifdef USE_GL /* whole file */
@@
-319,8
+319,8
@@
load_textures (ModeInfo *mi)
robot_configuration *bp = &bps[MI_SCREEN(mi)];
XImage *xi;
robot_configuration *bp = &bps[MI_SCREEN(mi)];
XImage *xi;
- xi =
xpm_to_ximage (mi->dpy, mi->xgwa.visual, mi->xgwa.colormap
,
-
chromesphere_xpm
);
+ xi =
image_data_to_ximage (mi->dpy, mi->xgwa.visual
,
+
chromesphere_png, sizeof(chromesphere_png)
);
clear_gl_error();
glGenTextures (1, &bp->chrome_texture);
clear_gl_error();
glGenTextures (1, &bp->chrome_texture);
@@
-330,13
+330,7
@@
load_textures (ModeInfo *mi)
glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
xi->width, xi->height, 0,
glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
xi->width, xi->height, 0,
- GL_RGBA,
-# ifndef USE_IPHONE
- GL_UNSIGNED_INT_8_8_8_8_REV,
-# else
- GL_UNSIGNED_BYTE,
-# endif
- xi->data);
+ GL_RGBA, GL_UNSIGNED_BYTE, xi->data);
check_gl_error("texture");
glEnable(GL_TEXTURE_GEN_S);
check_gl_error("texture");
glEnable(GL_TEXTURE_GEN_S);