[Libreoffice-commits] core.git: solenv/clang-format vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_win.mk vcl/opengl vcl/Package_opengl_denylist.mk vcl/source

Luboš Luňák (via logerrit) logerrit at kemper.freedesktop.org
Wed Dec 9 10:50:53 UTC 2020 

 solenv/clang-format/excludelist |   33 ++++-----------------------------
 vcl/Library_vcl.mk              |    6 +++---
 vcl/Library_vclplug_gen.mk      |    2 +-
 vcl/Library_vclplug_win.mk      |    2 +-
 vcl/Package_opengl_denylist.mk  |    2 +-
 vcl/opengl/README.opengl        |   26 --------------------------
 6 files changed, 10 insertions(+), 61 deletions(-)

New commits:
commit 65b47341fe668e74430cf12aa84f9357e0dbd6bb
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Tue Dec 8 10:59:17 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Wed Dec 9 11:50:11 2020 +0100

    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 at collabora.com>
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 096f3862d12a..d360794c45b4 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -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
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 927954e7b49b..5d5f8c3f3ca2 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -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 \
 ))
 
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index f4cbaf715661..0b9d23e40de5 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -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 \
diff --git a/vcl/Library_vclplug_win.mk b/vcl/Library_vclplug_win.mk
index 9957c562df73..38031387be4a 100644
--- a/vcl/Library_vclplug_win.mk
+++ b/vcl/Library_vclplug_win.mk
@@ -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 \
diff --git a/vcl/Package_opengl_denylist.mk b/vcl/Package_opengl_denylist.mk
index d5102335f074..bf947dd47bf3 100644
--- a/vcl/Package_opengl_denylist.mk
+++ b/vcl/Package_opengl_denylist.mk
@@ -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 \
diff --git a/vcl/opengl/README.opengl b/vcl/opengl/README.opengl
deleted file mode 100644
index d1b6cf2d1bd1..000000000000
--- a/vcl/opengl/README.opengl
+++ /dev/null
@@ -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
diff --git a/vcl/opengl/DeviceInfo.cxx b/vcl/source/opengl/DeviceInfo.cxx
similarity index 100%
rename from vcl/opengl/DeviceInfo.cxx
rename to vcl/source/opengl/DeviceInfo.cxx
diff --git a/vcl/opengl/README.deprecated b/vcl/source/opengl/README.deprecated
similarity index 100%
rename from vcl/opengl/README.deprecated
rename to vcl/source/opengl/README.deprecated
diff --git a/vcl/opengl/opengl_denylist_windows.xml b/vcl/source/opengl/opengl_denylist_windows.xml
similarity index 100%
rename from vcl/opengl/opengl_denylist_windows.xml
rename to vcl/source/opengl/opengl_denylist_windows.xml
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/source/opengl/win/WinDeviceInfo.cxx
similarity index 100%
rename from vcl/opengl/win/WinDeviceInfo.cxx
rename to vcl/source/opengl/win/WinDeviceInfo.cxx
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/source/opengl/win/context.cxx
similarity index 100%
rename from vcl/opengl/win/gdiimpl.cxx
rename to vcl/source/opengl/win/context.cxx
diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/source/opengl/x11/X11DeviceInfo.cxx
similarity index 100%
rename from vcl/opengl/x11/X11DeviceInfo.cxx
rename to vcl/source/opengl/x11/X11DeviceInfo.cxx
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/source/opengl/x11/context.cxx
similarity index 100%
rename from vcl/opengl/x11/gdiimpl.cxx
rename to vcl/source/opengl/x11/context.cxx

More information about the Libreoffice-commits mailing list