summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/opengl/framebuffer.cxx8
-rw-r--r--vcl/opengl/gdiimpl.cxx46
-rw-r--r--vcl/opengl/salbmp.cxx28
-rw-r--r--vcl/opengl/scale.cxx10
-rw-r--r--vcl/opengl/texture.cxx16
-rw-r--r--vcl/source/opengl/OpenGLContext.cxx26
-rw-r--r--vcl/source/opengl/OpenGLHelper.cxx12
-rw-r--r--vcl/source/window/paint.cxx8
-rw-r--r--vcl/win/source/gdi/winlayout.cxx2
9 files changed, 78 insertions, 78 deletions
diff --git a/vcl/opengl/framebuffer.cxx b/vcl/opengl/framebuffer.cxx
index 842c4279829a..c009ccb2601e 100644
--- a/vcl/opengl/framebuffer.cxx
+++ b/vcl/opengl/framebuffer.cxx
@@ -23,7 +23,7 @@ OpenGLFramebuffer::OpenGLFramebuffer() :
{
glGenFramebuffers( 1, &mnId );
CHECK_GL_ERROR();
- VCL_GL_INFO( "vcl.opengl", "Created framebuffer " << (int)mnId );
+ VCL_GL_INFO( "Created framebuffer " << (int)mnId );
}
OpenGLFramebuffer::~OpenGLFramebuffer()
@@ -34,7 +34,7 @@ OpenGLFramebuffer::~OpenGLFramebuffer()
void OpenGLFramebuffer::Bind()
{
- VCL_GL_INFO( "vcl.opengl", "Binding framebuffer " << (int)mnId );
+ VCL_GL_INFO( "Binding framebuffer " << (int)mnId );
glBindFramebuffer( GL_FRAMEBUFFER, mnId );
CHECK_GL_ERROR();
}
@@ -43,7 +43,7 @@ void OpenGLFramebuffer::Unbind()
{
glBindFramebuffer( GL_FRAMEBUFFER, 0 );
CHECK_GL_ERROR();
- VCL_GL_INFO( "vcl.opengl", "Binding default framebuffer" );
+ VCL_GL_INFO( "Binding default framebuffer" );
}
bool OpenGLFramebuffer::IsFree() const
@@ -66,7 +66,7 @@ void OpenGLFramebuffer::AttachTexture( const OpenGLTexture& rTexture )
if( rTexture.Id() == mnAttachedTexture )
return;
- VCL_GL_INFO( "vcl.opengl", "Attaching texture " << rTexture.Id() << " to framebuffer " << (int)mnId );
+ VCL_GL_INFO( "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 1c22640fecbe..3771d3cec740 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -294,7 +294,7 @@ const vcl::Region& OpenGLSalGraphicsImpl::getClipRegion() const
bool OpenGLSalGraphicsImpl::setClipRegion( const vcl::Region& rClip )
{
- VCL_GL_INFO( "vcl.opengl", "::setClipRegion " << rClip );
+ VCL_GL_INFO( "::setClipRegion " << rClip );
maClipRegion = rClip;
mbUseStencil = false;
@@ -310,7 +310,7 @@ bool OpenGLSalGraphicsImpl::setClipRegion( const vcl::Region& rClip )
// set the clip region to empty
void OpenGLSalGraphicsImpl::ResetClipRegion()
{
- VCL_GL_INFO( "vcl.opengl", "::ResetClipRegion" );
+ VCL_GL_INFO( "::ResetClipRegion" );
maClipRegion.SetEmpty();
mbUseScissor = false;
mbUseStencil = false;
@@ -1236,7 +1236,7 @@ void OpenGLSalGraphicsImpl::DrawRadialGradient( const Gradient& rGradient, const
// draw --> LineColor and FillColor and RasterOp and ClipRegion
void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY )
{
- VCL_GL_INFO( "vcl.opengl", "::drawPixel" );
+ VCL_GL_INFO( "::drawPixel" );
if( mnLineColor != SALCOLOR_NONE )
{
PreDraw();
@@ -1248,7 +1248,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY )
void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY, SalColor nSalColor )
{
- VCL_GL_INFO( "vcl.opengl", "::drawPixel" );
+ VCL_GL_INFO( "::drawPixel" );
if( nSalColor != SALCOLOR_NONE )
{
PreDraw();
@@ -1260,7 +1260,7 @@ void OpenGLSalGraphicsImpl::drawPixel( long nX, long nY, SalColor nSalColor )
void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
{
- VCL_GL_INFO( "vcl.opengl", "::drawLine" );
+ VCL_GL_INFO( "::drawLine" );
if( mnLineColor != SALCOLOR_NONE )
{
PreDraw();
@@ -1272,7 +1272,7 @@ void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeight )
{
- VCL_GL_INFO( "vcl.opengl", "::drawRect" );
+ VCL_GL_INFO( "::drawRect" );
PreDraw();
if( UseSolid( mnFillColor ) )
@@ -1307,7 +1307,7 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeigh
void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
- VCL_GL_INFO( "vcl.opengl", "::drawPolyLine" );
+ VCL_GL_INFO( "::drawPolyLine" );
if( mnLineColor != SALCOLOR_NONE && nPoints > 1 )
{
@@ -1320,7 +1320,7 @@ void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pP
void OpenGLSalGraphicsImpl::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
- VCL_GL_INFO( "vcl.opengl", "::drawPolygon" );
+ VCL_GL_INFO( "::drawPolygon" );
if( nPoints == 0 )
return;
if( nPoints == 1 )
@@ -1348,7 +1348,7 @@ void OpenGLSalGraphicsImpl::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPt
void OpenGLSalGraphicsImpl::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry )
{
- VCL_GL_INFO( "vcl.opengl", "::drawPolyPolygon" );
+ VCL_GL_INFO( "::drawPolyPolygon" );
if( nPoly <= 0 )
return;
@@ -1385,7 +1385,7 @@ void OpenGLSalGraphicsImpl::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32*
bool OpenGLSalGraphicsImpl::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rPolyPolygon, double fTransparency )
{
- VCL_GL_INFO( "vcl.opengl", "::drawPolyPolygon trans " << fTransparency );
+ VCL_GL_INFO( "::drawPolyPolygon trans " << fTransparency );
if( rPolyPolygon.count() <= 0 )
return true;
@@ -1414,7 +1414,7 @@ bool OpenGLSalGraphicsImpl::drawPolyLine(
basegfx::B2DLineJoin eLineJoin,
css::drawing::LineCap eLineCap)
{
- VCL_GL_INFO( "vcl.opengl", "::drawPolyLine trans " << fTransparency );
+ VCL_GL_INFO( "::drawPolyLine trans " << fTransparency );
if( mnLineColor == SALCOLOR_NONE )
return true;
@@ -1509,7 +1509,7 @@ void OpenGLSalGraphicsImpl::copyArea(
long nSrcWidth, long nSrcHeight,
sal_uInt16 /*nFlags*/ )
{
- VCL_GL_INFO( "vcl.opengl", "::copyArea " << nSrcX << "," << nSrcY << " >> " << nDestX << "," << nDestY << " (" << nSrcWidth << "," << nSrcHeight << ")" );
+ VCL_GL_INFO( "::copyArea " << nSrcX << "," << nSrcY << " >> " << nDestX << "," << nDestY << " (" << nSrcWidth << "," << nSrcHeight << ")" );
OpenGLTexture aTexture;
SalTwoRect aPosAry(0, 0, nSrcWidth, nSrcHeight, nDestX, nDestY, nSrcWidth, nSrcHeight);
@@ -1525,7 +1525,7 @@ void OpenGLSalGraphicsImpl::copyArea(
// CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
void OpenGLSalGraphicsImpl::DoCopyBits( const SalTwoRect& rPosAry, OpenGLSalGraphicsImpl& rImpl )
{
- VCL_GL_INFO( "vcl.opengl", "::copyBits" );
+ VCL_GL_INFO( "::copyBits" );
if( &rImpl == this &&
(rPosAry.mnSrcWidth == rPosAry.mnDestWidth) &&
@@ -1562,7 +1562,7 @@ void OpenGLSalGraphicsImpl::drawBitmap( const SalTwoRect& rPosAry, const SalBitm
const OpenGLSalBitmap& rBitmap = static_cast<const OpenGLSalBitmap&>(rSalBitmap);
OpenGLTexture& rTexture = rBitmap.GetTexture();
- VCL_GL_INFO( "vcl.opengl", "::drawBitmap" );
+ VCL_GL_INFO( "::drawBitmap" );
PreDraw();
DrawTexture( rTexture, rPosAry );
PostDraw();
@@ -1578,7 +1578,7 @@ void OpenGLSalGraphicsImpl::drawBitmap(
OpenGLTexture& rTexture( rBitmap.GetTexture() );
OpenGLTexture& rMaskTex( rMask.GetTexture() );
- VCL_GL_INFO( "vcl.opengl", "::drawBitmap with MASK" );
+ VCL_GL_INFO( "::drawBitmap with MASK" );
PreDraw();
DrawTextureWithMask( rTexture, rMaskTex, rPosAry );
PostDraw();
@@ -1592,7 +1592,7 @@ void OpenGLSalGraphicsImpl::drawMask(
const OpenGLSalBitmap& rBitmap = static_cast<const OpenGLSalBitmap&>(rSalBitmap);
OpenGLTexture& rTexture( rBitmap.GetTexture() );
- VCL_GL_INFO( "vcl.opengl", "::drawMask" );
+ VCL_GL_INFO( "::drawMask" );
PreDraw();
DrawMask( rTexture, nMaskColor, rPosAry );
PostDraw();
@@ -1601,7 +1601,7 @@ void OpenGLSalGraphicsImpl::drawMask(
SalBitmap* OpenGLSalGraphicsImpl::getBitmap( long nX, long nY, long nWidth, long nHeight )
{
OpenGLSalBitmap* pBitmap = new OpenGLSalBitmap;
- VCL_GL_INFO( "vcl.opengl", "::getBitmap " << nX << "," << nY <<
+ VCL_GL_INFO( "::getBitmap " << nX << "," << nY <<
" " << nWidth << "x" << nHeight );
//TODO really needed?
PreDraw();
@@ -1693,7 +1693,7 @@ bool OpenGLSalGraphicsImpl::blendBitmap(
const OpenGLSalBitmap& rBitmap = static_cast<const OpenGLSalBitmap&>(rSalBitmap);
OpenGLTexture& rTexture( rBitmap.GetTexture() );
- VCL_GL_INFO( "vcl.opengl", "::blendBitmap" );
+ VCL_GL_INFO( "::blendBitmap" );
PreDraw();
glEnable( GL_BLEND );
CHECK_GL_ERROR();
@@ -1719,7 +1719,7 @@ bool OpenGLSalGraphicsImpl::blendAlphaBitmap(
OpenGLTexture& rMask( rMaskBitmap.GetTexture() );
OpenGLTexture& rAlpha( rAlphaBitmap.GetTexture() );
- VCL_GL_INFO( "vcl.opengl", "::blendAlphaBitmap" );
+ VCL_GL_INFO( "::blendAlphaBitmap" );
PreDraw();
DrawBlendedTexture( rTexture, rMask, rAlpha, rPosAry );
PostDraw();
@@ -1748,7 +1748,7 @@ bool OpenGLSalGraphicsImpl::drawAlphaBitmap(
OpenGLTexture& rTexture( rBitmap.GetTexture() );
OpenGLTexture& rAlphaTex( rAlpha.GetTexture() );
- VCL_GL_INFO( "vcl.opengl", "::drawAlphaBitmap" );
+ VCL_GL_INFO( "::drawAlphaBitmap" );
PreDraw();
DrawTextureWithMask( rTexture, rAlphaTex, rPosAry );
PostDraw();
@@ -1771,7 +1771,7 @@ bool OpenGLSalGraphicsImpl::drawTransformedBitmap(
if( pMaskBitmap != nullptr )
aMask = pMaskBitmap->GetTexture();
- VCL_GL_INFO( "vcl.opengl", "::drawTransformedBitmap" );
+ VCL_GL_INFO( "::drawTransformedBitmap" );
PreDraw();
DrawTransformedTexture( rTexture, aMask, rNull, rX, rY );
PostDraw();
@@ -1790,7 +1790,7 @@ bool OpenGLSalGraphicsImpl::drawAlphaRect(
long nWidth, long nHeight,
sal_uInt8 nTransparency )
{
- VCL_GL_INFO( "vcl.opengl", "::drawAlphaRect" );
+ VCL_GL_INFO( "::drawAlphaRect" );
if( mnFillColor != SALCOLOR_NONE && nTransparency < 100 )
{
PreDraw();
@@ -1807,7 +1807,7 @@ bool OpenGLSalGraphicsImpl::drawGradient(const tools::PolyPolygon& rPolyPoly,
{
Rectangle aBoundRect( rPolyPoly.GetBoundRect() );
- VCL_GL_INFO( "vcl.opengl", "::drawGradient" );
+ VCL_GL_INFO( "::drawGradient" );
if( aBoundRect.IsEmpty() )
return true;
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 56a545737199..9a704d9d2879 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -78,7 +78,7 @@ OpenGLSalBitmap::OpenGLSalBitmap()
OpenGLSalBitmap::~OpenGLSalBitmap()
{
Destroy();
- VCL_GL_INFO( "vcl.opengl", "~OpenGLSalBitmap" );
+ VCL_GL_INFO( "~OpenGLSalBitmap" );
}
bool OpenGLSalBitmap::Create( const OpenGLTexture& rTex, long nX, long nY, long nWidth, long nHeight )
@@ -87,7 +87,7 @@ bool OpenGLSalBitmap::Create( const OpenGLTexture& rTex, long nX, long nY, long
OpenGLZone aZone;
Destroy();
- VCL_GL_INFO( "vcl.opengl", "OpenGLSalBitmap::Create from FBO: ["
+ VCL_GL_INFO( "OpenGLSalBitmap::Create from FBO: ["
<< nX << ", " << nY << "] " << nWidth << "x" << nHeight );
mnWidth = nWidth;
@@ -104,7 +104,7 @@ bool OpenGLSalBitmap::Create( const OpenGLTexture& rTex, long nX, long nY, long
else
maTexture = OpenGLTexture( nX, nY, nWidth, nHeight );
mbDirtyTexture = false;
- VCL_GL_INFO( "vcl.opengl", "Created texture " << maTexture.Id() );
+ VCL_GL_INFO( "Created texture " << maTexture.Id() );
return true;
}
@@ -114,7 +114,7 @@ bool OpenGLSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const BitmapP
OpenGLZone aZone;
Destroy();
- VCL_GL_INFO( "vcl.opengl", "OpenGLSalBitmap::Create with size: " << rSize );
+ VCL_GL_INFO( "OpenGLSalBitmap::Create with size: " << rSize );
if( !isValidBitCount( nBits ) )
return false;
@@ -144,7 +144,7 @@ bool OpenGLSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount
const OpenGLSalBitmap& rSourceBitmap = static_cast<const OpenGLSalBitmap&>(rSalBmp);
- VCL_GL_INFO("vcl.opengl", "OpenGLSalBitmap::Create from BMP: "
+ VCL_GL_INFO("OpenGLSalBitmap::Create from BMP: "
<< rSourceBitmap.mnWidth << "x" << rSourceBitmap.mnHeight
<< " Bits old: " << mnBits << " new:" << nNewBitCount );
@@ -188,7 +188,7 @@ OpenGLTexture& OpenGLSalBitmap::GetTexture() const
pThis->CreateTexture();
else if( !maPendingOps.empty() )
pThis->ExecuteOperations();
- VCL_GL_INFO( "vcl.opengl", "Got texture " << maTexture.Id() );
+ VCL_GL_INFO( "Got texture " << maTexture.Id() );
return pThis->maTexture;
}
@@ -196,7 +196,7 @@ void OpenGLSalBitmap::Destroy()
{
OpenGLZone aZone;
- VCL_GL_INFO("vcl.opengl", "Destroy OpenGLSalBitmap texture:" << maTexture.Id());
+ VCL_GL_INFO("Destroy OpenGLSalBitmap texture:" << maTexture.Id());
maPendingOps.clear();
maTexture = OpenGLTexture();
maUserBuffer.reset();
@@ -204,7 +204,7 @@ void OpenGLSalBitmap::Destroy()
bool OpenGLSalBitmap::AllocateUserData()
{
- VCL_GL_INFO( "vcl.opengl", "OpenGLSalBitmap::AllocateUserData" );
+ VCL_GL_INFO( "OpenGLSalBitmap::AllocateUserData" );
if( mnWidth && mnHeight )
{
@@ -391,7 +391,7 @@ void OpenGLSalBitmap::ExecuteOperations()
GLuint OpenGLSalBitmap::CreateTexture()
{
- VCL_GL_INFO( "vcl.opengl", "::CreateTexture bits: " << mnBits);
+ VCL_GL_INFO( "::CreateTexture bits: " << mnBits);
GLenum nFormat = GL_RGBA;
GLenum nType = GL_UNSIGNED_BYTE;
sal_uInt8* pData( nullptr );
@@ -426,7 +426,7 @@ GLuint OpenGLSalBitmap::CreateTexture()
}
else
{
- VCL_GL_INFO( "vcl.opengl", "::CreateTexture - convert from " << mnBits << " to 24 bits" );
+ VCL_GL_INFO( "::CreateTexture - convert from " << mnBits << " to 24 bits" );
// convert to 24 bits RGB using palette
pData = new sal_uInt8[mnBufHeight * mnBufWidth * 3];
@@ -463,7 +463,7 @@ GLuint OpenGLSalBitmap::CreateTexture()
lclInstantiateTexture(maTexture, mnBufWidth, mnBufHeight, nFormat, nType, pData);
- VCL_GL_INFO("vcl.opengl", "Created texture " << maTexture.Id() << " bits: " << mnBits);
+ VCL_GL_INFO("Created texture " << maTexture.Id() << " bits: " << mnBits);
if( bAllocated )
delete[] pData;
@@ -479,7 +479,7 @@ bool OpenGLSalBitmap::ReadTexture()
{
sal_uInt8* pData = maUserBuffer.get();
- VCL_GL_INFO( "vcl.opengl", "::ReadTexture " << mnWidth << "x" << mnHeight << " bits: " << mnBits);
+ VCL_GL_INFO( "::ReadTexture " << mnWidth << "x" << mnHeight << " bits: " << mnBits);
if( pData == nullptr )
return false;
@@ -701,7 +701,7 @@ BitmapBuffer* OpenGLSalBitmap::AcquireBuffer( BitmapAccessMode nMode )
if( !maPendingOps.empty() )
{
- VCL_GL_INFO( "vcl.opengl", "** Creating texture and reading it back immediately" );
+ VCL_GL_INFO( "** Creating texture and reading it back immediately" );
if( !CreateTexture() || !AllocateUserData() || !ReadTexture() )
return nullptr;
}
@@ -825,7 +825,7 @@ bool OpenGLSalBitmap::GetSystemData( BitmapSystemData& /*rData*/ )
bool OpenGLSalBitmap::Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol )
{
- VCL_GL_INFO("vcl.opengl", "::Replace");
+ VCL_GL_INFO("::Replace");
OpenGLZone aZone;
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx
index 24c137df565f..102ec73303f9 100644
--- a/vcl/opengl/scale.cxx
+++ b/vcl/opengl/scale.cxx
@@ -276,7 +276,7 @@ bool OpenGLSalBitmap::ImplScaleArea( double rScaleX, double rScaleY )
bool OpenGLSalBitmap::ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag )
{
- VCL_GL_INFO( "vcl.opengl", "::ImplScale" );
+ VCL_GL_INFO( "::ImplScale" );
maUserBuffer.reset();
makeCurrent();
@@ -324,13 +324,13 @@ ScaleOp::ScaleOp(
bool ScaleOp::Execute()
{
- VCL_GL_INFO( "vcl.opengl", "::Execute" );
+ VCL_GL_INFO( "::Execute" );
return mpBitmap->ImplScale( mfScaleX, mfScaleY, mnScaleFlag );
}
void ScaleOp::GetSize( Size& rSize ) const
{
- VCL_GL_INFO( "vcl.opengl", "::GetSize" );
+ VCL_GL_INFO( "::GetSize" );
rSize.setWidth( rSize.Width() * mfScaleX );
rSize.setHeight( rSize.Height() * mfScaleY );
}
@@ -339,7 +339,7 @@ bool OpenGLSalBitmap::Scale( const double& rScaleX, const double& rScaleY, BmpSc
{
OpenGLZone aZone;
- VCL_GL_INFO("vcl.opengl", "::Scale " << int(nScaleFlag)
+ VCL_GL_INFO("::Scale " << int(nScaleFlag)
<< " from " << mnWidth << "x" << mnHeight
<< " to " << (mnWidth * rScaleX) << "x" << (mnHeight * rScaleY) );
@@ -353,7 +353,7 @@ bool OpenGLSalBitmap::Scale( const double& rScaleX, const double& rScaleY, BmpSc
makeCurrent();
if( mpContext == nullptr )
{
- VCL_GL_INFO( "vcl.opengl", "Add ScaleOp to pending operations" );
+ VCL_GL_INFO( "Add ScaleOp to pending operations" );
maPendingOps.push_back( new ScaleOp( this, rScaleX, rScaleY, nScaleFlag ) );
}
else
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index 35984b9dd0c5..2d4cb4041fc6 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -57,7 +57,7 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int nHeight, bool bAllocate )
glBindTexture( GL_TEXTURE_2D, 0 );
CHECK_GL_ERROR();
- VCL_GL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " allocate" );
+ VCL_GL_INFO( "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " allocate" );
}
// texture with content retrieved from FBO
@@ -89,7 +89,7 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nX, int nY, int nWidth, int nHeight )
glBindTexture( GL_TEXTURE_2D, 0 );
CHECK_GL_ERROR();
- VCL_GL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " from x" << nX << ", y" << nY );
+ VCL_GL_INFO( "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " from x" << nX << ", y" << nY );
}
// texture from buffer data
@@ -123,12 +123,12 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int nHeight, int nFormat, int
glBindTexture( GL_TEXTURE_2D, 0 );
CHECK_GL_ERROR();
- VCL_GL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " from data" );
+ VCL_GL_INFO( "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " from data" );
}
ImplOpenGLTexture::~ImplOpenGLTexture()
{
- VCL_GL_INFO( "vcl.opengl", "~OpenGLTexture " << mnTexture );
+ VCL_GL_INFO( "~OpenGLTexture " << mnTexture );
if( mnTexture != 0 )
{
// FIXME: this is really not optimal performance-wise.
@@ -156,7 +156,7 @@ bool ImplOpenGLTexture::InsertBuffer(int nX, int nY, int nWidth, int nHeight, in
glBindTexture(GL_TEXTURE_2D, 0);
CHECK_GL_ERROR();
- VCL_GL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " Insert buff. to " << nX << " " << nY
+ VCL_GL_INFO( "OpenGLTexture " << mnTexture << " Insert buff. to " << nX << " " << nY
<< " size " << nWidth << "x" << nHeight << " from data" );
return true;
@@ -244,7 +244,7 @@ OpenGLTexture::OpenGLTexture( const OpenGLTexture& rTexture,
mnSlotNumber = rTexture.mnSlotNumber;
if (mpImpl)
mpImpl->IncreaseRefCount(mnSlotNumber);
- VCL_GL_INFO( "vcl.opengl", "Copying texture " << Id() << " [" << maRect.Left() << "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() );
+ VCL_GL_INFO( "Copying texture " << Id() << " [" << maRect.Left() << "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() );
}
OpenGLTexture::~OpenGLTexture()
@@ -281,7 +281,7 @@ int OpenGLTexture::GetHeight() const
void OpenGLTexture::GetCoord( GLfloat* pCoord, const SalTwoRect& rPosAry, bool bInverted ) const
{
- VCL_GL_INFO( "vcl.opengl", "Getting coord " << Id() << " [" << maRect.Left() << "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() );
+ VCL_GL_INFO( "Getting coord " << Id() << " [" << maRect.Left() << "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() );
if( mpImpl == nullptr )
{
@@ -386,7 +386,7 @@ void OpenGLTexture::Read( GLenum nFormat, GLenum nType, sal_uInt8* pData )
return;
}
- VCL_GL_INFO( "vcl.opengl", "Reading texture " << Id() << " " << GetWidth() << "x" << GetHeight() );
+ VCL_GL_INFO( "Reading texture " << Id() << " " << GetWidth() << "x" << GetHeight() );
if( GetWidth() == mpImpl->mnWidth && GetHeight() == mpImpl->mnHeight )
{
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 0dc05fc2025f..4a68ab823bf7 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -69,7 +69,7 @@ OpenGLContext::OpenGLContext():
mpPrevContext(nullptr),
mpNextContext(nullptr)
{
- VCL_GL_INFO("vcl.opengl", "new context: " << this);
+ VCL_GL_INFO("new context: " << this);
ImplSVData* pSVData = ImplGetSVData();
if( pSVData->maGDIData.mpLastContext )
@@ -87,7 +87,7 @@ OpenGLContext::OpenGLContext():
OpenGLContext::~OpenGLContext()
{
- VCL_GL_INFO("vcl.opengl", "delete context: " << this);
+ VCL_GL_INFO("delete context: " << this);
assert (mnRefCount == 0);
mnRefCount = 1; // guard the shutdown paths.
@@ -511,7 +511,7 @@ GLXFBConfig* getFBConfig(Display* dpy, Window win, int& nBestFBC, bool bUseDoubl
if( dpy == nullptr || !glXQueryExtension( dpy, nullptr, nullptr ) )
return nullptr;
- VCL_GL_INFO("vcl.opengl", "window: " << win);
+ VCL_GL_INFO("window: " << win);
XWindowAttributes xattr;
if( !XGetWindowAttributes( dpy, win, &xattr ) )
@@ -598,7 +598,7 @@ Visual* getVisual(Display* dpy, Window win)
SAL_WARN("vcl.opengl", "Failed to get window attributes for getVisual " << win);
xattr.visual = nullptr;
}
- VCL_GL_INFO("vcl.opengl", "using VisualID " << xattr.visual);
+ VCL_GL_INFO("using VisualID " << xattr.visual);
return xattr.visual;
}
@@ -716,7 +716,7 @@ bool OpenGLContext::ImplInit()
TempErrorHandler aErrorHandler(m_aGLWin.dpy, unxErrorHandler);
#endif
- VCL_GL_INFO("vcl.opengl", "OpenGLContext::ImplInit----start");
+ VCL_GL_INFO("OpenGLContext::ImplInit----start");
if (!g_vShareList.empty())
pSharedCtx = g_vShareList.front();
@@ -811,7 +811,7 @@ bool OpenGLContext::ImplInit()
if( errorTriggered )
SAL_WARN("vcl.opengl", "error when trying to set swap interval, NVIDIA or Mesa bug?");
else
- VCL_GL_INFO("vcl.opengl", "set swap interval to 1 (enable vsync)");
+ VCL_GL_INFO("set swap interval to 1 (enable vsync)");
}
}
@@ -841,7 +841,7 @@ bool OpenGLContext::ImplInit()
{
OpenGLZone aZone;
- VCL_GL_INFO("vcl.opengl", "OpenGLContext::ImplInit----start");
+ VCL_GL_INFO("OpenGLContext::ImplInit----start");
// PixelFormat tells Windows how we want things to be
PIXELFORMATDESCRIPTOR PixelFormatFront =
{
@@ -984,7 +984,7 @@ bool OpenGLContext::ImplInit()
{
OpenGLZone aZone;
- VCL_GL_INFO("vcl.opengl", "OpenGLContext::ImplInit----start");
+ VCL_GL_INFO("OpenGLContext::ImplInit----start");
NSOpenGLView* pView = getOpenGLView();
OpenGLWrapper::makeCurrent(pView);
@@ -997,7 +997,7 @@ bool OpenGLContext::ImplInit()
bool OpenGLContext::ImplInit()
{
- VCL_GL_INFO("vcl.opengl", "OpenGLContext not implemented for this platform");
+ VCL_GL_INFO("OpenGLContext not implemented for this platform");
return false;
}
@@ -1021,7 +1021,7 @@ bool OpenGLContext::InitGLEW()
bGlewInit = true;
}
- VCL_GL_INFO("vcl.opengl", "OpenGLContext::ImplInit----end");
+ VCL_GL_INFO("OpenGLContext::ImplInit----end");
mbInitialized = true;
return true;
}
@@ -1047,7 +1047,7 @@ void OpenGLContext::InitGLEWDebugging()
}
// Test hooks for inserting tracing messages into the stream
- VCL_GL_INFO("vcl.opengl", "LibreOffice GLContext initialized: " << this);
+ VCL_GL_INFO("LibreOffice GLContext initialized: " << this);
#endif
}
@@ -1322,7 +1322,7 @@ SystemWindowData OpenGLContext::generateWinData(vcl::Window* pParent, bool)
if( vi )
{
- VCL_GL_INFO("vcl.opengl", "using VisualID " << vi->visualid);
+ VCL_GL_INFO("using VisualID " << vi->visualid);
aWinData.pVisual = static_cast<void*>(vi->visual);
}
#endif
@@ -1436,7 +1436,7 @@ void OpenGLContext::registerAsCurrent()
// move the context to the end of the contexts list
static int nSwitch = 0;
- VCL_GL_INFO("vcl.opengl", "******* CONTEXT SWITCH " << ++nSwitch << " *********");
+ VCL_GL_INFO("******* CONTEXT SWITCH " << ++nSwitch << " *********");
if( mpNextContext )
{
if( mpPrevContext )
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index bfb043dc7450..c7cbfa354d15 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -396,14 +396,14 @@ GLint OpenGLHelper::LoadShaders(const OUString& rVertexShaderName,
OString aFileName =
createFileName(rVertexShaderName, rFragmentShaderName, rDigest);
bBinaryResult = loadProgramBinary(ProgramID, aFileName);
- VCL_GL_INFO("vcl.opengl", "Load binary shader from '" << aFileName << "'" << bBinaryResult);
+ VCL_GL_INFO("Load binary shader from '" << aFileName << "'" << bBinaryResult);
CHECK_GL_ERROR();
}
if( bBinaryResult != GL_FALSE )
return ProgramID;
- VCL_GL_INFO("vcl.opengl", "Load shader: vertex " << rVertexShaderName << " fragment " << rFragmentShaderName);
+ VCL_GL_INFO("Load shader: vertex " << rVertexShaderName << " fragment " << rFragmentShaderName);
// Create the shaders
GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
@@ -954,12 +954,12 @@ bool OpenGLWrapper::isVCLOpenGLEnabled()
return OpenGLHelper::isVCLOpenGLEnabled();
}
-void OpenGLHelper::debugMsgStream(const char *pArea, std::ostringstream const &pStream)
+void OpenGLHelper::debugMsgStream(std::ostringstream const &pStream)
{
- debugMsgPrint(pArea, "%s", pStream.str().c_str());
+ debugMsgPrint("%s", pStream.str().c_str());
}
-void OpenGLHelper::debugMsgPrint(const char *pArea, const char *pFormat, ...)
+void OpenGLHelper::debugMsgPrint(const char *pFormat, ...)
{
va_list aArgs;
va_start (aArgs, pFormat);
@@ -975,7 +975,7 @@ void OpenGLHelper::debugMsgPrint(const char *pArea, const char *pFormat, ...)
if (!bHasContext)
strcat(pStr, "- no GL context");
- SAL_INFO(pArea, pStr);
+ SAL_INFO("vcl.opengl", pStr);
if (bHasContext)
{
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 3a13be39fb58..22f98498aaff 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -64,7 +64,7 @@ PaintBufferGuard::PaintBufferGuard(ImplFrameData* pFrameData, vcl::Window* pWind
pFrameData->mpBuffer->SetBackground(pWindow->GetBackground());
}
//else
- //SAL_WARN("vcl.doublebuffering", "the root of the double-buffering hierarchy should not have a transparent background");
+ //SAL_WARN("vcl.window", "the root of the double-buffering hierarchy should not have a transparent background");
PushFlags nFlags = PushFlags::NONE;
nFlags |= PushFlags::CLIPREGION;
@@ -273,7 +273,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
pWindowImpl->mnPaintFlags = 0;
if (!pWindowImpl->maInvalidateRegion.IsEmpty())
{
- VCL_GL_INFO("vcl.opengl", "PaintHelper::DoPaint on " <<
+ VCL_GL_INFO("PaintHelper::DoPaint on " <<
typeid( *m_pWindow ).name() << " '" << m_pWindow->GetText() << "' begin");
OutputDevice::PaintScope aScope( m_pWindow );
@@ -286,7 +286,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
// but we are in the middle of double-buffered paint, we might be
// losing information
if (pFrameData->mbInBufferedPaint && !m_pWindow->SupportsDoubleBuffering())
- SAL_WARN("vcl.doublebuffering", "non-double buffered window in the double-buffered hierarchy, painting directly: " << typeid(*m_pWindow.get()).name());
+ SAL_WARN("vcl.window", "non-double buffered window in the double-buffered hierarchy, painting directly: " << typeid(*m_pWindow.get()).name());
if (pFrameData->mbInBufferedPaint && m_pWindow->SupportsDoubleBuffering())
{
@@ -306,7 +306,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
m_pWindow->Paint(*m_pWindow, m_aPaintRect);
}
- VCL_GL_INFO("vcl.opengl", "PaintHelper::DoPaint end on " <<
+ VCL_GL_INFO("PaintHelper::DoPaint end on " <<
typeid( *m_pWindow ).name() << " '" << m_pWindow->GetText() << "'");
}
}
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index ec07be1ab889..980daa8ffae2 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1833,7 +1833,7 @@ bool UniscribeLayout::CacheGlyphs(SalGraphics& rGraphics) const
continue;
GLyphyDemo::glyph_info_t aGI;
- VCL_GL_INFO("vcl.opengl", "Calling demo_font_lookup_glyph");
+ VCL_GL_INFO("Calling demo_font_lookup_glyph");
GLyphyDemo::demo_font_lookup_glyph( mrWinFontEntry.mpGLyphyFont, mpOutGlyphs[i], &aGI );
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 15:08:43 +0000