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>
This commit is contained in:
parent
d7eb0a632a
commit
f1f603bd0b
@ -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 *)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user