X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FXScreenSaverGLView.h;h=ed8211906591f61ef103db59f0ae0ea68a0d11f2;hp=1f3ac35b91d482b823c952b810b46fde04536e6f;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439 diff --git a/OSX/XScreenSaverGLView.h b/OSX/XScreenSaverGLView.h index 1f3ac35b..ed821190 100644 --- a/OSX/XScreenSaverGLView.h +++ b/OSX/XScreenSaverGLView.h @@ -1,13 +1,13 @@ -/* xscreensaver, Copyright (c) 2006 Jamie Zawinski -* -* Permission to use, copy, modify, distribute, and sell this software and its -* documentation for any purpose is hereby granted without fee, provided that -* the above copyright notice appear in all copies and that both that -* copyright notice and this permission notice appear in supporting -* documentation. No representations are made about the suitability of this -* software for any purpose. It is provided "as is" without express or -* implied warranty. -*/ +/* xscreensaver, Copyright (c) 2006-2012 Jamie Zawinski + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation. No representations are made about the suitability of this + * software for any purpose. It is provided "as is" without express or + * implied warranty. + */ /* This is a subclass of Apple's ScreenSaverView that knows how to run xscreensaver programs without X11 via the dark magic of the "jwxyz" @@ -16,11 +16,24 @@ */ #import "XScreenSaverView.h" -#import + +#ifdef USE_IPHONE +# import +# import +# import +# import +# define NSOpenGLContext EAGLContext +#else +# import +#endif @interface XScreenSaverGLView : XScreenSaverView { - AGLContext agl_ctx; // OpenGL rendering context + NSOpenGLContext *ogl_ctx; // OpenGL rendering context + +# ifdef USE_IPHONE + GLuint gl_framebuffer, gl_renderbuffer, gl_depthbuffer; +# endif /* USE_IPHONE */ } @end