projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://packetstorm.tacticalflex.com/UNIX/admin/xscreensaver-3.27.tar.gz
[xscreensaver]
/
hacks
/
glx
/
glplanet.c
diff --git
a/hacks/glx/glplanet.c
b/hacks/glx/glplanet.c
index f7d02557b4f6c1ae96cc6eae9182ae23fcd6d3f6..ad26b3d667f7f4b44ed5814de1af04617c209540 100644
(file)
--- a/
hacks/glx/glplanet.c
+++ b/
hacks/glx/glplanet.c
@@
-237,8
+237,10
@@
setup_xbm_texture (char *bits, int width, int height,
*out++ = (word & 0x0000FF);
}
*out++ = (word & 0x0000FF);
}
+ clear_gl_error();
glTexImage2D(GL_TEXTURE_2D, 0, 3, width, height, 0,
GL_RGB, GL_UNSIGNED_BYTE, data);
glTexImage2D(GL_TEXTURE_2D, 0, 3, width, height, 0,
GL_RGB, GL_UNSIGNED_BYTE, data);
+ check_gl_error("texture");
/* setup parameters for texturing */
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
/* setup parameters for texturing */
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
@@
-266,9
+268,11
@@
setup_file_texture (ModeInfo *mi, char *filename)
{
XImage *image = xpm_to_ximage (dpy, visual, cmap, xpm_data);
{
XImage *image = xpm_to_ximage (dpy, visual, cmap, xpm_data);
+ clear_gl_error();
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
image->width, image->height, 0,
GL_RGBA, GL_UNSIGNED_BYTE, image->data);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
image->width, image->height, 0,
GL_RGBA, GL_UNSIGNED_BYTE, image->data);
+ check_gl_error("texture");
/* setup parameters for texturing */
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
/* setup parameters for texturing */
glPixelStorei(GL_UNPACK_ALIGNMENT, 4);