summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/vcl/opengl/OpenGLHelper.hxx13
-rw-r--r--include/vcl/opengl/OpenGLWrapper.hxx7
2 files changed, 4 insertions, 16 deletions
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index f4742d268b49..a0e2d8436564 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -21,7 +21,7 @@
/// Helper to do a SAL_INFO as well as a GL log.
#define VCL_GL_INFO(stream) \
do { \
- if (SAL_DETAIL_ENABLE_LOG_INFO && OpenGLHelper::isVCLOpenGLEnabled()) \
+ if (SAL_DETAIL_ENABLE_LOG_INFO) \
{ \
::std::ostringstream detail_stream; \
detail_stream << stream; \
@@ -32,7 +32,7 @@
/// Helper to do a SAL_WARN as well as a GL log.
#define VCL_GL_WARN(stream) \
do { \
- if (SAL_DETAIL_ENABLE_LOG_INFO && OpenGLHelper::isVCLOpenGLEnabled()) \
+ if (SAL_DETAIL_ENABLE_LOG_INFO) \
{ \
::std::ostringstream detail_stream; \
detail_stream << stream; \
@@ -105,14 +105,9 @@ public:
static bool isDeviceDenylisted();
/**
- * checks if the system supports all features that are necessary for the OpenGL VCL support
+ * checks if the system supports all features that are necessary for the OpenGL support
*/
- static bool supportsVCLOpenGL();
-
- /**
- * Returns true if VCL has OpenGL rendering enabled
- */
- static bool isVCLOpenGLEnabled();
+ static bool supportsOpenGL();
};
#ifdef SAL_LOG_WARN
diff --git a/include/vcl/opengl/OpenGLWrapper.hxx b/include/vcl/opengl/OpenGLWrapper.hxx
index 23237804e79b..3711b3fd4ba2 100644
--- a/include/vcl/opengl/OpenGLWrapper.hxx
+++ b/include/vcl/opengl/OpenGLWrapper.hxx
@@ -20,18 +20,11 @@ struct VCL_DLLPUBLIC OpenGLWrapper
{
OpenGLWrapper() = delete; // Should not be instantiated
- /**
- * Returns true if VCL has OpenGL rendering enabled
- */
#if HAVE_FEATURE_UI
- static bool isVCLOpenGLEnabled();
-
/**
* Returns the number of times OpenGL buffers have been swapped.
*/
static sal_Int64 getBufferSwapCounter();
-#else
- static bool isVCLOpenGLEnabled() { return false; }
#endif
};