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/qglfunctions.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/qglfunctions.h')
| -rw-r--r-- | src/opengl/qglfunctions.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index 2bb6119b29..e789d4020d 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -419,7 +419,7 @@ struct QGLFunctionsPrivate inline void QGLFunctions::glActiveTexture(GLenum texture) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) ::glActiveTexture(texture); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); @@ -449,7 +449,7 @@ inline void QGLFunctions::glBindAttribLocation(GLuint program, GLuint index, con inline void QGLFunctions::glBindBuffer(GLenum target, GLuint buffer) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) ::glBindBuffer(target, buffer); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); @@ -519,7 +519,7 @@ inline void QGLFunctions::glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLen inline void QGLFunctions::glBufferData(GLenum target, qgl_GLsizeiptr size, const void* data, GLenum usage) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) ::glBufferData(target, size, data, usage); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); @@ -529,7 +529,7 @@ inline void QGLFunctions::glBufferData(GLenum target, qgl_GLsizeiptr size, const inline void QGLFunctions::glBufferSubData(GLenum target, qgl_GLintptr offset, qgl_GLsizeiptr size, const void* data) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) ::glBufferSubData(target, offset, size, data); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); @@ -568,7 +568,7 @@ inline void QGLFunctions::glCompileShader(GLuint shader) inline void QGLFunctions::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) ::glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); @@ -578,7 +578,7 @@ inline void QGLFunctions::glCompressedTexImage2D(GLenum target, GLint level, GLe inline void QGLFunctions::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) ::glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); @@ -608,7 +608,7 @@ inline GLuint QGLFunctions::glCreateShader(GLenum type) inline void QGLFunctions::glDeleteBuffers(GLsizei n, const GLuint* buffers) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) ::glDeleteBuffers(n, buffers); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); @@ -717,7 +717,7 @@ inline void QGLFunctions::glFramebufferTexture2D(GLenum target, GLenum attachmen inline void QGLFunctions::glGenBuffers(GLsizei n, GLuint* buffers) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) ::glGenBuffers(n, buffers); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); @@ -947,7 +947,7 @@ inline void QGLFunctions::glGetVertexAttribPointerv(GLuint index, GLenum pname, inline GLboolean QGLFunctions::glIsBuffer(GLuint buffer) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) return ::glIsBuffer(buffer); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); @@ -1027,7 +1027,7 @@ inline void QGLFunctions::glRenderbufferStorage(GLenum target, GLenum internalfo inline void QGLFunctions::glSampleCoverage(GLclampf value, GLboolean invert) { -#if defined(QT_OPENGL_ES_1) || defined(QT_OPENGL_ES_2) +#if defined(QT_OPENGL_ES_2) ::glSampleCoverage(value, invert); #else Q_ASSERT(QGLFunctions::isInitialized(d_ptr)); |