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]
/
jwxyz
/
jwxyz-android.h
diff --git
a/jwxyz/jwxyz-android.h
b/jwxyz/jwxyz-android.h
index 49586d009e8a0181d672b495fed0877575d303be..1f5ae5220b071ee5fa673b66eca7d797968e4a01 100644
(file)
--- a/
jwxyz/jwxyz-android.h
+++ b/
jwxyz/jwxyz-android.h
@@
-21,9
+21,9
@@
#include <GLES/glext.h>
#include <jni.h>
#include <GLES/glext.h>
#include <jni.h>
-/*
Keep synchronized with check-configs.pl and jwxyz.java
. */
-#define
API_XLIB 0
-#define
API_GL 1
+/*
From utils/visual.c
. */
+#define
DEFAULT_VISUAL -1
+#define
GL_VISUAL -6
struct jwxyz_Drawable {
enum { WINDOW, PIXMAP } type;
struct jwxyz_Drawable {
enum { WINDOW, PIXMAP } type;
@@
-49,7
+49,6
@@
struct jwxyz_Drawable {
struct running_hack {
struct xscreensaver_function_table *xsft;
struct running_hack {
struct xscreensaver_function_table *xsft;
- jint api;
Display *dpy;
Window window;
fps_state *fpst;
Display *dpy;
Window window;
fps_state *fpst;
@@
-57,7
+56,7
@@
struct running_hack {
JNIEnv *jni_env;
jobject jobject;
JNIEnv *jni_env;
jobject jobject;
- Bool jwxyz_gl_p;
+ Bool jwxyz_gl_p
, egl_p
;
/* JWXYZ_GL */
EGLContext egl_ctx;
/* JWXYZ_GL */
EGLContext egl_ctx;
@@
-67,9
+66,6
@@
struct running_hack {
EGLConfig egl_config;
EGLConfig egl_config;
- PFNGLBINDFRAMEBUFFEROESPROC glBindFramebufferOES;
- PFNGLFRAMEBUFFERTEXTURE2DOESPROC glFramebufferTexture2DOES;
-
struct jwxyz_Drawable frontbuffer;
GC copy_gc;
Bool gl_fbo_p, frontbuffer_p;
struct jwxyz_Drawable frontbuffer;
GC copy_gc;
Bool gl_fbo_p, frontbuffer_p;