diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-08-28 17:31:49 +0100 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-08-28 17:33:32 +0100 |
commit | d421ba3b665e6175e3ccfec7397e5f203f3ed54b (patch) | |
tree | 0114ef62cfdf7e4df11b9d02d458915f1ffb4680 /vcl/opengl | |
parent | a0fc658e6d86aebc35cfd2bd695d90eb4c70d47a (diff) |
Add missing helpful GL trace messages outside of the impl. itself.
Change-Id: I5b71e3c9edc3e1e89e52c2e17b5fe0a025ac66ea
Diffstat (limited to 'vcl/opengl')
-rw-r--r-- | vcl/opengl/scale.cxx | 10 | ||||
-rw-r--r-- | vcl/opengl/texture.cxx | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/vcl/opengl/scale.cxx b/vcl/opengl/scale.cxx index 93a3eee2dea3..1ddb6d46b966 100644 --- a/vcl/opengl/scale.cxx +++ b/vcl/opengl/scale.cxx @@ -313,7 +313,7 @@ bool OpenGLSalBitmap::ImplScaleArea( double rScaleX, double rScaleY ) bool OpenGLSalBitmap::ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ) { - SAL_INFO( "vcl.opengl", "::ImplScale" ); + VCL_GL_INFO( "vcl.opengl", "::ImplScale" ); maUserBuffer.reset(); makeCurrent(); @@ -361,13 +361,13 @@ ScaleOp::ScaleOp( bool ScaleOp::Execute() { - SAL_INFO( "vcl.opengl", "::Execute" ); + VCL_GL_INFO( "vcl.opengl", "::Execute" ); return mpBitmap->ImplScale( mfScaleX, mfScaleY, mnScaleFlag ); } void ScaleOp::GetSize( Size& rSize ) const { - SAL_INFO( "vcl.opengl", "::GetSize" ); + VCL_GL_INFO( "vcl.opengl", "::GetSize" ); rSize.setWidth( rSize.Width() * mfScaleX ); rSize.setHeight( rSize.Height() * mfScaleY ); } @@ -376,7 +376,7 @@ bool OpenGLSalBitmap::Scale( const double& rScaleX, const double& rScaleY, BmpSc { OpenGLZone aZone; - SAL_INFO("vcl.opengl", "::Scale " << int(nScaleFlag) + VCL_GL_INFO("vcl.opengl", "::Scale " << int(nScaleFlag) << " from " << mnWidth << "x" << mnHeight << " to " << (mnWidth * rScaleX) << "x" << (mnHeight * rScaleY) ); @@ -390,7 +390,7 @@ bool OpenGLSalBitmap::Scale( const double& rScaleX, const double& rScaleY, BmpSc makeCurrent(); if( mpContext == NULL ) { - SAL_INFO( "vcl.opengl", "Add ScaleOp to pending operations" ); + VCL_GL_INFO( "vcl.opengl", "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 65a0b69b9748..4e62915151cd 100644 --- a/vcl/opengl/texture.cxx +++ b/vcl/opengl/texture.cxx @@ -47,7 +47,7 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int nHeight, bool bAllocate ) glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, nWidth, nHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); glBindTexture( GL_TEXTURE_2D, 0 ); - SAL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " allocate" ); + VCL_GL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " allocate" ); CHECK_GL_ERROR(); } @@ -74,7 +74,7 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nX, int nY, int nWidth, int nHeight ) CHECK_GL_ERROR(); glBindTexture( GL_TEXTURE_2D, 0 ); - SAL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " from x" << nX << ", y" << nY ); + VCL_GL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " from x" << nX << ", y" << nY ); CHECK_GL_ERROR(); } @@ -99,14 +99,14 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int nHeight, int nFormat, int glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, mnWidth, mnHeight, 0, nFormat, nType, pData ); glBindTexture( GL_TEXTURE_2D, 0 ); - SAL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " from data" ); + VCL_GL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " " << nWidth << "x" << nHeight << " from data" ); CHECK_GL_ERROR(); } ImplOpenGLTexture::~ImplOpenGLTexture() { - SAL_INFO( "vcl.opengl", "~OpenGLTexture " << mnTexture ); + VCL_GL_INFO( "vcl.opengl", "~OpenGLTexture " << mnTexture ); if( mnTexture != 0 ) glDeleteTextures( 1, &mnTexture ); } @@ -120,7 +120,7 @@ bool ImplOpenGLTexture::InsertBuffer(int nX, int nY, int nWidth, int nHeight, in glTexSubImage2D(GL_TEXTURE_2D, 0, nX, mnHeight - nY - nHeight, nWidth, nHeight, nFormat, nType, pData); glBindTexture(GL_TEXTURE_2D, 0); - SAL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " Insert buff. to " << nX << " " << nY + VCL_GL_INFO( "vcl.opengl", "OpenGLTexture " << mnTexture << " Insert buff. to " << nX << " " << nY << " size " << nWidth << "x" << nHeight << " from data" ); CHECK_GL_ERROR(); @@ -209,7 +209,7 @@ OpenGLTexture::OpenGLTexture( const OpenGLTexture& rTexture, mnSlotNumber = rTexture.mnSlotNumber; if (mpImpl) mpImpl->IncreaseRefCount(mnSlotNumber); - SAL_INFO( "vcl.opengl", "Copying texture " << Id() << " [" << maRect.Left() << "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() ); + VCL_GL_INFO( "vcl.opengl", "Copying texture " << Id() << " [" << maRect.Left() << "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() ); } OpenGLTexture::~OpenGLTexture() @@ -246,7 +246,7 @@ int OpenGLTexture::GetHeight() const void OpenGLTexture::GetCoord( GLfloat* pCoord, const SalTwoRect& rPosAry, bool bInverted ) const { - SAL_INFO( "vcl.opengl", "Getting coord " << Id() << " [" << maRect.Left() << "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() ); + VCL_GL_INFO( "vcl.opengl", "Getting coord " << Id() << " [" << maRect.Left() << "," << maRect.Top() << "] " << GetWidth() << "x" << GetHeight() ); if( mpImpl == NULL ) { @@ -354,7 +354,7 @@ void OpenGLTexture::Read( GLenum nFormat, GLenum nType, sal_uInt8* pData ) Bind(); glPixelStorei( GL_PACK_ALIGNMENT, 1 ); - SAL_INFO( "vcl.opengl", "Reading texture " << Id() << " " << GetWidth() << "x" << GetHeight() ); + VCL_GL_INFO( "vcl.opengl", "Reading texture " << Id() << " " << GetWidth() << "x" << GetHeight() ); if( GetWidth() == mpImpl->mnWidth && GetHeight() == mpImpl->mnHeight ) { |