summaryrefslogtreecommitdiff
path: root/src/gui/opengl/qopenglvertexarrayobject.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2016-02-02 15:15:52 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2016-03-01 14:46:29 +0000
commit8115a3b4442c44b6b2f6ab55a0d083a26c14ed6f (patch)
tree3526114beedc639f85b1aee5f9fd5258463190c9 /src/gui/opengl/qopenglvertexarrayobject.cpp
parent5e9a5246fb688a33ff27bed010226595f579f23d (diff)
downloadqtbase-8115a3b4442c44b6b2f6ab55a0d083a26c14ed6f.tar.gz
Get rid of the gles3helper class
Since the backends can now resolve all possible GL functions, there's no need for the special handling for GLES that this class did anymore. Change-Id: Ib48aecc9a892f3c883d76ffc82217f346dbb3adc Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Diffstat (limited to 'src/gui/opengl/qopenglvertexarrayobject.cpp')
-rw-r--r--src/gui/opengl/qopenglvertexarrayobject.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/opengl/qopenglvertexarrayobject.cpp b/src/gui/opengl/qopenglvertexarrayobject.cpp
index fe1e308532..fc2be598e9 100644
--- a/src/gui/opengl/qopenglvertexarrayobject.cpp
+++ b/src/gui/opengl/qopenglvertexarrayobject.cpp
@@ -63,11 +63,11 @@ void qtInitializeVertexArrayObjectHelper(QOpenGLVertexArrayObjectHelper *helper,
if (context->isOpenGLES()) {
if (context->format().majorVersion() >= 3) {
- QOpenGLES3Helper *es3 = static_cast<QOpenGLExtensions *>(context->functions())->gles3Helper();
- helper->GenVertexArrays = es3->GenVertexArrays;
- helper->DeleteVertexArrays = es3->DeleteVertexArrays;
- helper->BindVertexArray = es3->BindVertexArray;
- helper->IsVertexArray = es3->IsVertexArray;
+ QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
+ helper->GenVertexArrays = extra->GenVertexArrays;
+ helper->DeleteVertexArrays = extra->DeleteVertexArrays;
+ helper->BindVertexArray = extra->BindVertexArray;
+ helper->IsVertexArray = extra->IsVertexArray;
tryARB = false;
} else if (context->hasExtension(QByteArrayLiteral("GL_OES_vertex_array_object"))) {
helper->GenVertexArrays = reinterpret_cast<QOpenGLVertexArrayObjectHelper::qt_GenVertexArrays_t>(context->getProcAddress("glGenVertexArraysOES"));