diff options
| -rw-r--r-- | vcl/opengl/framebuffer.cxx | 8 | ||||
| -rw-r--r-- | vcl/opengl/gdiimpl.cxx | 46 |
2 files changed, 27 insertions, 27 deletions
diff --git a/vcl/opengl/framebuffer.cxx b/vcl/opengl/framebuffer.cxx index c4dfb05ae4b1..87af985f4ba4 100644 --- a/vcl/opengl/framebuffer.cxx +++ b/vcl/opengl/framebuffer.cxx @@ -22,7 +22,7 @@ OpenGLFramebuffer::OpenGLFramebuffer() : mpNextFramebuffer( NULL ) { glGenFramebuffers( 1, &mnId ); - SAL_INFO( "vcl.opengl", "Created framebuffer " << (int)mnId ); + VCL_GL_INFO( "vcl.opengl", "Created framebuffer " << (int)mnId ); } OpenGLFramebuffer::~OpenGLFramebuffer() @@ -33,14 +33,14 @@ OpenGLFramebuffer::~OpenGLFramebuffer() void OpenGLFramebuffer::Bind() { glBindFramebuffer( GL_FRAMEBUFFER, mnId ); - SAL_INFO( "vcl.opengl", "Binding framebuffer " << (int)mnId ); + VCL_GL_INFO( "vcl.opengl", "Binding framebuffer " << (int)mnId ); CHECK_GL_ERROR(); } void OpenGLFramebuffer::Unbind() { glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - SAL_INFO( "vcl.opengl", "Binding default framebuffer" ); + VCL_GL_INFO( "vcl.opengl", "Binding default framebuffer" ); CHECK_GL_ERROR(); } @@ -59,7 +59,7 @@ void OpenGLFramebuffer::AttachTexture( const OpenGLTexture& rTexture ) if( rTexture.Id() == mnAttachedTexture ) return; - SAL_INFO( "vcl.opengl", "Attaching texture " << rTexture.Id() << " to framebuffer " << (int)mnId ); + VCL_GL_INFO( "vcl.opengl", "Attaching texture " << rTexture.Id() << " to framebuffer " << (int)mnId ); mnAttachedTexture = rTexture.Id(); mnWidth = rTexture.GetWidth(); mnHeight = rTexture.GetHeight(); diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 3e9b64278c2b..f5b746e5db1e 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -270,7 +270,7 @@ const vcl::Region& OpenGLSalGraphicsImpl::getClipRegion() const bool OpenGLSalGraphicsImpl::setClipRegion( const vcl::Region& rClip ) { - SAL_INFO( "vcl.opengl", "::setClipRegion " << rClip ); + VCL_GL_INFO( "vcl.opengl", "::setClipRegion " << rClip ); maClipRegion = rClip; mbUseStencil = false; @@ -286,7 +286,7 @@ bool OpenGLSalGraphicsImpl::setClipRegion( const vcl::Region& rClip ) // set the clip region to empty void OpenGLSalGraphicsImpl::ResetClipRegion() { - SAL_INFO( "vcl.opengl", "::ResetClipRegion" ); + VCL_GL_INFO( "vcl.opengl", "::ResetClipRegion" ); maClipRegion.SetEmpty(); mbUseScissor = false; mbUseStencil = false; @@ -1219,7 +1219,7 @@ void OpenGLSalGraphicsImpl::DrawRadialGradient( const Gradient& rGradient, const // draw --> LineColor and FillColor and RasterOp and ClipRegion void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY ) { - SAL_INFO( "vcl.opengl", "::drawPixel" ); + VCL_GL_INFO( "vcl.opengl", "::drawPixel" ); if( mnLineColor != SALCOLOR_NONE ) { PreDraw(); @@ -1231,7 +1231,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY ) void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY, SalColor nSalColor ) { - SAL_INFO( "vcl.opengl", "::drawPixel" ); + VCL_GL_INFO( "vcl.opengl", "::drawPixel" ); if( nSalColor != SALCOLOR_NONE ) { PreDraw(); @@ -1243,7 +1243,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY, SalColor nSalColor ) void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 ) { - SAL_INFO( "vcl.opengl", "::drawLine" ); + VCL_GL_INFO( "vcl.opengl", "::drawLine" ); if( mnLineColor != SALCOLOR_NONE ) { PreDraw(); @@ -1255,7 +1255,7 @@ void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 ) void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeight ) { - SAL_INFO( "vcl.opengl", "::drawRect" ); + VCL_GL_INFO( "vcl.opengl", "::drawRect" ); PreDraw(); if( UseSolid( mnFillColor ) ) @@ -1289,7 +1289,7 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeigh void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ) { - SAL_INFO( "vcl.opengl", "::drawPolyLine" ); + VCL_GL_INFO( "vcl.opengl", "::drawPolyLine" ); if( mnLineColor != SALCOLOR_NONE && nPoints > 1 ) { @@ -1302,7 +1302,7 @@ void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pP void OpenGLSalGraphicsImpl::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ) { - SAL_INFO( "vcl.opengl", "::drawPolygon" ); + VCL_GL_INFO( "vcl.opengl", "::drawPolygon" ); if( nPoints == 0 ) return; if( nPoints == 1 ) @@ -1330,7 +1330,7 @@ void OpenGLSalGraphicsImpl::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPt void OpenGLSalGraphicsImpl::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) { - SAL_INFO( "vcl.opengl", "::drawPolyPolygon" ); + VCL_GL_INFO( "vcl.opengl", "::drawPolyPolygon" ); if( nPoly <= 0 ) return; @@ -1367,7 +1367,7 @@ void OpenGLSalGraphicsImpl::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* bool OpenGLSalGraphicsImpl::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPolygon, double fTransparency ) { - SAL_INFO( "vcl.opengl", "::drawPolyPolygon trans " << fTransparency ); + VCL_GL_INFO( "vcl.opengl", "::drawPolyPolygon trans " << fTransparency ); if( rPolyPolygon.count() <= 0 ) return true; @@ -1396,7 +1396,7 @@ bool OpenGLSalGraphicsImpl::drawPolyLine( basegfx::B2DLineJoin eLineJoin, com::sun::star::drawing::LineCap eLineCap) { - SAL_INFO( "vcl.opengl", "::drawPolyLine trans " << fTransparency ); + VCL_GL_INFO( "vcl.opengl", "::drawPolyLine trans " << fTransparency ); if( mnLineColor == SALCOLOR_NONE ) return true; @@ -1506,7 +1506,7 @@ void OpenGLSalGraphicsImpl::copyArea( long nSrcWidth, long nSrcHeight, sal_uInt16 /*nFlags*/ ) { - SAL_INFO( "vcl.opengl", "::copyArea " << nSrcX << "," << nSrcY << " >> " << nDestX << "," << nDestY << " (" << nSrcWidth << "," << nSrcHeight << ")" ); + VCL_GL_INFO( "vcl.opengl", "::copyArea " << nSrcX << "," << nSrcY << " >> " << nDestX << "," << nDestY << " (" << nSrcWidth << "," << nSrcHeight << ")" ); OpenGLTexture aTexture; SalTwoRect aPosAry(0, 0, nSrcWidth, nSrcHeight, nDestX, nDestY, nSrcWidth, nSrcHeight); @@ -1522,7 +1522,7 @@ void OpenGLSalGraphicsImpl::copyArea( // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics void OpenGLSalGraphicsImpl::DoCopyBits( const SalTwoRect& rPosAry, OpenGLSalGraphicsImpl& rImpl ) { - SAL_INFO( "vcl.opengl", "::copyBits" ); + VCL_GL_INFO( "vcl.opengl", "::copyBits" ); if( &rImpl == this && (rPosAry.mnSrcWidth == rPosAry.mnDestWidth) && @@ -1559,7 +1559,7 @@ void OpenGLSalGraphicsImpl::drawBitmap( const SalTwoRect& rPosAry, const SalBitm const OpenGLSalBitmap& rBitmap = static_cast<const OpenGLSalBitmap&>(rSalBitmap); OpenGLTexture& rTexture = rBitmap.GetTexture(); - SAL_INFO( "vcl.opengl", "::drawBitmap" ); + VCL_GL_INFO( "vcl.opengl", "::drawBitmap" ); PreDraw(); DrawTexture( rTexture, rPosAry ); PostDraw(); @@ -1583,7 +1583,7 @@ void OpenGLSalGraphicsImpl::drawBitmap( OpenGLTexture& rTexture( rBitmap.GetTexture() ); OpenGLTexture& rMaskTex( rMask.GetTexture() ); - SAL_INFO( "vcl.opengl", "::drawBitmap with MASK" ); + VCL_GL_INFO( "vcl.opengl", "::drawBitmap with MASK" ); PreDraw(); DrawTextureWithMask( rTexture, rMaskTex, rPosAry ); PostDraw(); @@ -1597,7 +1597,7 @@ void OpenGLSalGraphicsImpl::drawMask( const OpenGLSalBitmap& rBitmap = static_cast<const OpenGLSalBitmap&>(rSalBitmap); OpenGLTexture& rTexture( rBitmap.GetTexture() ); - SAL_INFO( "vcl.opengl", "::drawMask" ); + VCL_GL_INFO( "vcl.opengl", "::drawMask" ); PreDraw(); DrawMask( rTexture, nMaskColor, rPosAry ); PostDraw(); @@ -1606,7 +1606,7 @@ void OpenGLSalGraphicsImpl::drawMask( SalBitmap* OpenGLSalGraphicsImpl::getBitmap( long nX, long nY, long nWidth, long nHeight ) { OpenGLSalBitmap* pBitmap = new OpenGLSalBitmap; - SAL_INFO( "vcl.opengl", "::getBitmap " << nX << "," << nY << + VCL_GL_INFO( "vcl.opengl", "::getBitmap " << nX << "," << nY << " " << nWidth << "x" << nHeight ); //TODO really needed? PreDraw(); @@ -1698,7 +1698,7 @@ bool OpenGLSalGraphicsImpl::blendBitmap( const OpenGLSalBitmap& rBitmap = static_cast<const OpenGLSalBitmap&>(rSalBitmap); OpenGLTexture& rTexture( rBitmap.GetTexture() ); - SAL_INFO( "vcl.opengl", "::blendBitmap" ); + VCL_GL_INFO( "vcl.opengl", "::blendBitmap" ); PreDraw(); glEnable( GL_BLEND ); glBlendFunc( GL_ZERO, GL_SRC_COLOR ); @@ -1721,7 +1721,7 @@ bool OpenGLSalGraphicsImpl::blendAlphaBitmap( OpenGLTexture& rMask( rMaskBitmap.GetTexture() ); OpenGLTexture& rAlpha( rAlphaBitmap.GetTexture() ); - SAL_INFO( "vcl.opengl", "::blendAlphaBitmap" ); + VCL_GL_INFO( "vcl.opengl", "::blendAlphaBitmap" ); PreDraw(); DrawBlendedTexture( rTexture, rMask, rAlpha, rPosAry ); PostDraw(); @@ -1750,7 +1750,7 @@ bool OpenGLSalGraphicsImpl::drawAlphaBitmap( OpenGLTexture& rTexture( rBitmap.GetTexture() ); OpenGLTexture& rAlphaTex( rAlpha.GetTexture() ); - SAL_INFO( "vcl.opengl", "::drawAlphaBitmap" ); + VCL_GL_INFO( "vcl.opengl", "::drawAlphaBitmap" ); PreDraw(); DrawTextureWithMask( rTexture, rAlphaTex, rPosAry ); PostDraw(); @@ -1773,7 +1773,7 @@ bool OpenGLSalGraphicsImpl::drawTransformedBitmap( if( pMaskBitmap != NULL ) aMask = pMaskBitmap->GetTexture(); - SAL_INFO( "vcl.opengl", "::drawTransformedBitmap" ); + VCL_GL_INFO( "vcl.opengl", "::drawTransformedBitmap" ); PreDraw(); DrawTransformedTexture( rTexture, aMask, rNull, rX, rY ); PostDraw(); @@ -1792,7 +1792,7 @@ bool OpenGLSalGraphicsImpl::drawAlphaRect( long nWidth, long nHeight, sal_uInt8 nTransparency ) { - SAL_INFO( "vcl.opengl", "::drawAlphaRect" ); + VCL_GL_INFO( "vcl.opengl", "::drawAlphaRect" ); if( mnFillColor != SALCOLOR_NONE && nTransparency < 100 ) { PreDraw(); @@ -1809,7 +1809,7 @@ bool OpenGLSalGraphicsImpl::drawGradient(const tools::PolyPolygon& rPolyPoly, { Rectangle aBoundRect( rPolyPoly.GetBoundRect() ); - SAL_INFO( "vcl.opengl", "::drawGradient" ); + VCL_GL_INFO( "vcl.opengl", "::drawGradient" ); if( aBoundRect.IsEmpty() ) return true; |