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

Fixed QOpenGLFunctions API.

Browse Source 
We don't use the GL short term in the new API.

Change-Id: I73a51f65f5f4216c1763b95dcddf68fe8fc229d1
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
This commit is contained in:
Samuel Rødal 2012-06-12 10:21:37 +02:00 committed by Qt by Nokia
parent 7967cb4f48
commit 95427b0f40
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/opengl/qopenglframebufferobject.cpp
View File

@ -384,7 +384,7 @@ void QOpenGLFramebufferObjectPrivate::init(QOpenGLFramebufferObject *, const QSi
{ {
QOpenGLContext *ctx = QOpenGLContext::currentContext(); QOpenGLContext *ctx = QOpenGLContext::currentContext();
funcs.initializeGLFunctions(); funcs.initializeOpenGLFunctions();
if (!funcs.hasOpenGLFeature(QOpenGLFunctions::Framebuffers)) if (!funcs.hasOpenGLFeature(QOpenGLFunctions::Framebuffers))
return; return;

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

@ -446,10 +446,10 @@ bool QOpenGLExtensions::hasOpenGLExtension(QOpenGLExtensions::OpenGLExtension ex
After calling this function, the QOpenGLFunctions object can only be After calling this function, the QOpenGLFunctions object can only be
used with the current context and other contexts that share with it. used with the current context and other contexts that share with it.
Call initializeGLFunctions() again to change the object's context Call initializeOpenGLFunctions() again to change the object's context
association. association.
*/ */
void QOpenGLFunctions::initializeGLFunctions() void QOpenGLFunctions::initializeOpenGLFunctions()
{ {
d_ptr = qt_gl_functions(); d_ptr = qt_gl_functions();
} }

6
src/gui/opengl/qopenglfunctions.h
View File

@ -224,7 +224,11 @@ public:
QOpenGLFunctions::OpenGLFeatures openGLFeatures() const; QOpenGLFunctions::OpenGLFeatures openGLFeatures() const;
bool hasOpenGLFeature(QOpenGLFunctions::OpenGLFeature feature) const; bool hasOpenGLFeature(QOpenGLFunctions::OpenGLFeature feature) const;
void initializeGLFunctions(); void initializeOpenGLFunctions();
#if QT_DEPRECATED_SINCE(5, 0)
QT_DEPRECATED void initializeGLFunctions() { initializeOpenGLFunctions(); }
#endif
void glActiveTexture(GLenum texture); void glActiveTexture(GLenum texture);
void glAttachShader(GLuint program, GLuint shader); void glAttachShader(GLuint program, GLuint shader);

2
src/gui/opengl/qopenglpaintengine.cpp
View File

@ -1924,7 +1924,7 @@ bool QOpenGL2PaintEngineEx::begin(QPaintDevice *pdev)
d->ctx = QOpenGLContext::currentContext(); d->ctx = QOpenGLContext::currentContext();
d->ctx->d_func()->active_engine = this; d->ctx->d_func()->active_engine = this;
d->funcs.initializeGLFunctions(); d->funcs.initializeOpenGLFunctions();
for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i)
d->vertexAttributeArraysEnabledState[i] = false; d->vertexAttributeArraysEnabledState[i] = false;

2
src/gui/opengl/qopenglshaderprogram.cpp
View File

@ -594,7 +594,7 @@ bool QOpenGLShaderProgram::init()
QOpenGLContext *context = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext()); QOpenGLContext *context = const_cast<QOpenGLContext *>(QOpenGLContext::currentContext());
if (!context) if (!context)
return false; return false;
d->glfuncs->initializeGLFunctions(); d->glfuncs->initializeOpenGLFunctions();
GLuint program = d->glfuncs->glCreateProgram(); GLuint program = d->glfuncs->glCreateProgram();
if (!program) { if (!program) {
qWarning() << "QOpenGLShaderProgram: could not create shader program"; qWarning() << "QOpenGLShaderProgram: could not create shader program";