diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-11-07 12:33:15 +0000 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-10 07:59:23 +0100 |
| commit | 52314eadaef0e5c16aa674412060f2c5d44bd242 (patch) | |
| tree | 29df84eadffb2a55d2f8c0e8503d0e9e8f9e74a6 /vcl/opengl | |
| parent | vcldemo: cover more features. (diff) | |
| download | core-52314eadaef0e5c16aa674412060f2c5d44bd242.tar.gz core-52314eadaef0e5c16aa674412060f2c5d44bd242.zip | |
vcldemo - test the drawAlphaRect method.
Change-Id: I05e62b57c9b1cbdd89dc32b73b9dbcccc26a3c65
Diffstat (limited to 'vcl/opengl')
| -rw-r--r-- | vcl/opengl/gdiimpl.cxx | 3 | ||||
| -rw-r--r-- | vcl/opengl/texture.cxx | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 868728d5a4d4..6d794ef4ff38 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -734,7 +734,8 @@ void OpenGLSalGraphicsImpl::drawMask( SalBitmap* OpenGLSalGraphicsImpl::getBitmap( long nX, long nY, long nWidth, long nHeight ) { OpenGLSalBitmap* pBitmap = new OpenGLSalBitmap; - SAL_INFO( "vcl.opengl", "::getBitmap" ); + SAL_INFO( "vcl.opengl", "::getBitmap " << nX << "," << nY << + " " << nWidth << "x" << nHeight ); if( !pBitmap->Create( maContext, nX, nY, nWidth, nHeight ) ) { delete pBitmap; diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx index ad1b8c9b925b..2770c20a5519 100644 --- a/vcl/opengl/texture.cxx +++ b/vcl/opengl/texture.cxx @@ -18,6 +18,8 @@ */ #include <sal/config.h> +#include <vcl/opengl/OpenGLHelper.hxx> + #include "vcl/salbtype.hxx" #include "opengl/texture.hxx" @@ -59,7 +61,9 @@ OpenGLTexture::OpenGLTexture( int nX, int nY, int nWidth, int nHeight ) glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); glCopyTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, nX, nY, nWidth, nHeight, 0 ); + CHECK_GL_ERROR(); glBindTexture( GL_TEXTURE_2D, 0 ); + CHECK_GL_ERROR(); } OpenGLTexture::OpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData ) |