[Libreoffice-commits] core.git: 2 commits - dtrans/Library_dnd.mk dtrans/source vcl/opengl

[Tor Lillqvist]

 dtrans/Library_dnd.mk                     |    5 -----
 dtrans/source/win32/dnd/sourcecontext.cxx |    5 -----
 vcl/opengl/win/gdiimpl.cxx                |    2 ++
 3 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit d226cfacfd66d5c81d37f707b95f318efe32e5ba
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 4 13:34:24 2017 +0300

    tdf#105162: Need to call epoxy_handle_external_wglMakeCurrent()
    
    Somewhere, in time before calling epoxy-wrapper OpenGL functions. This
    seems to be a good place. Educated guess based on debugging, turned
    out to work.
    
    Change-Id: Id3f1dfb0c5a9dbfb166c47ea81db902af1a4fc08

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 4209e0c41c49..5a5516db63de 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -96,6 +96,8 @@ void WinOpenGLContext::makeCurrent()
 
     clearCurrent();
 
+    epoxy_handle_external_wglMakeCurrent();
+
     if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
     {
         g_bAnyCurrent = false;
commit a29f494326b3ed8eba809131b799b649e88b9b85
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 4 13:24:22 2017 +0300

    Revert "tdf#105162: Need to call epoxy_handle_external_wglMakeCurrent()"
    
    It worked (for the specific case in the bug report), but for a more
    generic fix that covers also other similar cases (where VCL code gets
    called in threads that epoxy doesn't know about, or something), it's
    better to call epoxy_handle_external_wglMakeCurrent() in vcl, instead
    of all over the place in thread callbacks.
    
    This reverts commit 78c67c6bbba0eaa418c573637858828b274b3c72.
    
    Change-Id: Iaad7b3d1191847b9d3f1e74c3339de9f16194aed

diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 689bbe6303f4..9ce6c4439e05 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,dnd,\
 	cppu \
 	cppuhelper \
 	sal \
-	vcl \
 	$(gb_UWINAPI) \
 ))
 
@@ -49,10 +48,6 @@ $(eval $(call gb_Library_use_static_libraries,dnd,\
 	dtobj \
 ))
 
-$(eval $(call gb_Library_use_externals,dnd,\
-	epoxy \
- ))
-
 $(eval $(call gb_Library_add_exception_objects,dnd,\
 	dtrans/source/win32/dnd/dndentry \
 	dtrans/source/win32/dnd/globals \
diff --git a/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx
index ea90087d7193..08adfaaea0cb 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/dtrans/source/win32/dnd/sourcecontext.cxx
@@ -19,9 +19,6 @@
 
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 
-#include <epoxy/wgl.h>
-#include <vcl/opengl/OpenGLWrapper.hxx>
-
 #include "sourcecontext.hxx"
 
 using namespace com::sun::star::datatransfer::dnd;
@@ -74,8 +71,6 @@ void SAL_CALL SourceContext::transferablesFlavorsChanged(  )
 // Fires XDragSourceListener::dragDropEnd events.
 void SourceContext::fire_dragDropEnd( bool success, sal_Int8 effect)
 {
-    if( OpenGLWrapper::isVCLOpenGLEnabled() )
-        epoxy_handle_external_wglMakeCurrent();
 
     DragSourceDropEvent e;