diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-11-18 09:07:31 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-11-18 15:44:04 +0100 |
commit | 878cea9134768cadfc57fe70baeb4b9a8bf4dfbf (patch) | |
tree | 670a4563223449985b7ffa43281bd6ecfa8d20f5 /vcl/inc | |
parent | fef950f828f6e6da844f3a11ee72d9cd628b1474 (diff) |
windows opengl: Provide the context to textures everywhere where we have it.
Change-Id: Ib820326fdc752d0893840bad3eb7f1369469f796
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/opengl/contextprovider.hxx | 28 | ||||
-rw-r--r-- | vcl/inc/opengl/salbmp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/salgdi.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/unx/salgdi.h | 2 |
4 files changed, 6 insertions, 30 deletions
diff --git a/vcl/inc/opengl/contextprovider.hxx b/vcl/inc/opengl/contextprovider.hxx deleted file mode 100644 index 47eb98cd92e7..000000000000 --- a/vcl/inc/opengl/contextprovider.hxx +++ /dev/null @@ -1,28 +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/. - */ - -#ifndef INCLUDED_VCL_INC_OPENGL_CONTEXTPROVIDER_HXX -#define INCLUDED_VCL_INC_OPENGL_CONTEXTPROVIDER_HXX - -#include "vclpluginapi.h" - -#include <vcl/opengl/OpenGLContext.hxx> - -class VCLPLUG_GEN_PUBLIC OpenGLContextProvider -{ -public: - virtual ~OpenGLContextProvider() {}; - - /* Get the OpenGL context provided by this instance */ - virtual OpenGLContext* GetOpenGLContext() const = 0; -}; - -#endif // INCLUDED_VCL_INC_OPENGL_CONTEXTPROVIDER_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx index 98fc2feb6e2b..c8626729a63c 100644 --- a/vcl/inc/opengl/salbmp.hxx +++ b/vcl/inc/opengl/salbmp.hxx @@ -52,7 +52,7 @@ private: int mnBufHeight; std::deque< OpenGLSalBitmapOp* > maPendingOps; - bool makeCurrent(); + void makeCurrent(); public: OpenGLSalBitmap(); diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 4a567f5b7f57..95920a050157 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -44,6 +44,7 @@ class SalLayout; class ImplLayoutArgs; class Rectangle; class FontSubsetInfo; +class OpenGLContext; class OutputDevice; class ServerFontLayout; struct SystemGraphicsData; @@ -85,6 +86,9 @@ public: virtual SalGraphicsImpl* GetImpl() const = 0; + /// Check that our mpImpl is OpenGL and return the context, otherwise NULL. + virtual OpenGLContext* GetOpenGLContext() const; + void setAntiAliasB2DDraw(bool bNew) { m_bAntiAliasB2DDraw = bNew; } bool getAntiAliasB2DDraw() const { return m_bAntiAliasB2DDraw; } diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 6b0e2be8a035..6bf4c04542de 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -62,7 +62,7 @@ namespace basegfx { class B2DTrapezoid; } -class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics, public OpenGLContextProvider +class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics { friend class ServerFontLayout; friend class X11SalGraphicsImpl; |