diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-18 09:02:03 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-18 09:57:26 +0200 |
commit | 72f36adb93d24a3da8868dad128ab2eca0124fda (patch) | |
tree | 06baca9f873aa59e16c5f3612f5a464c2e0eba46 /vcl/opengl | |
parent | bff8cd3d52223002263dcb8c09758c4fc753b6e3 (diff) |
loplugin:constparams in vcl
Change-Id: I36afe2107e07ffb9b73c0b76be600e3e999a0fd4
Reviewed-on: https://gerrit.libreoffice.org/40116
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/opengl')
-rw-r--r-- | vcl/opengl/FixedTextureAtlas.cxx | 2 | ||||
-rw-r--r-- | vcl/opengl/PackedTextureAtlas.cxx | 2 | ||||
-rw-r--r-- | vcl/opengl/RenderList.cxx | 2 | ||||
-rw-r--r-- | vcl/opengl/gdiimpl.cxx | 4 | ||||
-rw-r--r-- | vcl/opengl/program.cxx | 4 | ||||
-rw-r--r-- | vcl/opengl/salbmp.cxx | 2 | ||||
-rw-r--r-- | vcl/opengl/texture.cxx | 4 | ||||
-rw-r--r-- | vcl/opengl/x11/gdiimpl.cxx | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/vcl/opengl/FixedTextureAtlas.cxx b/vcl/opengl/FixedTextureAtlas.cxx index 7a321d8cccfb..85e9f1331d49 100644 --- a/vcl/opengl/FixedTextureAtlas.cxx +++ b/vcl/opengl/FixedTextureAtlas.cxx @@ -125,7 +125,7 @@ OpenGLTexture FixedTextureAtlasManager::Reserve(int nWidth, int nHeight) return OpenGLTexture(pFixedTexture->mpTexture, aRectangle, nSlot); } -OpenGLTexture FixedTextureAtlasManager::InsertBuffer(int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData) +OpenGLTexture FixedTextureAtlasManager::InsertBuffer(int nWidth, int nHeight, int nFormat, int nType, sal_uInt8 const * pData) { OpenGLTexture aTexture = Reserve(nWidth, nHeight); if (pData == nullptr) diff --git a/vcl/opengl/PackedTextureAtlas.cxx b/vcl/opengl/PackedTextureAtlas.cxx index 8b20bf275cf1..bd1b829427da 100644 --- a/vcl/opengl/PackedTextureAtlas.cxx +++ b/vcl/opengl/PackedTextureAtlas.cxx @@ -163,7 +163,7 @@ OpenGLTexture PackedTextureAtlasManager::Reserve(int nWidth, int nHeight) return OpenGLTexture(); } -OpenGLTexture PackedTextureAtlasManager::InsertBuffer(int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData) +OpenGLTexture PackedTextureAtlasManager::InsertBuffer(int nWidth, int nHeight, int nFormat, int nType, sal_uInt8 const * pData) { OpenGLTexture aTexture = Reserve(nWidth, nHeight); if (aTexture && pData == nullptr) diff --git a/vcl/opengl/RenderList.cxx b/vcl/opengl/RenderList.cxx index 4df0f620587c..a0b86c4a9afa 100644 --- a/vcl/opengl/RenderList.cxx +++ b/vcl/opengl/RenderList.cxx @@ -348,7 +348,7 @@ void RenderList::addDrawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, } } -bool RenderList::addDrawTextureWithMaskColor(OpenGLTexture& rTexture, SalColor nColor, const SalTwoRect& r2Rect) +bool RenderList::addDrawTextureWithMaskColor(OpenGLTexture const & rTexture, SalColor nColor, const SalTwoRect& r2Rect) { if (!rTexture) return false; diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 342a8028cd01..60df24d784ab 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -1316,13 +1316,13 @@ void OpenGLSalGraphicsImpl::DrawMask( OpenGLTexture& rMask, SalColor nMaskColor, mpProgram->Clean(); } -void OpenGLSalGraphicsImpl::DeferredTextDraw(OpenGLTexture& rTexture, SalColor aMaskColor, const SalTwoRect& rPosAry) +void OpenGLSalGraphicsImpl::DeferredTextDraw(OpenGLTexture const & rTexture, SalColor aMaskColor, const SalTwoRect& rPosAry) { mpRenderList->addDrawTextureWithMaskColor(rTexture, aMaskColor, rPosAry); PostBatchDraw(); } -bool OpenGLSalGraphicsImpl::FlushLinesOrTriangles(DrawShaderType eType, RenderParameters& rParameters) +bool OpenGLSalGraphicsImpl::FlushLinesOrTriangles(DrawShaderType eType, RenderParameters const & rParameters) { if (!UseProgram("combinedVertexShader", "combinedFragmentShader", "#define USE_VERTEX_COLORS")) return false; diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx index c3e32e627044..4da881fca210 100644 --- a/vcl/opengl/program.cxx +++ b/vcl/opengl/program.cxx @@ -213,14 +213,14 @@ void OpenGLProgram::SetUniform2f( const OString& rName, GLfloat v1, GLfloat v2 ) CHECK_GL_ERROR(); } -void OpenGLProgram::SetUniform1fv( const OString& rName, GLsizei nCount, GLfloat* aValues ) +void OpenGLProgram::SetUniform1fv( const OString& rName, GLsizei nCount, GLfloat const * aValues ) { GLuint nUniform = GetUniformLocation( rName ); glUniform1fv( nUniform, nCount, aValues ); CHECK_GL_ERROR(); } -void OpenGLProgram::SetUniform2fv( const OString& rName, GLsizei nCount, GLfloat* aValues ) +void OpenGLProgram::SetUniform2fv( const OString& rName, GLsizei nCount, GLfloat const * aValues ) { GLuint nUniform = GetUniformLocation( rName ); glUniform2fv( nUniform, nCount, aValues ); diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index 5c94dfdaa2a9..01072929beb2 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -377,7 +377,7 @@ ImplPixelFormat* ImplPixelFormat::GetFormat( sal_uInt16 nBits, const BitmapPalet } void lclInstantiateTexture(OpenGLTexture& rTexture, const int nWidth, const int nHeight, - const GLenum nFormat, const GLenum nType, sal_uInt8* pData) + const GLenum nFormat, const GLenum nType, sal_uInt8 const * pData) { if (nWidth == nHeight) { diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx index 90cd255d8d95..35001bd02fcc 100644 --- a/vcl/opengl/texture.cxx +++ b/vcl/opengl/texture.cxx @@ -190,7 +190,7 @@ ImplOpenGLTexture::~ImplOpenGLTexture() } } -bool ImplOpenGLTexture::InsertBuffer(int nX, int nY, int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData) +bool ImplOpenGLTexture::InsertBuffer(int nX, int nY, int nWidth, int nHeight, int nFormat, int nType, sal_uInt8 const * pData) { if (!pData || mnTexture == 0) return false; @@ -461,7 +461,7 @@ GLenum OpenGLTexture::GetFilter() const return GL_NEAREST; } -bool OpenGLTexture::CopyData(int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData) +bool OpenGLTexture::CopyData(int nWidth, int nHeight, int nFormat, int nType, sal_uInt8 const * pData) { if (!pData || !IsValid()) return false; diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx index bc5c854c51e3..07a0b6d80fe8 100644 --- a/vcl/opengl/x11/gdiimpl.cxx +++ b/vcl/opengl/x11/gdiimpl.cxx @@ -701,7 +701,7 @@ namespace } } -bool X11OpenGLSalGraphicsImpl::RenderPixmap(X11Pixmap* pPixmap, X11Pixmap* pMask, int nX, int nY, TextureCombo& rCombo) +bool X11OpenGLSalGraphicsImpl::RenderPixmap(X11Pixmap const * pPixmap, X11Pixmap const * pMask, int nX, int nY, TextureCombo& rCombo) { const int aAttribs[] = { |