move opengl vcl files to opengl/

Better to have all of them together rather than scattered.

Change-Id: I1f8bbfb7018a6c28c87e4dfa2acbf4efde62894b

13 files changed, 23 insertions, 22 deletions

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 9edbcba9b7d1..97d55459cc2f 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -17264,6 +17264,7 @@ vcl/inc/opengl/RenderList.hxx
 vcl/inc/opengl/RenderState.hxx
 vcl/inc/opengl/TextureState.hxx
 vcl/inc/opengl/VertexUtils.hxx
+vcl/inc/opengl/gdiimpl.hxx
 vcl/inc/opengl/framebuffer.hxx
 vcl/inc/opengl/program.hxx
 vcl/inc/opengl/salbmp.hxx
@@ -17277,7 +17278,6 @@ vcl/inc/opengl/x11/gdiimpl.hxx
 vcl/inc/opengl/x11/glxtest.hxx
 vcl/inc/opengl/x11/salvd.hxx
 vcl/inc/opengl/zone.hxx
-vcl/inc/openglgdiimpl.hxx
 vcl/inc/osx/a11yfactory.h
 vcl/inc/osx/a11yfocustracker.hxx
 vcl/inc/osx/a11ylistener.hxx
@@ -17401,6 +17401,7 @@ vcl/inc/unx/screensaverinhibitor.hxx
 vcl/inc/unx/sm.hxx
 vcl/inc/unx/svsys.h
 vcl/inc/unx/wmadaptor.hxx
+vcl/inc/unx/x11/x11cairotextrender.hxx
 vcl/inc/unx/x11/x11gdiimpl.h
 vcl/inc/unx/x11/x11sys.hxx
 vcl/inc/unx/x11/xlimits.hxx
@@ -17570,6 +17571,8 @@ vcl/opengl/texture.cxx
 vcl/opengl/win/WinDeviceInfo.cxx
 vcl/opengl/win/blocklist_parser.cxx
 vcl/opengl/win/gdiimpl.cxx
+vcl/opengl/x11/cairotextrender.cxx
+vcl/opengl/x11/cairotextrender.hxx
 vcl/opengl/x11/X11DeviceInfo.cxx
 vcl/opengl/x11/gdiimpl.cxx
 vcl/opengl/x11/salvd.cxx
@@ -18041,14 +18044,11 @@ vcl/unx/generic/gdi/font.cxx
 vcl/unx/generic/gdi/gdiimpl.cxx
 vcl/unx/generic/gdi/gdiimpl.hxx
 vcl/unx/generic/gdi/nativewindowhandleprovider.cxx
-vcl/unx/generic/gdi/openglx11cairotextrender.cxx
-vcl/unx/generic/gdi/openglx11cairotextrender.hxx
 vcl/unx/generic/gdi/salbmp.cxx
 vcl/unx/generic/gdi/salgdi.cxx
 vcl/unx/generic/gdi/salgdi2.cxx
 vcl/unx/generic/gdi/salvd.cxx
 vcl/unx/generic/gdi/x11cairotextrender.cxx
-vcl/unx/generic/gdi/x11cairotextrender.hxx
 vcl/unx/generic/gdi/xrender_peer.cxx
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx
 vcl/unx/generic/glyphs/glyphcache.cxx
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index e19323a20388..f729c3d20ad5 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
     vcl/unx/generic/gdi/cairo_xlib_cairo \
     vcl/unx/generic/gdi/x11cairotextrender \
 	vcl/unx/generic/gdi/gdiimpl \
-	vcl/unx/generic/gdi/openglx11cairotextrender \
     vcl/unx/generic/gdi/salbmp \
     vcl/unx/generic/gdi/salgdi2 \
     vcl/unx/generic/gdi/font \
@@ -105,6 +104,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/cairotextrender \
 	vcl/opengl/x11/gdiimpl \
 	vcl/opengl/x11/salvd \
 ))
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/opengl/gdiimpl.hxx
index b5be8792a982..e90e55458d12 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/opengl/gdiimpl.hxx
@@ -23,12 +23,12 @@
 #include <vcl/dllapi.h>
 #include <vcl/opengl/OpenGLContext.hxx>
 
