diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-08-24 15:00:26 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-26 13:52:12 +0000 |
| commit | 7cf4b63c917d2e4ddc8abef0ee86bd1e0d0e3820 (patch) | |
| tree | c73ca22cb4a659014ca20afa764f72666e25b110 /vcl/inc | |
| parent | 011fe0c0a26561f2731641129320b77deee9a5d9 (diff) | |
opengl: push mask coords to the shaders along the image coords
If using the same texture to store the image and mask data (for
example when using texture atlas) the mask and image (RGB) coords
aren't the same anymore. With this commit we always define the mask
coords separately.
(cherry picked from commit bdce4e29191aa5bd029efa242e094aba45c44869)
Conflicts:
vcl/opengl/program.cxx
Change-Id: Ie33f87a6e9ab398972c6a3d5938e5f1364c82d36
Reviewed-on: https://gerrit.libreoffice.org/18012
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/opengl/program.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx index 0f0f9a5a5221..8289a56de4bf 100644 --- a/vcl/inc/opengl/program.hxx +++ b/vcl/inc/opengl/program.hxx @@ -36,6 +36,7 @@ private: GLuint mnPositionAttrib; GLuint mnTexCoordAttrib; GLuint mnAlphaCoordAttrib; + GLuint mnMaskCoordAttrib; TextureList maTextures; bool mbBlending; @@ -56,6 +57,7 @@ public: void SetVertices( const GLvoid* pData ); void SetTextureCoord( const GLvoid* pData ); void SetAlphaCoord( const GLvoid* pData ); + void SetMaskCoord(const GLvoid* pData); void SetUniform1f( const OString& rName, GLfloat v1 ); void SetUniform2f( const OString& rName, GLfloat v1, GLfloat v2 ); |