1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dynamic opengl build

Browse Source 
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>
This commit is contained in:
Laszlo Agocs 2014-03-13 11:57:49 +01:00 committed by The Qt Project
parent d7eb0a632a
commit f1f603bd0b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/opengl/qopenglfunctions.cpp
View File

@ -3155,8 +3155,7 @@ static void QOPENGLF_APIENTRY qopenglfResolveGetBufferSubData(GLenum target, qop
(target, offset, size, data); (target, offset, size, data);
} }
#if !defined(QT_OPENGL_ES_2) && !defined(QT_OPENGL_DYNAMIC) #ifndef QT_OPENGL_ES_2
// Desktop only // Desktop only
static void QOPENGLF_APIENTRY qopenglfResolveGetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint *params) 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); RESOLVE_FUNC_VOID(0, GetTexLevelParameteriv)(target, level, pname, params);
} }
#ifndef QT_OPENGL_DYNAMIC
// Special translation functions for ES-specific calls on desktop GL // Special translation functions for ES-specific calls on desktop GL
static void QOPENGLF_APIENTRY qopenglfTranslateClearDepthf(GLclampf depth) static void QOPENGLF_APIENTRY qopenglfTranslateClearDepthf(GLclampf depth)
@ -3176,7 +3176,9 @@ static void QOPENGLF_APIENTRY qopenglfTranslateDepthRangef(GLclampf zNear, GLcla
::glDepthRange(zNear, zFar); ::glDepthRange(zNear, zFar);
} }
#endif // !ES2 && !DYNAMIC #endif // QT_OPENGL_DYNAMIC
#endif // QT_OPENGL_ES2
QOpenGLFunctionsPrivate::QOpenGLFunctionsPrivate(QOpenGLContext *) QOpenGLFunctionsPrivate::QOpenGLFunctionsPrivate(QOpenGLContext *)
{ {