diff options
author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:26:56 +0100 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-22 01:55:18 +0100 |
commit | 58d98a08aee7bf027c109eeb94183d24351827fa (patch) | |
tree | 4cdfd20f56d097e77f79286dfcc379eca25aa12a /vcl/inc/opengl | |
parent | a65141b2b46ad8150bafca4629b0ef924978a201 (diff) |
tdf#123936 Formatting files in module vcl with clang-format
Change-Id: Ia162ad5b7499c0ddfdbfca59ae76b81335ce2d45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105728
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'vcl/inc/opengl')
-rw-r--r-- | vcl/inc/opengl/BufferObject.hxx | 8 | ||||
-rw-r--r-- | vcl/inc/opengl/TextureState.hxx | 7 | ||||
-rw-r--r-- | vcl/inc/opengl/x11/gdiimpl.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/opengl/zone.hxx | 12 |
4 files changed, 15 insertions, 18 deletions
diff --git a/vcl/inc/opengl/BufferObject.hxx b/vcl/inc/opengl/BufferObject.hxx index 396de89de0ed..e31148b74c6e 100644 --- a/vcl/inc/opengl/BufferObject.hxx +++ b/vcl/inc/opengl/BufferObject.hxx @@ -13,9 +13,7 @@ namespace vcl { - -template<typename TYPE, GLenum BUFFER_TYPE> -class BufferObject +template <typename TYPE, GLenum BUFFER_TYPE> class BufferObject { private: GLuint mId; @@ -65,11 +63,9 @@ public: CHECK_GL_ERROR(); } } - }; -template<typename TYPE> -class VertexBufferObject final : public BufferObject<TYPE, GL_ARRAY_BUFFER> +template <typename TYPE> class VertexBufferObject final : public BufferObject<TYPE, GL_ARRAY_BUFFER> { }; diff --git a/vcl/inc/opengl/TextureState.hxx b/vcl/inc/opengl/TextureState.hxx index fbf2b9cee548..e285cd7704fa 100644 --- a/vcl/inc/opengl/TextureState.hxx +++ b/vcl/inc/opengl/TextureState.hxx @@ -23,7 +23,8 @@ public: TextureState() : mnCurrentTextureUnit(0) , maBoundTextures(4, 0) - {} + { + } static void generate(GLuint& nTexture) { @@ -39,7 +40,6 @@ public: CHECK_GL_ERROR(); mnCurrentTextureUnit = nTextureUnit; } - } void bind(GLuint nTexture) @@ -66,11 +66,8 @@ public: maBoundTextures[i] = 0; } } - }; - - #endif // INCLUDED_VCL_INC_OPENGL_TEXTURE_STATE_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/opengl/x11/gdiimpl.hxx b/vcl/inc/opengl/x11/gdiimpl.hxx index d86af9223c54..e55c6f1095ba 100644 --- a/vcl/inc/opengl/x11/gdiimpl.hxx +++ b/vcl/inc/opengl/x11/gdiimpl.hxx @@ -22,17 +22,17 @@ struct TextureCombo; class X11OpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl, public X11GraphicsImpl { private: - X11SalGraphics& mrX11Parent; + X11SalGraphics& mrX11Parent; public: - X11OpenGLSalGraphicsImpl( X11SalGraphics& rParent ); + X11OpenGLSalGraphicsImpl(X11SalGraphics& rParent); virtual ~X11OpenGLSalGraphicsImpl() override; protected: virtual rtl::Reference<OpenGLContext> CreateWinContext() override; public: - virtual void copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics ) override; + virtual void copyBits(const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics) override; virtual void Init() override; }; diff --git a/vcl/inc/opengl/zone.hxx b/vcl/inc/opengl/zone.hxx index 4bcdf15dcf79..f7f36ea22f84 100644 --- a/vcl/inc/opengl/zone.hxx +++ b/vcl/inc/opengl/zone.hxx @@ -19,23 +19,27 @@ * We want to be able to detect if a given crash came * from the OpenGL code, so use this helper to track that. */ -class VCL_DLLPUBLIC OpenGLZone : public CrashZone< OpenGLZone > { +class VCL_DLLPUBLIC OpenGLZone : public CrashZone<OpenGLZone> +{ public: static void hardDisable(); static void relaxWatchdogTimings(); static const CrashWatchdogTimingsValues& getCrashWatchdogTimingsValues(); - static void checkDebug( int nUnchanged, const CrashWatchdogTimingsValues& aTimingValues ); + static void checkDebug(int nUnchanged, const CrashWatchdogTimingsValues& aTimingValues); static const char* name() { return "OpenGL"; } }; /// Create this to not only enter the zone, but set VCL context. -class OpenGLVCLContextZone { +class OpenGLVCLContextZone +{ OpenGLZone aZone; + public: OpenGLVCLContextZone(); }; -class VCL_DLLPUBLIC PreDefaultWinNoOpenGLZone { +class VCL_DLLPUBLIC PreDefaultWinNoOpenGLZone +{ public: PreDefaultWinNoOpenGLZone(); ~PreDefaultWinNoOpenGLZone(); |