mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "tdf#105162: Need to call epoxy_handle_external_wglMakeCurrent()"

Browse Source 
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
This commit is contained in:
Tor Lillqvist
2017-04-04 13:24:22 +03:00
parent 1bf7f6a1a5
commit a29f494326
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dtrans/Library_dnd.mk
View File

@@ -32,7 +32,6 @@ $(eval $(call gb_Library_use_libraries,dnd,\
cppu \ cppu \
cppuhelper \ cppuhelper \
sal \ sal \
vcl \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
@@ -49,10 +48,6 @@ $(eval $(call gb_Library_use_static_libraries,dnd,\
dtobj \ dtobj \
)) ))
$(eval $(call gb_Library_use_externals,dnd,\
epoxy \
))
$(eval $(call gb_Library_add_exception_objects,dnd,\ $(eval $(call gb_Library_add_exception_objects,dnd,\
dtrans/source/win32/dnd/dndentry \ dtrans/source/win32/dnd/dndentry \
dtrans/source/win32/dnd/globals \ dtrans/source/win32/dnd/globals \

5
dtrans/source/win32/dnd/sourcecontext.cxx
View File

@@ -19,9 +19,6 @@
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <epoxy/wgl.h>
#include <vcl/opengl/OpenGLWrapper.hxx>
#include "sourcecontext.hxx" #include "sourcecontext.hxx"
using namespace com::sun::star::datatransfer::dnd; using namespace com::sun::star::datatransfer::dnd;
@@ -74,8 +71,6 @@ void SAL_CALL SourceContext::transferablesFlavorsChanged( )
// Fires XDragSourceListener::dragDropEnd events. // Fires XDragSourceListener::dragDropEnd events.
void SourceContext::fire_dragDropEnd( bool success, sal_Int8 effect) void SourceContext::fire_dragDropEnd( bool success, sal_Int8 effect)
{ {
if( OpenGLWrapper::isVCLOpenGLEnabled() )
epoxy_handle_external_wglMakeCurrent();
DragSourceDropEvent e; DragSourceDropEvent e;