equal
deleted
inserted
replaced
58 QT_BEGIN_INCLUDE_NAMESPACE |
58 QT_BEGIN_INCLUDE_NAMESPACE |
59 #include "QtOpenGL/qglpixelbuffer.h" |
59 #include "QtOpenGL/qglpixelbuffer.h" |
60 #include <private/qgl_p.h> |
60 #include <private/qgl_p.h> |
61 #include <private/qglpaintdevice_p.h> |
61 #include <private/qglpaintdevice_p.h> |
62 |
62 |
63 #if defined(Q_WS_X11) && !defined(QT_OPENGL_ES) |
63 #if defined(Q_WS_X11) && defined(QT_NO_EGL) |
64 #include <GL/glx.h> |
64 #include <GL/glx.h> |
65 |
65 |
66 // The below is needed to for compilation on HPUX, due to broken GLX |
66 // The below is needed to for compilation on HPUX, due to broken GLX |
67 // headers. Some of the systems define GLX_VERSION_1_3 without |
67 // headers. Some of the systems define GLX_VERSION_1_3 without |
68 // defining the GLXFBConfig structure, which is wrong. |
68 // defining the GLXFBConfig structure, which is wrong. |
125 |
125 |
126 #endif // Q_OS_HPUX |
126 #endif // Q_OS_HPUX |
127 |
127 |
128 #elif defined(Q_WS_WIN) |
128 #elif defined(Q_WS_WIN) |
129 DECLARE_HANDLE(HPBUFFERARB); |
129 DECLARE_HANDLE(HPBUFFERARB); |
130 #elif defined(QT_OPENGL_ES_2) |
130 #elif !defined(QT_NO_EGL) |
131 #include <EGL/egl.h> |
131 #include <QtGui/private/qegl_p.h> |
132 #elif defined(QT_OPENGL_ES) |
|
133 #include <GLES/egl.h> |
|
134 #endif |
132 #endif |
135 QT_END_INCLUDE_NAMESPACE |
133 QT_END_INCLUDE_NAMESPACE |
136 |
134 |
137 class QEglContext; |
135 class QEglContext; |
138 |
136 |
172 |
170 |
173 QGLFormat req_format; |
171 QGLFormat req_format; |
174 QPointer<QGLWidget> req_shareWidget; |
172 QPointer<QGLWidget> req_shareWidget; |
175 QSize req_size; |
173 QSize req_size; |
176 |
174 |
177 #if defined(Q_WS_X11) && !defined(QT_OPENGL_ES) |
175 #if defined(Q_WS_X11) && defined(QT_NO_EGL) |
178 GLXPbuffer pbuf; |
176 GLXPbuffer pbuf; |
179 GLXContext ctx; |
177 GLXContext ctx; |
180 #elif defined(Q_WS_WIN) |
178 #elif defined(Q_WS_WIN) |
181 HDC dc; |
179 HDC dc; |
182 bool has_render_texture :1; |
180 bool has_render_texture :1; |
193 AGLPbuffer pbuf; |
191 AGLPbuffer pbuf; |
194 AGLContext ctx; |
192 AGLContext ctx; |
195 AGLContext share_ctx; |
193 AGLContext share_ctx; |
196 # endif |
194 # endif |
197 #endif |
195 #endif |
198 #if defined(QT_OPENGL_ES) |
196 #ifndef QT_NO_EGL |
199 EGLSurface pbuf; |
197 EGLSurface pbuf; |
200 QEglContext *ctx; |
198 QEglContext *ctx; |
201 int textureFormat; |
199 int textureFormat; |
202 #endif |
200 #endif |
203 }; |
201 }; |