FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added EGL support into build system for GLES1 + GLES2.

Browse Source 
Added EGL support into GraphicsWindowX11.
This commit is contained in:
Robert Osfield
2009-10-30 15:17:38 +00:00
parent 0ca4c82e3a
commit 93d83010f8
14 changed files with 301 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/osgViewer/api/X11/GraphicsWindowX11
View File

@@ -24,7 +24,17 @@
#define GLX_GLXEXT_PROTOTYPES 1
#include <X11/X.h>
#include <GL/glx.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
#define OSG_USE_EGL
#include <EGL/egl.h>
#else
#include <GL/glx.h>
#endif
#include <string.h>
namespace osgViewer
@@ -41,7 +51,10 @@ class OSGVIEWER_EXPORT GraphicsWindowX11 : public osgViewer::GraphicsWindow
_parent(0),
_window(0),
_visualInfo(0),
_glxContext(0),
_context(0),
#ifdef OSG_USE_EGL
_surface(0),
#endif
_currentCursor(0),
_initialized(false),
_realized(false),
@@ -144,7 +157,15 @@ class OSGVIEWER_EXPORT GraphicsWindowX11 : public osgViewer::GraphicsWindow
Window& getParent() { return _parent; }
Window& getWindow() { return _window; }
GLXContext& getGLXContext() { return _glxContext; }
#ifdef OSG_USE_EGL
typedef EGLContext Context;
#else
typedef GLXContext Context;
#endif
Context& getContext() { return _context; }
Cursor getCurrentCursor() { return _currentCursor; }
@@ -180,7 +201,11 @@ class OSGVIEWER_EXPORT GraphicsWindowX11 : public osgViewer::GraphicsWindow
Window _parent;
Window _window;
XVisualInfo* _visualInfo;
GLXContext _glxContext;
Context _context;
#ifdef OSG_USE_EGL
EGLSurface _surface;
#endif
Cursor _currentCursor;

31
include/osgViewer/api/X11/PixelBufferX11
View File

@@ -19,19 +19,14 @@
#ifndef OSGVIEWER_PIXELBUFFERX11
#define OSGVIEWER_PIXELBUFFERX11 1
#include <osg/GraphicsContext>
#include <osgViewer/Export>
#include <osgViewer/api/X11/GraphicsWindowX11>
#define GLX_GLXEXT_PROTOTYPES 1
#include <X11/X.h>
#include <GL/glx.h>
#ifndef GLX_VERSION_1_3
typedef XID GLXPbuffer;
#ifndef OSG_USE_EGL
#ifndef GLX_VERSION_1_3
typedef XID GLXPbuffer;
#endif
#endif
namespace osgViewer
{
@@ -77,8 +72,16 @@ class OSGVIEWER_EXPORT PixelBufferX11 : public osg::GraphicsContext
Display* getDisplay() const { return _display; }
GLXPbuffer& getPbuffer() { return _pbuffer; }
GLXContext& getGLXContext() { return _glxContext; }
#ifdef OSG_USE_EGL
typedef EGLContext Context;
typedef EGLSurface Pbuffer;
#else
typedef GLXContext Context;
typedef GLXPbuffer Pbuffer;
#endif
Pbuffer& getPbuffer() { return _pbuffer; }
Context& getContext() { return _context; }
protected:
@@ -90,9 +93,9 @@ class OSGVIEWER_EXPORT PixelBufferX11 : public osg::GraphicsContext
bool _valid;
Display* _display;
GLXPbuffer _pbuffer;
Pbuffer _pbuffer;
XVisualInfo* _visualInfo;
GLXContext _glxContext;
Context _context;
bool _initialized;
bool _realized;