Kaydet (Commit) be7d3df1 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

remove SAL_DEBUGs introduced earlier

Change-Id: I901188b5b0a3e64e2407d039dd80f89cce8cf6de
üst 200dd789
...@@ -169,11 +169,6 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : ...@@ -169,11 +169,6 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
xNameAccess, UNO_QUERY_THROW); xNameAccess, UNO_QUERY_THROW);
Sequence<OUString> serviceNames = xNameAccess->getElementNames(); Sequence<OUString> serviceNames = xNameAccess->getElementNames();
for (sal_Int32 i = 0; i < serviceNames.getLength(); ++i)
{
SAL_DEBUG(serviceNames[i]);
}
const OUString* pCurr = serviceNames.getConstArray(); const OUString* pCurr = serviceNames.getConstArray();
const OUString* const pEnd = pCurr + serviceNames.getLength(); const OUString* const pEnd = pCurr + serviceNames.getLength();
while( pCurr != pEnd ) while( pCurr != pEnd )
...@@ -188,25 +183,13 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : ...@@ -188,25 +183,13 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
if( (xEntryNameAccess->getByName("PreferredImplementations") >>= implementationList) ) if( (xEntryNameAccess->getByName("PreferredImplementations") >>= implementationList) )
{ {
m_aAvailableImplementations.push_back( std::make_pair(*pCurr,implementationList) ); m_aAvailableImplementations.push_back( std::make_pair(*pCurr,implementationList) );
for (sal_Int32 i = 0; i < implementationList.getLength(); ++i)
{
SAL_DEBUG("available :" << implementationList[i]);
}
} }
if( (xEntryNameAccess->getByName("AcceleratedImplementations") >>= implementationList) ) if( (xEntryNameAccess->getByName("AcceleratedImplementations") >>= implementationList) )
{ {
for (sal_Int32 i = 0; i < implementationList.getLength(); ++i)
{
SAL_DEBUG("accelerated: " <<implementationList[i]);
}
m_aAcceleratedImplementations.push_back( std::make_pair(*pCurr,implementationList) ); m_aAcceleratedImplementations.push_back( std::make_pair(*pCurr,implementationList) );
} }
if( (xEntryNameAccess->getByName("AntialiasingImplementations") >>= implementationList) ) if( (xEntryNameAccess->getByName("AntialiasingImplementations") >>= implementationList) )
{ {
for (sal_Int32 i = 0; i < implementationList.getLength(); ++i)
{
SAL_DEBUG("aa implemented: " << implementationList[i]);
}
m_aAAImplementations.push_back( std::make_pair(*pCurr,implementationList) ); m_aAAImplementations.push_back( std::make_pair(*pCurr,implementationList) );
} }
...@@ -294,7 +277,6 @@ Reference<XInterface> CanvasFactory::use( ...@@ -294,7 +277,6 @@ Reference<XInterface> CanvasFactory::use(
Reference<XComponentContext> const & xContext ) const Reference<XComponentContext> const & xContext ) const
{ {
try { try {
SAL_DEBUG("use: " << serviceName);
return m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext( return m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
serviceName, args, xContext); serviceName, args, xContext);
} }
...@@ -337,7 +319,6 @@ Reference<XInterface> CanvasFactory::lookupAndUse( ...@@ -337,7 +319,6 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
Reference<XComponentContext> const & xContext ) const Reference<XComponentContext> const & xContext ) const
{ {
::osl::MutexGuard guard(m_mutex); ::osl::MutexGuard guard(m_mutex);
SAL_DEBUG(serviceName);
// forcing last entry from impl list, if config flag set // forcing last entry from impl list, if config flag set
bool bForceLastEntry(false); bool bForceLastEntry(false);
......
...@@ -389,7 +389,6 @@ namespace oglcanvas ...@@ -389,7 +389,6 @@ namespace oglcanvas
uno::Reference<rendering::XColorSpace> SpriteDeviceHelper::getColorSpace() const uno::Reference<rendering::XColorSpace> SpriteDeviceHelper::getColorSpace() const
{ {
SAL_DEBUG("called SpriteDeviceHelper::getColorSpace()");
// always the same // always the same
return uno::Reference<rendering::XColorSpace>( return uno::Reference<rendering::XColorSpace>(
::canvas::tools::getStdColorSpace(), ::canvas::tools::getStdColorSpace(),
......
...@@ -218,9 +218,7 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders() ...@@ -218,9 +218,7 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()
m_3DModelID = glGetUniformLocation(m_3DProID, "M"); m_3DModelID = glGetUniformLocation(m_3DProID, "M");
m_3DNormalMatrixID = glGetUniformLocation(m_3DProID, "normalMatrix"); m_3DNormalMatrixID = glGetUniformLocation(m_3DProID, "normalMatrix");
m_3DVertexID = glGetAttribLocation(m_3DProID, "vertexPositionModelspace"); m_3DVertexID = glGetAttribLocation(m_3DProID, "vertexPositionModelspace");
SAL_DEBUG("first " << m_3DVertexID);
m_3DNormalID = glGetAttribLocation(m_3DProID, "vertexNormalModelspace"); m_3DNormalID = glGetAttribLocation(m_3DProID, "vertexNormalModelspace");
SAL_DEBUG("second " << m_3DNormalID);
CHECK_GL_ERROR(); CHECK_GL_ERROR();
if (m_bScrollFlag) if (m_bScrollFlag)
{ {
...@@ -289,30 +287,22 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders() ...@@ -289,30 +287,22 @@ void OpenGL3DRenderer::ShaderResources::LoadShaders()
m_TextProID = OpenGLHelper::LoadShaders("textVertexShader", "textFragmentShader"); m_TextProID = OpenGLHelper::LoadShaders("textVertexShader", "textFragmentShader");
m_TextMatrixID = glGetUniformLocation(m_TextProID, "MVP"); m_TextMatrixID = glGetUniformLocation(m_TextProID, "MVP");
m_TextVertexID = glGetAttribLocation(m_TextProID, "vPosition"); m_TextVertexID = glGetAttribLocation(m_TextProID, "vPosition");
SAL_DEBUG(m_TextVertexID);
m_TextTexCoordID = glGetAttribLocation(m_TextProID, "texCoord"); m_TextTexCoordID = glGetAttribLocation(m_TextProID, "texCoord");
SAL_DEBUG(m_TextTexCoordID);
m_TextTexID = glGetUniformLocation(m_TextProID, "TextTex"); m_TextTexID = glGetUniformLocation(m_TextProID, "TextTex");
} }
CHECK_GL_ERROR(); CHECK_GL_ERROR();
m_ScreenTextProID = OpenGLHelper::LoadShaders("screenTextVertexShader", "screenTextFragmentShader"); m_ScreenTextProID = OpenGLHelper::LoadShaders("screenTextVertexShader", "screenTextFragmentShader");
m_ScreenTextVertexID = glGetAttribLocation(m_ScreenTextProID, "vPosition"); m_ScreenTextVertexID = glGetAttribLocation(m_ScreenTextProID, "vPosition");
SAL_DEBUG(m_ScreenTextVertexID);
m_ScreenTextTexCoordID = glGetAttribLocation(m_ScreenTextProID, "texCoord"); m_ScreenTextTexCoordID = glGetAttribLocation(m_ScreenTextProID, "texCoord");
SAL_DEBUG(m_ScreenTextTexCoordID);
m_ScreenTextTexID = glGetUniformLocation(m_ScreenTextProID, "TextTex"); m_ScreenTextTexID = glGetUniformLocation(m_ScreenTextProID, "TextTex");
m_ScreenTextColorID = glGetUniformLocation(m_ScreenTextProID, "textColor"); m_ScreenTextColorID = glGetUniformLocation(m_ScreenTextProID, "textColor");
CHECK_GL_ERROR(); CHECK_GL_ERROR();
m_CommonProID = OpenGLHelper::LoadShaders("commonVertexShader", "commonFragmentShader"); m_CommonProID = OpenGLHelper::LoadShaders("commonVertexShader", "commonFragmentShader");
SAL_DEBUG(m_CommonProID);
m_MatrixID = glGetUniformLocation(m_CommonProID, "MVP"); m_MatrixID = glGetUniformLocation(m_CommonProID, "MVP");
SAL_DEBUG(m_MatrixID);
m_2DColorID = glGetUniformLocation(m_CommonProID, "vColor"); m_2DColorID = glGetUniformLocation(m_CommonProID, "vColor");
SAL_DEBUG(m_2DColorID);
m_2DVertexID = glGetAttribLocation(m_CommonProID, "vPosition"); m_2DVertexID = glGetAttribLocation(m_CommonProID, "vPosition");
SAL_DEBUG(m_2DVertexID);
CHECK_GL_ERROR(); CHECK_GL_ERROR();
} }
...@@ -878,7 +868,6 @@ void OpenGL3DRenderer::RenderLine3D(const Polygon3DInfo& polygon) ...@@ -878,7 +868,6 @@ void OpenGL3DRenderer::RenderLine3D(const Polygon3DInfo& polygon)
// 1rst attribute buffer : vertices // 1rst attribute buffer : vertices
glEnableVertexAttribArray(maResources.m_2DVertexID); glEnableVertexAttribArray(maResources.m_2DVertexID);
SAL_DEBUG(maResources.m_2DVertexID);
CHECK_GL_ERROR(); CHECK_GL_ERROR();
glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer); glBindBuffer(GL_ARRAY_BUFFER, m_VertexBuffer);
CHECK_GL_ERROR(); CHECK_GL_ERROR();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment