diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-11-10 21:24:13 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-11-10 21:25:04 +0000 |
| commit | 290943d20551a8504efe10f6f954aa16995bf95a (patch) | |
| tree | e70c5908776e5f1509a3c64f988efc8d0e4dfdd8 | |
| parent | cee950b53bc8e0e2d8d494376c9f1331f8ce8e45 (diff) | |
vcl: opengl - alpha masks are unexpectedly inverted.
Change-Id: I5ebcd47e10df671bc60492bc80fc26a60f07306d
| -rw-r--r-- | vcl/opengl/gdiimpl.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index ca5a975c4e34..11e7d5528b56 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -450,7 +450,7 @@ void OpenGLSalGraphicsImpl::DrawTextureWithMask( GLuint nTexture, GLuint nMask, glBindTexture( GL_TEXTURE_2D, nMask ); glEnable( GL_BLEND ); - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); + glBlendFunc( GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA ); DrawTextureRect( rSize, pPosAry ); glDisable( GL_BLEND ); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 1142e370064d..cd3e32e56fdd 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -27,7 +27,6 @@ #if 0 # define FIXME_SELF_INTERSECTING_WORKING -# define FIXME_DRAW_BITMAPEX #endif using namespace css; @@ -273,11 +272,7 @@ public: for (size_t i = 0; i < maIcons.size(); i++) { Size aSize(maIcons[i].GetSizePixel()); -#ifdef FIXME_DRAW_BITMAPEX rDev.DrawBitmapEx(p.TopLeft(), maIcons[i]); -#else - rDev.DrawBitmap(p.TopLeft(), maIcons[i].GetBitmap()); -#endif p.Move(aSize.Width(), 0); if (p.Left() >= r.Right()) break; |