From d98bfedfe4b2ba3c19ab37ec555bacab2e5fe250 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Wed, 3 Feb 2016 09:19:04 +0100
Subject: Generate more compact code to resolve the QOpenGLExtraFunctions

Similar to the parent commit, this reduces binary size significantly.

Change-Id: Idd6753ec5e04ec84d93bf6f86b5c71550b90ae9b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
 src/gui/opengl/qopengltexturehelper.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/gui/opengl/qopengltexturehelper.cpp')

diff --git a/src/gui/opengl/qopengltexturehelper.cpp b/src/gui/opengl/qopengltexturehelper.cpp
index ff848db0b99..23e5ef65799 100644
--- a/src/gui/opengl/qopengltexturehelper.cpp
+++ b/src/gui/opengl/qopengltexturehelper.cpp
@@ -185,8 +185,8 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
     if (ctx->format().majorVersion() >= 3) {
         // OpenGL ES 3.0+ has immutable storage for 2D and 3D at least.
         QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
-        TexStorage3D = extra->TexStorage3D;
-        TexStorage2D = extra->TexStorage2D;
+        TexStorage3D = extra->f.TexStorage3D;
+        TexStorage2D = extra->f.TexStorage2D;
     } else {
         TexStorage3D = 0;
         TexStorage2D = 0;
@@ -211,10 +211,10 @@ QOpenGLTextureHelper::QOpenGLTextureHelper(QOpenGLContext *context)
         if (ctx->isOpenGLES() && ctx->format().majorVersion() >= 3) {
             // OpenGL ES 3.0+ has glTexImage3D.
             QOpenGLExtraFunctionsPrivate *extra = static_cast<QOpenGLExtensions *>(context->extraFunctions())->d();
-            TexImage3D = extra->TexImage3D;
-            TexSubImage3D = extra->TexSubImage3D;
-            CompressedTexImage3D = extra->CompressedTexImage3D;
-            CompressedTexSubImage3D = extra->CompressedTexSubImage3D;
+            TexImage3D = extra->f.TexImage3D;
+            TexSubImage3D = extra->f.TexSubImage3D;
+            CompressedTexImage3D = extra->f.CompressedTexImage3D;
+            CompressedTexSubImage3D = extra->f.CompressedTexSubImage3D;
         } else {
             // OpenGL 1.2
             TexImage3D = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint , GLint , GLsizei , GLsizei , GLsizei , GLint , GLenum , GLenum , const GLvoid *)>(context->getProcAddress("glTexImage3D"));
-- 
cgit v1.2.3