X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FXScreenSaverGLView.h;h=6e05986f149b41b0c467f043792e364ff0c2dd28;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=365cfba4e9758a0905ce8aa5359c4ea6551220c7;hpb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;p=xscreensaver diff --git a/OSX/XScreenSaverGLView.h b/OSX/XScreenSaverGLView.h index 365cfba4..6e05986f 100644 --- a/OSX/XScreenSaverGLView.h +++ b/OSX/XScreenSaverGLView.h @@ -1,13 +1,13 @@ -/* 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. -*/ +/* xscreensaver, Copyright (c) 2006-2016 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" @@ -22,17 +22,15 @@ # import # import # import -# define NSOpenGLContext EAGLContext #else # import #endif @interface XScreenSaverGLView : XScreenSaverView { - NSOpenGLContext *ogl_ctx; // OpenGL rendering context - # ifdef USE_IPHONE - GLuint gl_framebuffer, gl_renderbuffer, gl_depthbuffer; + GLuint gl_depthbuffer; + BOOL _suppressRotationAnimation; # endif /* USE_IPHONE */ }