[Libreoffice-commits] core.git: vcl/inc vcl/opengl
Luboš Luňák
l.lunak at collabora.com
Mon Dec 15 13:15:45 PST 2014
vcl/inc/openglgdiimpl.hxx | 14 +++++----
vcl/opengl/gdiimpl.cxx | 70 ++++++++++++++++++++++++++++++++++-----------
vcl/opengl/win/gdiimpl.cxx | 2 -
vcl/opengl/x11/gdiimpl.cxx | 4 +-
4 files changed, 65 insertions(+), 25 deletions(-)
New commits:
commit 5e7709c5e9c1a5f444b1bff4096b0d3d3a541235
Author: Luboš Luňák <l.lunak at collabora.com>
Date: Mon Dec 15 20:00:45 2014 +0100
use AA for lines only when AA is active
Change-Id: I9965f58b8f06f1cec2c419dcf16d8aebf9cd97b8
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index a8ffe4d..2c911ee 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -40,8 +40,9 @@ class VCL_PLUGIN_PUBLIC OpenGLSalGraphicsImpl : public SalGraphicsImpl
protected:
OpenGLContext* mpContext;
+ SalGraphics& mrParent;
/// Pointer to the SalFrame or SalVirtualDevice
- SalGeometryProvider* mpParent;
+ SalGeometryProvider* mpProvider;
OpenGLFramebuffer* mpFramebuffer;
OpenGLProgram* mpProgram;
@@ -66,11 +67,14 @@ public:
bool UseSolid( SalColor nColor, sal_uInt8 nTransparency );
bool UseSolid( SalColor nColor, double fTransparency );
bool UseSolid( SalColor nColor );
+ bool UseSolidAA( SalColor nColor );
bool UseInvert();
void DrawPoint( long nX, long nY );
void DrawLine( long nX1, long nY1, long nX2, long nY2 );
void DrawLines( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose );
+ void DrawLineAA( long nX1, long nY1, long nX2, long nY2 );
+ void DrawLinesAA( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose );
void DrawConvexPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry );
void DrawConvexPolygon( const Polygon& rPolygon );
void DrawRect( long nX, long nY, long nWidth, long nHeight );
@@ -92,13 +96,13 @@ public:
public:
// get the width of the device
- GLfloat GetWidth() const { return mpParent ? mpParent->GetWidth() : 1; }
+ GLfloat GetWidth() const { return mpProvider ? mpProvider->GetWidth() : 1; }
// get the height of the device
- GLfloat GetHeight() const { return mpParent ? mpParent->GetHeight() : 1; }
+ GLfloat GetHeight() const { return mpProvider ? mpProvider->GetHeight() : 1; }
// check whether this instance is used for offscreen rendering
- bool IsOffscreen() const { return mpParent ? mpParent->IsOffScreen() : true; }
+ bool IsOffscreen() const { return mpProvider ? mpProvider->IsOffScreen() : true; }
// operations to do before painting
virtual void PreDraw();
@@ -120,7 +124,7 @@ protected:
virtual bool UseContext( OpenGLContext* pContext ) = 0;
public:
- OpenGLSalGraphicsImpl(SalGeometryProvider* pParent);
+ OpenGLSalGraphicsImpl(SalGraphics& pParent, SalGeometryProvider *pProvider);
virtual ~OpenGLSalGraphicsImpl ();
OpenGLContext* GetOpenGLContext();
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 09ffbf6..69db79b 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -36,9 +36,10 @@
#include <vector>
-OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGeometryProvider* pParent)
+OpenGLSalGraphicsImpl::OpenGLSalGraphicsImpl(SalGraphics& rParent, SalGeometryProvider *pProvider)
: mpContext(0)
- , mpParent(pParent)
+ , mrParent(rParent)
+ , mpProvider(pProvider)
, mpFramebuffer(NULL)
, mpProgram(NULL)
, mbUseScissor(false)
@@ -381,6 +382,18 @@ bool OpenGLSalGraphicsImpl::UseSolid( SalColor nColor )
return UseSolid( nColor, 0.0f );
}
+// Like UseSolid(), but sets up for AA drawing, which uses gradients to create the AA.
+bool OpenGLSalGraphicsImpl::UseSolidAA( SalColor nColor )
+{
+ if( !mrParent.getAntiAliasB2DDraw())
+ return UseSolid( nColor );
+ if( !UseProgram( "textureVertexShader", "linearGradientFragmentShader" ) )
+ return false;
+ mpProgram->SetColorf( "start_color", nColor, 0.0f );
+ mpProgram->SetColorf( "end_color", nColor, 1.0f );
+ return true;
+}
+
bool OpenGLSalGraphicsImpl::UseInvert()
{
if( !UseSolid( MAKE_SALCOLOR( 255, 255, 255 ) ) )
@@ -402,8 +415,24 @@ void OpenGLSalGraphicsImpl::DrawPoint( long nX, long nY )
void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, long nX2, long nY2 )
{
+ GLfloat pPoints[4];
+
+ pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
+ pPoints[1] = 1.0f - 2 * nY1 / GetHeight();
+ pPoints[2] = (2 * nX2) / GetWidth() - 1.0;;
+ pPoints[3] = 1.0f - 2 * nY2 / GetHeight();
+
+ mpProgram->SetVertices( pPoints );
+ glDrawArrays( GL_LINES, 0, 2 );
+}
+
+void OpenGLSalGraphicsImpl::DrawLineAA( long nX1, long nY1, long nX2, long nY2 )
+{
+ if( !mrParent.getAntiAliasB2DDraw())
+ return DrawLine( nX1, nY1, nX2, nY2 );
+
if( nX1 == nX2 || nY1 == nY2 )
- { // horizontal/vertical, no need for AA
+ { // Horizontal/vertical, no need for AA, both points have normal color.
GLfloat pPoints[4];
pPoints[0] = (2 * nX1) / GetWidth() - 1.0;
@@ -412,6 +441,10 @@ void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, long nX2, long nY2 )
pPoints[3] = 1.0f - 2 * nY2 / GetHeight();
mpProgram->SetVertices( pPoints );
+ // Still set up for the trivial "gradients", because presumably UseSolidAA() has been called.
+ GLfloat aTexCoord[4] = { 0, 1, 1, 1 };
+ mpProgram->SetTextureCoord( aTexCoord );
+
glDrawArrays( GL_LINES, 0, 2 );
return;
}
@@ -425,11 +458,6 @@ void OpenGLSalGraphicsImpl::DrawLine( long nX1, long nY1, long nX2, long nY2 )
*
* Enjoy. Chris Tsang.*/
- if( !UseProgram( "textureVertexShader", "linearGradientFragmentShader" ) )
- return;
- mpProgram->SetColorf( "start_color", mnLineColor, 0.0f );
- mpProgram->SetColorf( "end_color", mnLineColor, 1.0f );
-
double x1 = nX1;
double y1 = nY1;
double x2 = nX2;
@@ -546,6 +574,14 @@ void OpenGLSalGraphicsImpl::DrawLines( sal_uInt32 nPoints, const SalPoint* pPtAr
DrawLine( pPtAry[ nPoints - 1 ].mnX, pPtAry[ nPoints - 1 ].mnY, pPtAry[ 0 ].mnX, pPtAry[ 0 ].mnY );
}
+void OpenGLSalGraphicsImpl::DrawLinesAA( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose )
+{
+ for( int i = 0; i < int(nPoints) - 1; ++i )
+ DrawLineAA( pPtAry[ i ].mnX, pPtAry[ i ].mnY, pPtAry[ i + 1 ].mnX, pPtAry[ i + 1 ].mnY );
+ if( bClose )
+ DrawLineAA( pPtAry[ nPoints - 1 ].mnX, pPtAry[ nPoints - 1 ].mnY, pPtAry[ 0 ].mnX, pPtAry[ 0 ].mnY );
+}
+
void OpenGLSalGraphicsImpl::DrawConvexPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
{
std::vector<GLfloat> aVertices(nPoints * 2);
@@ -925,8 +961,8 @@ void OpenGLSalGraphicsImpl::drawLine( long nX1, long nY1, long nX2, long nY2 )
if( mnLineColor != SALCOLOR_NONE )
{
PreDraw();
- if( UseSolid( mnLineColor ) )
- DrawLine( nX1, nY1, nX2, nY2 );
+ if( UseSolidAA( mnLineColor ) )
+ DrawLineAA( nX1, nY1, nX2, nY2 );
PostDraw();
}
}
@@ -947,7 +983,7 @@ void OpenGLSalGraphicsImpl::drawRect( long nX, long nY, long nWidth, long nHeigh
const long nY2( nY + nHeight );
const SalPoint aPoints[] = { { nX1, nY1 }, { nX2, nY1 },
{ nX2, nY2 }, { nX1, nY2 } };
- DrawLines( 4, aPoints, true );
+ DrawLines( 4, aPoints, true ); // No need for AA.
}
PostDraw();
@@ -960,8 +996,8 @@ void OpenGLSalGraphicsImpl::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pP
if( mnLineColor != SALCOLOR_NONE && nPoints > 1 )
{
PreDraw();
- if( UseSolid( mnLineColor ) )
- DrawLines( nPoints, pPtAry, false );
+ if( UseSolidAA( mnLineColor ) )
+ DrawLinesAA( nPoints, pPtAry, false );
PostDraw();
}
}
@@ -988,8 +1024,8 @@ void OpenGLSalGraphicsImpl::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPt
if( UseSolid( mnFillColor ) )
DrawPolygon( nPoints, pPtAry );
- if( UseSolid( mnLineColor ) )
- DrawLines( nPoints, pPtAry, true );
+ if( UseSolidAA( mnLineColor ) )
+ DrawLinesAA( nPoints, pPtAry, true );
PostDraw();
}
@@ -1008,11 +1044,11 @@ void OpenGLSalGraphicsImpl::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32*
DrawPolygon( pPoints[i], pPtAry[i] );
}
- if( UseSolid( mnLineColor ) )
+ if( UseSolidAA( mnLineColor ) )
{
// TODO Use glMultiDrawElements or primitive restart
for( sal_uInt32 i = 0; i < nPoly; i++ )
- DrawLines( pPoints[i], pPtAry[i], true );
+ DrawLinesAA( pPoints[i], pPtAry[i], true );
}
PostDraw();
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index a56ea30..ee53c8a 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -15,7 +15,7 @@
WinOpenGLSalGraphicsImpl::WinOpenGLSalGraphicsImpl(WinSalGraphics& rGraphics,
SalGeometryProvider *mpProvider):
- OpenGLSalGraphicsImpl(mpProvider),
+ OpenGLSalGraphicsImpl(rGraphics,mpProvider),
mrParent(rGraphics)
{
}
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index d0d890b..bbc68b9 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -26,7 +26,7 @@
#include <vcl/opengl/OpenGLHelper.hxx>
X11OpenGLSalGraphicsImpl::X11OpenGLSalGraphicsImpl( X11SalGraphics& rParent ):
- OpenGLSalGraphicsImpl(rParent.GetGeometryProvider()),
+ OpenGLSalGraphicsImpl(rParent,rParent.GetGeometryProvider()),
mrParent(rParent)
{
}
@@ -38,7 +38,7 @@ X11OpenGLSalGraphicsImpl::~X11OpenGLSalGraphicsImpl()
void X11OpenGLSalGraphicsImpl::Init()
{
// The m_pFrame and m_pVDev pointers are updated late in X11
- mpParent = mrParent.GetGeometryProvider();
+ mpProvider = mrParent.GetGeometryProvider();
OpenGLSalGraphicsImpl::Init();
}
More information about the Libreoffice-commits
mailing list