diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-03-13 11:57:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-14 22:40:11 +0100 |
| commit | f1f603bd0be50d65cc17c37e42b3bc291a7e748a (patch) | |
| tree | bd45e593486d3a93ea52a6123226f0394df732d2 /src/gui/opengl | |
| parent | d7eb0a632a791d528a819666582a29f4bfed12e4 (diff) | |
Fix dynamic opengl build
Some ifdefs were slightly incorrect.
Change-Id: I5ffb162becb040c91ed56f36c6126c59f67c367a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopenglfunctions.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 84c70606b1..fe6eb4c098 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -3155,8 +3155,7 @@ static void QOPENGLF_APIENTRY qopenglfResolveGetBufferSubData(GLenum target, qop (target, offset, size, data); } -#if !defined(QT_OPENGL_ES_2) && !defined(QT_OPENGL_DYNAMIC) - +#ifndef QT_OPENGL_ES_2 // Desktop only static void QOPENGLF_APIENTRY qopenglfResolveGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params) @@ -3164,6 +3163,7 @@ static void QOPENGLF_APIENTRY qopenglfResolveGetTexLevelParameteriv(GLenum targe RESOLVE_FUNC_VOID(0, GetTexLevelParameteriv)(target, level, pname, params); } +#ifndef QT_OPENGL_DYNAMIC // Special translation functions for ES-specific calls on desktop GL static void QOPENGLF_APIENTRY qopenglfTranslateClearDepthf(GLclampf depth) @@ -3176,7 +3176,9 @@ static void QOPENGLF_APIENTRY qopenglfTranslateDepthRangef(GLclampf zNear, GLcla ::glDepthRange(zNear, zFar); } -#endif // !ES2 && !DYNAMIC +#endif // QT_OPENGL_DYNAMIC + +#endif // QT_OPENGL_ES2 QOpenGLFunctionsPrivate::QOpenGLFunctionsPrivate(QOpenGLContext *) { |