include/vcl/opengl/glxtest.hxx | 23 ----------------------- vcl/inc/opengl/framebuffer.hxx | 1 - vcl/inc/opengl/x11/glxtest.hxx | 23 +++++++++++++++++++++++ vcl/opengl/framebuffer.cxx | 3 +-- vcl/opengl/x11/X11DeviceInfo.cxx | 2 +- vcl/source/opengl/OpenGLContext.cxx | 1 - vcl/source/salmain/salmain.cxx | 2 +- vcl/unx/glxtest.cxx | 2 +- 8 files changed, 27 insertions(+), 30 deletions(-)
New commits: commit 5fdb9cd64cfb48949a8c15292eda9266155a62ea Author: Tor Lillqvist <t...@collabora.com> Date: Wed Jan 13 15:01:35 2016 +0200 This stuff is private to vcl Change-Id: I623da89ea390a07bd6a3236b5c099be094a7acde diff --git a/include/vcl/opengl/glxtest.hxx b/vcl/inc/opengl/x11/glxtest.hxx similarity index 84% rename from include/vcl/opengl/glxtest.hxx rename to vcl/inc/opengl/x11/glxtest.hxx index 687038f..979f795 100644 --- a/include/vcl/opengl/glxtest.hxx +++ b/vcl/inc/opengl/x11/glxtest.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_VCL_OPENGL_GLXTEST_HXX -#define INCLUDED_VCL_OPENGL_GLXTEST_HXX +#ifndef INCLUDED_VCL_INC_OPENGL_X11_GLXTEST_HXX +#define INCLUDED_VCL_INC_OPENGL_X11_GLXTEST_HXX #include <vcl/dllapi.h> diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx index e9754ea..49593c7 100644 --- a/vcl/opengl/x11/X11DeviceInfo.cxx +++ b/vcl/opengl/x11/X11DeviceInfo.cxx @@ -8,8 +8,8 @@ */ #include "opengl/x11/X11DeviceInfo.hxx" +#include "opengl/x11//glxtest.hxx" -#include <vcl/opengl/glxtest.hxx> #include <rtl/ustring.hxx> #include <unistd.h> diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx index ee9ed69..32d5737 100644 --- a/vcl/source/salmain/salmain.cxx +++ b/vcl/source/salmain/salmain.cxx @@ -29,7 +29,7 @@ #include "salinst.hxx" #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID && !defined LIBO_HEADLESS -#include <vcl/opengl/glxtest.hxx> +#include "opengl/x11/glxtest.hxx" #endif SAL_IMPLEMENT_MAIN() { diff --git a/vcl/unx/glxtest.cxx b/vcl/unx/glxtest.cxx index 12811e8..efe5591 100644 --- a/vcl/unx/glxtest.cxx +++ b/vcl/unx/glxtest.cxx @@ -26,7 +26,7 @@ #include "stdint.h" #include <string.h> -#include <vcl/opengl/glxtest.hxx> +#include "opengl/x11/glxtest.hxx" #ifdef __SUNPRO_CC #include <stdio.h> commit 4a846b9b93b89152b8f74f3dfc893441ae1347b8 Author: Tor Lillqvist <t...@collabora.com> Date: Wed Jan 13 14:52:05 2016 +0200 We only use the prev pointer (Why not use a std::list? Maybe there is some reason.) Change-Id: I09010726e9fe45cfa0f530a085c48ec8d3d02cfb diff --git a/vcl/inc/opengl/framebuffer.hxx b/vcl/inc/opengl/framebuffer.hxx index 7acd710..9f94a8f 100644 --- a/vcl/inc/opengl/framebuffer.hxx +++ b/vcl/inc/opengl/framebuffer.hxx @@ -41,7 +41,6 @@ public: public: OpenGLFramebuffer* mpPrevFramebuffer; - OpenGLFramebuffer* mpNextFramebuffer; }; #endif // INCLUDED_VCL_INC_OPENGL_FRAMEBUFFER_H diff --git a/vcl/opengl/framebuffer.cxx b/vcl/opengl/framebuffer.cxx index 215eadf..aa20a93 100644 --- a/vcl/opengl/framebuffer.cxx +++ b/vcl/opengl/framebuffer.cxx @@ -18,8 +18,7 @@ OpenGLFramebuffer::OpenGLFramebuffer() : mnWidth( 0 ), mnHeight( 0 ), mnAttachedTexture( 0 ), - mpPrevFramebuffer( nullptr ), - mpNextFramebuffer( nullptr ) + mpPrevFramebuffer( nullptr ) { glGenFramebuffers( 1, &mnId ); CHECK_GL_ERROR(); diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index d70d27e..f409bec 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -1649,7 +1649,6 @@ OpenGLFramebuffer* OpenGLContext::AcquireFramebuffer( const OpenGLTexture& rText if( mpLastFramebuffer ) { pFramebuffer->mpPrevFramebuffer = mpLastFramebuffer; - mpLastFramebuffer->mpNextFramebuffer = pFramebuffer; mpLastFramebuffer = pFramebuffer; } else _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits