equal
deleted
inserted
replaced
78 #define vt2f(x) X2FLOAT(x) |
78 #define vt2f(x) X2FLOAT(x) |
79 #define q_vertexType GLfixed |
79 #define q_vertexType GLfixed |
80 #define q_vertexTypeEnum GL_FIXED |
80 #define q_vertexTypeEnum GL_FIXED |
81 #endif //QT_OPENGL_ES_1_CL |
81 #endif //QT_OPENGL_ES_1_CL |
82 |
82 |
83 #ifdef QT_OPENGL_ES |
83 #if defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2) |
84 QT_BEGIN_INCLUDE_NAMESPACE |
84 QT_BEGIN_INCLUDE_NAMESPACE |
|
85 |
85 #if defined(QT_OPENGL_ES_2) |
86 #if defined(QT_OPENGL_ES_2) |
86 #include <EGL/egl.h> |
87 # include <GLES2/gl2.h> |
|
88 #endif |
|
89 |
|
90 #if defined(QT_GLES_EGL) |
|
91 # include <GLES/egl.h> |
87 #else |
92 #else |
88 #include <GLES/egl.h> |
93 # include <EGL/egl.h> |
89 #endif |
94 #endif |
|
95 |
90 QT_END_INCLUDE_NAMESPACE |
96 QT_END_INCLUDE_NAMESPACE |
91 #endif |
97 #endif |
92 |
98 |
93 QT_BEGIN_NAMESPACE |
99 QT_BEGIN_NAMESPACE |
94 |
100 |
570 : GL_TEXTURE_2D; |
576 : GL_TEXTURE_2D; |
571 #endif |
577 #endif |
572 } |
578 } |
573 |
579 |
574 // One resource per group of shared contexts. |
580 // One resource per group of shared contexts. |
575 class Q_AUTOTEST_EXPORT QGLContextResource |
581 class Q_OPENGL_EXPORT QGLContextResource |
576 { |
582 { |
577 public: |
583 public: |
578 typedef void (*FreeFunc)(void *); |
584 typedef void (*FreeFunc)(void *); |
579 QGLContextResource(FreeFunc f); |
585 QGLContextResource(FreeFunc f); |
580 ~QGLContextResource(); |
586 ~QGLContextResource(); |