[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47289] branches/soc-2012-swiss_cheese/ intern/ghost/intern/GHOST_WindowX11.h: Didn' t include header to prev commit by accidently committing before it was done .

[Alexander Kuznetsov]

Revision: 47289
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47289
Author:   alexk
Date:     2012-05-31 17:26:58 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Didn't include header to prev commit by accidently committing before it was done.

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowX11.h

Modified: branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowX11.h
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowX11.h	2012-05-31 17:24:33 UTC (rev 47288)
+++ branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowX11.h	2012-05-31 17:26:58 UTC (rev 47289)
@@ -35,7 +35,14 @@
 
 #include "GHOST_Window.h"
 #include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
 #include <GL/glx.h>
+
+#ifdef GLES
+#include <EGL/egl.h>
+#endif
+
 // For tablets
 #ifdef WITH_X11_XINPUT
 #  include <X11/extensions/XInput.h>
@@ -353,14 +360,25 @@
 	void initXInputDevices();
 #endif
 	
+#ifdef GLES
+	EGLContext m_context;
+	EGLSurface gl_surface;
+	EGLDisplay gl_display;
+#else
 	GLXContext m_context;
+#endif
+
 	Window m_window;
 	Display     *m_display;
 	XVisualInfo *m_visual;
 	GHOST_TWindowState m_normal_state;
 
 	/** The first created OpenGL context (for sharing display lists) */
+#ifdef GLES
+	static EGLContext s_firstContext;
+#else    
 	static GLXContext s_firstContext;
+#endif
 
 	/// A pointer to the typed system class.