diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.com> | 2016-02-24 00:44:58 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-02-29 09:41:17 +0000 |
| commit | 334288af53e15f4b16f520a48e84e84c6980b8c7 (patch) | |
| tree | ff281ab3bc0ded1e69503719a118b59bc2cadea8 /vcl/opengl/program.cxx | |
| parent | 0f571cf2781d98a1897952aa53329ebb3716dc19 (diff) | |
opengl: shader based polyline rendering - fixes tdf#97137 for OGL
Adds native opengl polyline rendering to draw polylines, line joins
and line caps as triangle strips. The vertex shader allows for the
dynamic line width by calculating the correct vertex posiitons,
and the fragment shader is used for anti-aliasing.
(cherry picked from commit d18ad8a7fb3257001a5045e11f3f770a48a7fa69)
Change-Id: If7982c828cae1fae59c57194c8ac77e5ad7f1d26
Reviewed-on: https://gerrit.libreoffice.org/22706
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl/opengl/program.cxx')
| -rw-r--r-- | vcl/opengl/program.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vcl/opengl/program.cxx b/vcl/opengl/program.cxx index 588700b537d9..340b10f6bb8f 100644 --- a/vcl/opengl/program.cxx +++ b/vcl/opengl/program.cxx @@ -22,6 +22,7 @@ OpenGLProgram::OpenGLProgram() : mnTexCoordAttrib( SAL_MAX_UINT32 ), mnAlphaCoordAttrib( SAL_MAX_UINT32 ), mnMaskCoordAttrib( SAL_MAX_UINT32 ), + mnNormalAttrib( SAL_MAX_UINT32 ), mbBlending( false ), mfLastWidth(0.0), mfLastHeight(0.0), @@ -100,7 +101,7 @@ bool OpenGLProgram::Clean() return true; } -void OpenGLProgram::SetVertexAttrib( GLuint& rAttrib, const OString& rName, const GLvoid* pData ) +void OpenGLProgram::SetVertexAttrib( GLuint& rAttrib, const OString& rName, const GLvoid* pData, GLint nSize ) { if( rAttrib == SAL_MAX_UINT32 ) { @@ -113,7 +114,7 @@ void OpenGLProgram::SetVertexAttrib( GLuint& rAttrib, const OString& rName, cons CHECK_GL_ERROR(); mnEnabledAttribs |= ( 1 << rAttrib ); } - glVertexAttribPointer( rAttrib, 2, GL_FLOAT, GL_FALSE, 0, pData ); + glVertexAttribPointer( rAttrib, nSize, GL_FLOAT, GL_FALSE, 0, pData ); CHECK_GL_ERROR(); } @@ -137,6 +138,11 @@ void OpenGLProgram::SetMaskCoord(const GLvoid* pData) SetVertexAttrib(mnMaskCoordAttrib, "mask_coord_in", pData); } +void OpenGLProgram::SetExtrusionVectors(const GLvoid* pData) +{ + SetVertexAttrib(mnNormalAttrib, "extrusion_vectors", pData, 3); +} + GLuint OpenGLProgram::GetUniformLocation( const OString& rName ) { auto it = maUniformLocations.find( rName ); |