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

[Jan Holesovsky]

 vcl/win/source/gdi/salgdi.cxx                |    2 +-
 vcl/win/source/gdi/salnativewidgets-luna.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d45409468b98ada43c0536fc1b0ba5e221d5b9bf
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Nov 25 18:03:12 2014 +0100

    windows opengl: Transparency of the native widgets.
    
    Change-Id: Ifa6ba5735582effc27ac68556c2367077705d1d6

diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 7161dab..4c36bb3 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -610,7 +610,7 @@ OpenGLTexture* OpenGLCompatibleDC::getTexture()
         return NULL;
 
     // turn what's in the mpData into a texture
-    return new OpenGLTexture(maRects.mnSrcWidth, maRects.mnSrcHeight, GL_RGBA, GL_UNSIGNED_BYTE, reinterpret_cast<sal_uInt8*>(mpData));
+    return new OpenGLTexture(maRects.mnSrcWidth, maRects.mnSrcHeight, GL_BGRA, GL_UNSIGNED_BYTE, reinterpret_cast<sal_uInt8*>(mpData));
 }
 
 WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen, HWND hWnd):
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 0789d4c..539af04 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -1297,7 +1297,7 @@ bool WinSalGraphics::drawNativeControl( ControlType nType,
                 return false;
 
             pImpl->PreDraw();
-            pImpl->DrawTexture(*pBlackTexture, aBlackDC.getTwoRect()); // FIXME combine the textures - DrawTextureSynthesizedAlpha()
+            pImpl->DrawTextureDiff(*pWhiteTexture, *pBlackTexture, aBlackDC.getTwoRect());
             pImpl->PostDraw();
 
             bOk = true;