diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-07 07:32:00 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-10 07:59:32 +0100 |
| commit | 88cd7f366e35a731c780f94aa2f5435ef061f6a9 (patch) | |
| tree | 99aa1e4be38dbc41748171791a5e1ef83c4655a1 /include | |
| parent | e5890fcec5c7fabad07080f1ab2e97ee2526248c (diff) | |
use GLXPixmap for VirtualDevice
Change-Id: I6397708f164be68bd6561a382115654f90ecd471
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index b9c03c33afe8..5ca96020fb4d 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -102,14 +102,16 @@ struct GLWindow #elif defined( IOS ) #elif defined( ANDROID ) #elif defined( UNX ) - Display* dpy; - int screen; - Window win; + Display* dpy; + int screen; + Window win; + Pixmap pix; #if defined( GLX_EXT_texture_from_pixmap ) GLXFBConfig fbc; #endif XVisualInfo* vi; GLXContext ctx; + GLXPixmap glPix; bool HasGLXExtension( const char* name ) { return checkExtension( (const GLubyte*) name, (const GLubyte*) GLXExtensions ); } const char* GLXExtensions; @@ -135,6 +137,7 @@ struct GLWindow #endif vi(NULL), ctx(0), + glPix(0), GLXExtensions(NULL), #endif bpp(0), @@ -165,6 +168,7 @@ public: // only in vcl's platform code #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID bool init(Display* dpy, Window win, int screen); + bool init(Display* dpy, Pixmap pix, unsigned int width, unsigned int height, int nScreen); #elif defined( _WIN32 ) bool init( HDC hDC, HWND hWnd ); #endif @@ -214,6 +218,9 @@ private: bool mbRequestLegacyContext; bool mbUseDoubleBufferedRendering; bool mbRequestVirtualDevice; +#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID + bool mbPixmap; // is a pixmap instead of a window +#endif }; #endif |