vcl/inc/openglgdiimpl.hxx | 1 + vcl/opengl/gdiimpl.cxx | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+)
New commits: commit 9754b88b627b7391e3daf75a67f280014a7eab03 Author: Jan Holesovsky <ke...@collabora.com> Date: Tue Nov 11 10:24:37 2014 +0100 windows opengl: We need a constructor for OpenGLSalGraphicsImpl. Otherwise we a get random value in mnSolidProgram, and we never initialize that. Change-Id: Ic648a1f6755021da25f5b9da306cf600a3f0c739 diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 56938b9..6f920e5 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -101,6 +101,7 @@ protected: public: + OpenGLSalGraphicsImpl(); virtual ~OpenGLSalGraphicsImpl (); OpenGLContext& GetOpenGLContext() { return maContext; } diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 85252ef..5856fb8 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -51,6 +51,26 @@ ((float) SALCOLOR_BLUE( nColor )) / 255, \ (1.0f - fTransparency) ) +OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl() + : mpFrame(NULL) + , mbOffscreen(false) + , mnFramebufferId(0) + , mpOffscreenTex(NULL) + , mnLineColor(SALCOLOR_NONE) + , mnFillColor(SALCOLOR_NONE) + , mnSolidProgram(0) + , mnColorUniform(0) + , mnTextureProgram(0) + , mnSamplerUniform(0) + , mnMaskedTextureProgram(0) + , mnMaskedSamplerUniform(0) + , mnMaskSamplerUniform(0) + , mnMaskProgram(0) + , mnMaskUniform(0) + , mnMaskColorUniform(0) +{ +} + OpenGLSalGraphicsImpl::~OpenGLSalGraphicsImpl() { } @@ -209,6 +229,7 @@ void OpenGLSalGraphicsImpl::SetOffscreen( bool bOffscreen ) bool OpenGLSalGraphicsImpl::CreateSolidProgram( void ) { + SAL_INFO( "vcl.opengl", "::CreateSolidProgram" ); mnSolidProgram = OpenGLHelper::LoadShaders( "solidVertexShader", "solidFragmentShader" ); if( mnSolidProgram == 0 ) return false; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits