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.34.tar.gz
[xscreensaver]
/
hacks
/
glx
/
jwzgles.c
diff --git
a/hacks/glx/jwzgles.c
b/hacks/glx/jwzgles.c
index 094192c76ba61cc2feaba1d6d751ea2460e4ab9d..5b0b51a5dfc2a6506a92c2f1f0da7147385d08c4 100644
(file)
--- a/
hacks/glx/jwzgles.c
+++ b/
hacks/glx/jwzgles.c
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 2012-201
4
Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2012-201
5
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
@@
-1588,6
+1588,12
@@
jwzgles_glVertex2f (GLfloat x, GLfloat y)
jwzgles_glVertex3fv (v);
}
jwzgles_glVertex3fv (v);
}
+void
+jwzgles_glVertex2dv (const GLdouble *v)
+{
+ jwzgles_glVertex2f (v[0], v[1]);
+}
+
void
jwzgles_glVertex2fv (const GLfloat *v)
{
void
jwzgles_glVertex2fv (const GLfloat *v)
{
@@
-3977,6
+3983,15
@@
jwzgles_gluProject (GLdouble objx, GLdouble objy, GLdouble objz,
}
}
+void jwzgles_glViewport (GLuint x, GLuint y, GLuint w, GLuint h)
+{
+# if TARGET_IPHONE_SIMULATOR
+/* fprintf (stderr, "glViewport %dx%d\n", w, h); */
+# endif
+ glViewport (x, y, w, h); /* the real one */
+}
+
+
/* The following functions are present in both OpenGL 1.1 and in OpenGLES 1,
but are allowed within glNewList/glEndList, so we must wrap them to allow
them to either be recorded in lists, or run directly.
/* The following functions are present in both OpenGL 1.1 and in OpenGLES 1,
but are allowed within glNewList/glEndList, so we must wrap them to allow
them to either be recorded in lists, or run directly.
@@
-4143,7
+4158,6
@@
WRAP (glStencilOp, III)
WRAP (glTexEnvf, IIF)
WRAP (glTexEnvi, III)
WRAP (glTranslatef, FFF)
WRAP (glTexEnvf, IIF)
WRAP (glTexEnvi, III)
WRAP (glTranslatef, FFF)
-WRAP (glViewport, IIII)
#undef TYPE_IV
#define TYPE_IV GLuint
WRAP (glDeleteTextures, IIV)
#undef TYPE_IV
#define TYPE_IV GLuint
WRAP (glDeleteTextures, IIV)