diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-16 12:53:04 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-16 15:44:26 +0200 |
| commit | 0d5170256c1658b0f6e0d3f6c736de01655b29d8 (patch) | |
| tree | 79f6252ffbda9eeb1ce54fc9987618fdc7e58be2 /src/opengl/qglextensions_p.h | |
| parent | 06f6b71ba43e8302d61d2c3cb7118d9dbf7a3c98 (diff) | |
Get rid of OpenGL 1.x engine and platform code from QtOpenGL.
Change-Id: I646b8e26d5e7214432a044866764d57cc11b2390
Reviewed-on: http://codereview.qt.nokia.com/3006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/opengl/qglextensions_p.h')
| -rw-r--r-- | src/opengl/qglextensions_p.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/opengl/qglextensions_p.h b/src/opengl/qglextensions_p.h index 98433c366d..2ef8a0169c 100644 --- a/src/opengl/qglextensions_p.h +++ b/src/opengl/qglextensions_p.h @@ -68,11 +68,6 @@ # define APIENTRYP * #endif -#ifndef QT_NO_EGL -// Needed for EGLImageKHR definition: -#include <QtGui/private/qegl_p.h> -#endif - #include <QtCore/qglobal.h> #ifndef GL_ARB_vertex_buffer_object @@ -214,15 +209,6 @@ typedef void (APIENTRY *_glFramebufferTextureFaceEXT)(GLenum target, GLenum atta // ARB_texture_compression typedef void (APIENTRY *_glCompressedTexImage2DARB) (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); - -#ifndef QT_NO_EGL -// OES_EGL_image -// Note: We define these to take EGLImage whereas spec says they take a new GLeglImageOES -// type, which the EGL image should be cast to. -typedef void (APIENTRY *_glEGLImageTargetTexture2DOES) (GLenum, EGLImageKHR); -typedef void (APIENTRY *_glEGLImageTargetRenderbufferStorageOES) (GLenum, EGLImageKHR); -#endif - QT_BEGIN_NAMESPACE struct QGLExtensionFuncs @@ -340,12 +326,6 @@ struct QGLExtensionFuncs // Texture compression qt_glCompressedTexImage2DARB = 0; #endif - -#ifndef QT_NO_EGL - // OES_EGL_image - qt_glEGLImageTargetTexture2DOES = 0; - qt_glEGLImageTargetRenderbufferStorageOES = 0; -#endif } @@ -466,12 +446,6 @@ struct QGLExtensionFuncs // Texture compression _glCompressedTexImage2DARB qt_glCompressedTexImage2DARB; #endif - -#ifndef QT_NO_EGL - // OES_EGL_image - _glEGLImageTargetTexture2DOES qt_glEGLImageTargetTexture2DOES; - _glEGLImageTargetRenderbufferStorageOES qt_glEGLImageTargetRenderbufferStorageOES; -#endif }; @@ -880,12 +854,6 @@ struct QGLExtensionFuncs #define glCompressedTexImage2D QGLContextPrivate::extensionFuncs(ctx).qt_glCompressedTexImage2DARB #endif -#ifndef QT_NO_EGL -// OES_EGL_image -#define glEGLImageTargetTexture2DOES QGLContextPrivate::extensionFuncs(ctx).qt_glEGLImageTargetTexture2DOES -#define glEGLImageTargetRenderbufferStorageOES QGLContextPrivate::extensionFuncs(ctx).qt_glEGLImageTargetRenderbufferStorageOES -#endif - extern bool qt_resolve_framebufferobject_extensions(QGLContext *ctx); bool Q_OPENGL_EXPORT qt_resolve_buffer_extensions(QGLContext *ctx); @@ -896,10 +864,6 @@ bool qt_resolve_frag_program_extensions(QGLContext *ctx); bool qt_resolve_glsl_extensions(QGLContext *ctx); -#ifndef QT_NO_EGL -Q_OPENGL_EXPORT bool qt_resolve_eglimage_gl_extensions(QGLContext *ctx); -#endif - QT_END_NAMESPACE #endif // QGL_EXTENSIONS_P_H |