-#include "regionband.hxx"
-#include "salgeom.hxx"
-#include "salgdiimpl.hxx"
-#include "opengl/program.hxx"
-#include "opengl/texture.hxx"
-#include "opengl/RenderList.hxx"
+#include <regionband.hxx>
+#include <salgeom.hxx>
+#include <salgdiimpl.hxx>
+#include <opengl/program.hxx>
+#include <opengl/texture.hxx>
+#include <opengl/RenderList.hxx>
 
 #include <memory>
 
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index 7bf6d8bf85d5..3af0ccbcd344 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -13,7 +13,7 @@
 #include <memory>
 #include <vcl/dllapi.h>
 
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
 #include <svdata.hxx>
 #include <win/salgdi.h>
 #include <o3tl/lru_map.hxx>
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx b/vcl/inc/opengl/x11/cairotextrender.hxx
index 46a11cba5a0e..c515b90da732 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.hxx
+++ b/vcl/inc/opengl/x11/cairotextrender.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_VCL_UNX_GENERIC_GDI_OPENGLX11CAIROTEXTRENDER_HXX
 #define INCLUDED_VCL_UNX_GENERIC_GDI_OPENGLX11CAIROTEXTRENDER_HXX
 
-#include "x11cairotextrender.hxx"
+#include <unx/x11/x11cairotextrender.hxx>
 
 class OpenGLX11CairoTextRender : public X11CairoTextRender
 {
diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx
index a35b833004c2..d0c0c3caf352 100644
--- a/vcl/inc/opengl/x11/gdiimpl.hxx
+++ b/vcl/inc/opengl/x11/gdiimpl.hxx
@@ -14,7 +14,7 @@
 
 #include <unx/salgdi.h>
 #include <unx/x11/x11gdiimpl.h>
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
 #include <ControlCacheKey.hxx>
 
 struct TextureCombo;
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx b/vcl/inc/unx/x11/x11cairotextrender.hxx
index 666f09f8c0c9..666f09f8c0c9 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.hxx
+++ b/vcl/inc/unx/x11/x11cairotextrender.hxx
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index b7443ffd6d26..30d2299978ea 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
 #include <opengl/framebuffer.hxx>
 
 #include <vcl/gradient.hxx>
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx b/vcl/opengl/x11/cairotextrender.cxx
index 4175634348b7..39b5f661dca0 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/opengl/x11/cairotextrender.cxx
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "openglx11cairotextrender.hxx"
+#include <opengl/x11/cairotextrender.hxx>
 
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
 
 #include <cairo.h>
 
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index de11058e4507..b265c2dab42b 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -21,7 +21,7 @@
 #include <config_features.h>
 #include <sal/log.hxx>
 #if HAVE_FEATURE_OPENGL
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
 #include <opengl/zone.hxx>
 #include <desktop/exithelper.h>
 #ifdef _WIN32
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index fc5f3c394a30..5c1999661783 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -45,8 +45,8 @@
 #include <salvd.hxx>
 #include "gdiimpl.hxx"
 #include <opengl/x11/gdiimpl.hxx>
-#include "x11cairotextrender.hxx"
-#include "openglx11cairotextrender.hxx"
+#include <unx/x11/x11cairotextrender.hxx>
+#include <opengl/x11/cairotextrender.hxx>
 
 #include <unx/x11/xrender_peer.hxx>
 #include "cairo_xlib_cairo.hxx"
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index 426a5222e143..91f82ac84b21 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -17,7 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "x11cairotextrender.hxx"
+#include <unx/x11/x11cairotextrender.hxx>
+
 #include <unx/glyphcache.hxx>
 #include <X11/Xregion.h>
 #include <cairo.h>
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index b1657c965d28..2698d350caae 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -63,7 +63,7 @@
 #if HAVE_FEATURE_OPENGL
 #include <salgdi.hxx>
 #include <salframe.hxx>
-#include <openglgdiimpl.hxx>
+#include <opengl/gdiimpl.hxx>
 #include <opengl/texture.hxx>
 #include <opengl/framebuffer.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>