move the rest of OpenGL VCL code all to one place

Change-Id: I6e4133ea6743edd224d9360bbd1197c950283be1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107399
Tested-by: Luboš Luňák <l.lunak@collabora.com>
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák
2020-12-09 11:50:11 +01:00
parent 16e9375913
commit 65b47341fe
13 changed files with 10 additions and 61 deletions
+4 -29
View File
@@ -14603,21 +14603,8 @@ vcl/inc/implimagetree.hxx
vcl/inc/jobdata.hxx
vcl/inc/jobset.h
vcl/inc/listbox.hxx
vcl/inc/opengl/FixedTextureAtlas.hxx
vcl/inc/opengl/LineRenderUtils.hxx
vcl/inc/opengl/PackedTextureAtlas.hxx
vcl/inc/opengl/RenderList.hxx
vcl/inc/opengl/RenderState.hxx
vcl/inc/opengl/VertexUtils.hxx
vcl/inc/opengl/framebuffer.hxx
vcl/inc/opengl/gdiimpl.hxx
vcl/inc/opengl/program.hxx
vcl/inc/opengl/salbmp.hxx
vcl/inc/opengl/texture.hxx
vcl/inc/opengl/win/WinDeviceInfo.hxx
vcl/inc/opengl/win/gdiimpl.hxx
vcl/inc/opengl/x11/X11DeviceInfo.hxx
vcl/inc/opengl/x11/salvd.hxx
vcl/inc/osx/a11yfactory.h
vcl/inc/osx/a11yfocustracker.hxx
vcl/inc/osx/a11ywrapper.h
@@ -14868,22 +14855,6 @@ vcl/inc/wizdlg.hxx
vcl/ios/dummies.cxx
vcl/ios/iosinst.cxx
vcl/null/printerinfomanager.cxx
vcl/opengl/FixedTextureAtlas.cxx
vcl/opengl/LineRenderUtils.cxx
vcl/opengl/PackedTextureAtlas.cxx
vcl/opengl/RenderList.cxx
vcl/opengl/framebuffer.cxx
vcl/opengl/gdiimpl.cxx
vcl/opengl/program.cxx
vcl/opengl/salbmp.cxx
vcl/opengl/scale.cxx
vcl/opengl/texture.cxx
vcl/opengl/win/WinDeviceInfo.cxx
vcl/opengl/win/gdiimpl.cxx
vcl/opengl/x11/X11DeviceInfo.cxx
vcl/opengl/x11/cairotextrender.cxx
vcl/opengl/x11/gdiimpl.cxx
vcl/opengl/x11/salvd.cxx
vcl/osx/DataFlavorMapping.cxx
vcl/osx/DataFlavorMapping.hxx
vcl/osx/DragSource.cxx
@@ -15142,6 +15113,10 @@ vcl/source/image/ImplImage.cxx
vcl/source/image/ImplImageTree.cxx
vcl/source/opengl/OpenGLContext.cxx
vcl/source/opengl/OpenGLHelper.cxx
vcl/source/opengl/win/WinDeviceInfo.cxx
vcl/source/opengl/win/context.cxx
vcl/source/opengl/x11/X11DeviceInfo.cxx
vcl/source/opengl/x11/context.cxx
vcl/source/outdev/bitmap.cxx
vcl/source/outdev/clipping.cxx
vcl/source/outdev/curvedshapes.cxx
+3 -3
View File
@@ -596,7 +596,7 @@ $(eval $(call gb_Library_use_externals,vcl,\
else # ! DISABLE_GUI
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/DeviceInfo \
vcl/source/opengl/DeviceInfo \
vcl/source/opengl/OpenGLContext \
vcl/source/opengl/OpenGLHelper \
vcl/skia/SkiaHelper \
@@ -617,7 +617,7 @@ $(eval $(call gb_Library_add_libs,vcl,\
-lXext \
))
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/x11/X11DeviceInfo \
vcl/source/opengl/x11/X11DeviceInfo \
))
endif
endif # ! DISABLE_GUI
@@ -709,7 +709,7 @@ endif
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/opengl/win/WinDeviceInfo \
vcl/source/opengl/win/WinDeviceInfo \
vcl/source/app/salplug \
))
+1 -1
View File
@@ -108,7 +108,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
vcl/unx/generic/window/salobj \
vcl/unx/x11/x11sys \
vcl/unx/x11/xlimits \
vcl/opengl/x11/gdiimpl \
vcl/source/opengl/x11/context \
$(if $(filter SKIA,$(BUILD_TYPE)), \
vcl/skia/x11/gdiimpl \
vcl/skia/x11/salvd \
+1 -1
View File
@@ -64,7 +64,7 @@ $(eval $(call gb_Library_use_externals,vclplug_win,\
))
$(eval $(call gb_Library_add_exception_objects,vclplug_win,\
vcl/opengl/win/gdiimpl \
vcl/source/opengl/win/context \
vcl/win/app/saldata \
vcl/win/app/salinfo \
vcl/win/app/salinst \
+1 -1
View File
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
$(eval $(call gb_Package_Package,vcl_opengl_denylist,$(SRCDIR)/vcl/opengl))
$(eval $(call gb_Package_Package,vcl_opengl_denylist,$(SRCDIR)/vcl/source/opengl))
$(eval $(call gb_Package_add_files,vcl_opengl_denylist,$(LIBO_SHARE_FOLDER)/opengl,\
opengl_denylist_windows.xml \
-26
View File
@@ -1,26 +0,0 @@
Run LO with OpenGL enabled
--------------------------
SAL_USE_VCLPLUGIN=gen SAL_FORCEGL=1 ./soffice
Environment variables used:
SAL_USE_VCLPLUGIN - use the specified VCL plugin (GTK2 in this case - currently
needed on Linux because the default GTK3 doesn't support OpenGL yet)
SAL_FORCEGL - enable OpenGL even if the card would be excluded.
Other variables:
LIBGL_ALWAYS_SOFTWARE=1 - on Linux+Mesa forces the software renderer to be used
(this is useful as an alternative to spot driver specific bugs)
SAL_LOG=+INFO.vcl.opengl - if "--enable-dbgutil" is used, this can show OpenGL
various rendering messages.
LD_PRELOAD=/usr/lib64/apitrace/wrappers/glxtrace.so - preload the wrapper for
APItrace. The path is the default used in Fedora 21+.
Run VCLDemo
-----------
SAL_USE_VCLPLUGIN=gen SAL_FORCEGL=1 ./bin/run vcldemo