GLX_EXT_texture_from_pixmap path cannot be called...

slideshow mbHasTFPVisual is always false since

commit eccaf91ec9c50d42ce98c90abe2c129bedbbc60e
Date:   Mon May 19 19:21:29 2014 +0200

use VCL's OpenGLContext for 3D transitions

Change-Id: I510518461eb8bc9669d0de2679c34c473f66b175

and GLWindow fbc has always been null since that incarnation of opengl started,
so even if mbHasTFPVisual was true it would crash.

OpenGLHelper::GetPixmapFBConfig is *almost* the same as the old removed code
for setting fbc, but if I use that then for me the transitions still don't work
at all.

Examining further shows GetPixmapFBConfig lacks the test for
GLX_BIND_TO_MIPMAP_TEXTURE_EXT that the old code had.

If I add than, then it "works", but examining *that*, reveals it only works
because GLX_BIND_TO_MIPMAP_TEXTURE_EXT is unsupported on my rig, so the
GLX_EXT_texture_from_pixmap code still doesn't get executed.

I apparently can't test the original working configuration, and I'm not
particularly interested in getting X working and I just wanted to make sure I
didn't break that case, so...

this removes the uncallable since 2014 code entirely rather than try to
fix it.

I suspect this may leave the cairo-canvas CanvasBitmap::getFastPropertyValue
"1" branch now also dead

Change-Id: I6727576056533fa54a4f82378954fb53891f5873

1 files changed, 1 insertions, 7 deletions

diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 00368495a332..10024b3152e5 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -79,9 +79,6 @@ struct VCL_DLLPUBLIC GLWindow
     Display*            dpy;
     int                 screen;
     Window              win;
-#if defined( GLX_EXT_texture_from_pixmap )
-    GLXFBConfig        fbc;
-#endif
     XVisualInfo*       vi;
     GLXContext         ctx;
 
@@ -107,9 +104,6 @@ struct VCL_DLLPUBLIC GLWindow
         dpy(nullptr),
         screen(0),
         win(0),
-#if defined( GLX_EXT_texture_from_pixmap )
-        fbc(nullptr),
-#endif
         vi(nullptr),
         ctx(nullptr),
         GLXExtensions(nullptr),
@@ -195,7 +189,7 @@ public:
 
     void setWinPosAndSize(const Point &rPos, const Size& rSize);
     void setWinSize(const Size& rSize);
-    const GLWindow& getOpenGLWindow() const { return m_aGLWin;}
+    const GLWindow& getOpenGLWindow() const;
 
     SystemChildWindow* getChildWindow();
     const SystemChildWindow* getChildWindow() const;