[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl2' - 3 commits - vcl/inc vcl/win

[Jan Holesovsky]

 vcl/inc/opengl/win/gdiimpl.hxx |    2 --
 vcl/win/source/gdi/salgdi.cxx  |    1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 29420563fce7a15def14b79965987d1c5c3f648c
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Nov 25 16:09:42 2014 +0100

    windows opengl: We should actually use Init() from OpenGLSalGraphicsImpl.
    
    Change-Id: I524883b0f0bbce9a8b6f893771f144feeee49934

diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index 66a0333..de25d23 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -26,8 +26,6 @@ private:
 public:
     WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics);
 
-    virtual void Init() SAL_OVERRIDE;
-
 protected:
     virtual GLfloat GetWidth() const SAL_OVERRIDE;
     virtual GLfloat GetHeight() const SAL_OVERRIDE;
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 7307e2b..55b3c5a 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -18,15 +18,6 @@ WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics):
 {
 }
 
-void WinOpenGLSalGraphicsImpl::Init()
-{
-    // FIXME - is this still needed after the recent changes?
-    //if (mbVirDev)
-    //    GetOpenGLContext().requestVirtualDevice();
-    //GetOpenGLContext().requestSingleBufferedRendering();
-    //GetOpenGLContext().init(mhLocalDC, mhWnd);
-}
-
 void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics )
 {
     OpenGLSalGraphicsImpl *pImpl = pSrcGraphics ? dynamic_cast< OpenGLSalGraphicsImpl* >(pSrcGraphics->GetImpl()) : static_cast< OpenGLSalGraphicsImpl *>(mrParent.GetImpl());
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 05279d1..7161dab 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -482,6 +482,7 @@ void WinSalGraphics::InitGraphics()
     ::SetTextAlign( getHDC(), TA_BASELINE | TA_LEFT | TA_NOUPDATECP );
     ::SetBkMode( getHDC(), WIN32_TRANSPARENT );
     ::SetROP2( getHDC(), R2_COPYPEN );
+
     mpImpl->Init();
 }
 
commit 328dbaf3f420896eceaa9a5d629d6e7dc7955946
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Sat Nov 22 22:08:23 2014 +0100

    Fix build.
    
    Change-Id: Ibf5d1ccee155cc5807a1a125fde7a7243eab7585

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 7c2fe1f..7307e2b 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -23,8 +23,8 @@ void WinOpenGLSalGraphicsImpl::Init()
     // FIXME - is this still needed after the recent changes?
     //if (mbVirDev)
     //    GetOpenGLContext().requestVirtualDevice();
-    GetOpenGLContext().requestSingleBufferedRendering();
-    GetOpenGLContext().init(mhLocalDC, mhWnd);
+    //GetOpenGLContext().requestSingleBufferedRendering();
+    //GetOpenGLContext().init(mhLocalDC, mhWnd);
 }
 
 void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics )
commit 7dd5f00d8d82e26b11a0b894156fcc5bd1f97cf6
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Sat Nov 22 21:42:08 2014 +0100

    windows opengl: Implement WinOpenGLSalGraphicsImpl::Init() too.
    
    [Blind fix to fix build; real fix to follow after testing.]
    
    Change-Id: Ic4cf2dc74ba4649a2453bc351cdc1d1fad59a0ca

diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 55b3c5a..7c2fe1f 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -18,6 +18,15 @@ WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics):
 {
 }
 
+void WinOpenGLSalGraphicsImpl::Init()
+{
+    // FIXME - is this still needed after the recent changes?
+    //if (mbVirDev)
+    //    GetOpenGLContext().requestVirtualDevice();
+    GetOpenGLContext().requestSingleBufferedRendering();
+    GetOpenGLContext().init(mhLocalDC, mhWnd);
+}
+
 void WinOpenGLSalGraphicsImpl::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraphics )
 {
     OpenGLSalGraphicsImpl *pImpl = pSrcGraphics ? dynamic_cast< OpenGLSalGraphicsImpl* >(pSrcGraphics->GetImpl()) : static_cast< OpenGLSalGraphicsImpl *>(mrParent.GetImpl());