compilerplugins/clang/unusedmethods.results | 6 -----
vcl/CppunitTest_vcl_bitmap_test.mk | 1
vcl/Executable_icontest.mk | 6 -----
vcl/Library_vcl.mk | 2 -
vcl/Library_vclplug_gen.mk | 1
vcl/Library_vclplug_win.mk | 1
vcl/source/opengl/GLMHelper.hxx | 21 --------------------
vcl/source/opengl/OpenGLHelper.cxx | 29 ----------------------------
8 files changed, 67 deletions(-)
New commits:
commit 16cd8cf06f23696fc057dd3469f7698154825886
Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
AuthorDate: Mon Aug 21 22:38:39 2023 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Sat Aug 26 01:04:20 2023 +0200
Drop glm dependency from vcl
Serious use of glm was removed from vcl in
commit db89f53c31af997b9bf422b0e784afba8d62a42e
remove OpenGL VCL backend code
This is a bit of leftover from that
Change-Id: I019279cd0cc804d3fa4535a651704bccca38b9db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155909
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/compilerplugins/clang/unusedmethods.results
b/compilerplugins/clang/unusedmethods.results
index a4b5e3d3dcd5..335a54622235 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -3464,12 +3464,6 @@ vcl/source/fontsubset/xlat.hxx:33
unsigned short vcl::TranslateChar15(unsigned short)
vcl/source/fontsubset/xlat.hxx:34
unsigned short vcl::TranslateChar16(unsigned short)
-vcl/source/opengl/GLMHelper.hxx:17
- std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const
struct glm::mat<4, 4, float> &)
-vcl/source/opengl/GLMHelper.hxx:18
- std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const
struct glm::vec<4, float> &)
-vcl/source/opengl/GLMHelper.hxx:19
- std::basic_ostream<char> & operator<<(std::basic_ostream<char> &,const
struct glm::vec<3, float> &)
vcl/source/window/menuitemlist.hxx:123
void MenuItemList::Clear()
vcl/unx/generic/dtrans/X11_clipboard.hxx:106
diff --git a/vcl/CppunitTest_vcl_bitmap_test.mk
b/vcl/CppunitTest_vcl_bitmap_test.mk
index 1c51a8d02cbe..0edaabc9f9d9 100644
--- a/vcl/CppunitTest_vcl_bitmap_test.mk
+++ b/vcl/CppunitTest_vcl_bitmap_test.mk
@@ -23,7 +23,6 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,vcl_bitmap_test, \
$(eval $(call gb_CppunitTest_use_externals,vcl_bitmap_test,\
boost_headers \
epoxy \
- glm_headers \
))
$(eval $(call gb_CppunitTest_set_include,vcl_bitmap_test,\
diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
index 60a69bc7a156..0f8a3b60b09b 100644
--- a/vcl/Executable_icontest.mk
+++ b/vcl/Executable_icontest.mk
@@ -15,12 +15,6 @@ $(eval $(call gb_Executable_use_externals,icontest,\
))
endif
-ifeq ($(SYSTEM_GLM),TRUE)
-$(eval $(call gb_Executable_add_defs,icontest,\
- -DGLM_ENABLE_EXPERIMENTAL \
-))
-endif
-
$(eval $(call gb_Executable_add_defs,icontest,\
-DVCL_INTERNALS \
))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f56c913f656f..7776ced51b56 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_Library_add_defs,vcl,\
-DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call
gb_Library__get_name,cui))\" \
-DDESKTOP_DETECTOR_DLL_NAME=\"$(call
gb_Library_get_runtime_filename,$(call
gb_Library__get_name,desktop_detector))\" \
-DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call
gb_Library__get_name,tk))\" \
- $(if $(SYSTEM_GLM),-DGLM_ENABLE_EXPERIMENTAL) \
$(if $(SYSTEM_LIBFIXMATH),-DSYSTEM_LIBFIXMATH) \
))
@@ -84,7 +83,6 @@ $(eval $(call gb_Library_use_externals,vcl,\
expat \
frozen \
gio \
- glm_headers \
graphite \
harfbuzz \
icu_headers \
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index e0086e6c4dcb..2d314017bb8b 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
graphite \
epoxy \
expat \
- glm_headers \
harfbuzz \
icu_headers \
icuuc \
diff --git a/vcl/Library_vclplug_win.mk b/vcl/Library_vclplug_win.mk
index 2627914cc15c..d4656302d4ce 100644
--- a/vcl/Library_vclplug_win.mk
+++ b/vcl/Library_vclplug_win.mk
@@ -60,7 +60,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_win,\
$(eval $(call gb_Library_use_externals,vclplug_win,\
boost_headers \
epoxy \
- glm_headers \
harfbuzz \
$(if $(filter SKIA,$(BUILD_TYPE)),skia) \
))
diff --git a/vcl/source/opengl/GLMHelper.hxx b/vcl/source/opengl/GLMHelper.hxx
deleted file mode 100644
index 9694a3c34625..000000000000
--- a/vcl/source/opengl/GLMHelper.hxx
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#pragma once
-
-#include <glm/glm.hpp>
-#include <vcl/dllapi.h>
-
-#include <ostream>
-
-std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix);
-std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos);
-std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos);
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index ba46c5c716b8..daf0ddf72162 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -45,8 +45,6 @@
#include <opengl/win/WinDeviceInfo.hxx>
#endif
-#include "GLMHelper.hxx"
-
static bool volatile gbInShaderCompile = false;
namespace {
@@ -629,33 +627,6 @@ const char* OpenGLHelper::GLErrorString(GLenum errorCode)
return nullptr;
}
-std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos)
-{
- rStrm << "( " << rPos[0] << ", " << rPos[1] << ", " << rPos[2] << ", " <<
rPos[3] << ")";
- return rStrm;
-}
-
-std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos)
-{
- rStrm << "( " << rPos[0] << ", " << rPos[1] << ", " << rPos[2] << ")";
- return rStrm;
-}
-
-std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix)
-{
- for(int i = 0; i < 4; ++i)
- {
- rStrm << "\n( ";
- for(int j = 0; j < 4; ++j)
- {
- rStrm << rMatrix[j][i];
- rStrm << " ";
- }
- rStrm << ")\n";
- }
- return rStrm;
-}
-
void OpenGLHelper::createFramebuffer(tools::Long nWidth, tools::Long nHeight,
GLuint& nFramebufferId,
GLuint& nRenderbufferDepthId, GLuint& nRenderbufferColorId)
{
