diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-10 11:40:33 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-11 09:36:35 +0000 |
| commit | 2d3dbdcd14dbca9e5827cb44e453cc45842dff14 (patch) | |
| tree | 72a7ccf8be539cc9d0095ccced3c510e84ba535d | |
| parent | 1b381370b026f62397dc2d41ddcecf9d6523e044 (diff) | |
windows opengl: mpProgram seen as 0
in JunitTest_sc_unoapi_3.
Change-Id: Ic7e32979f31a3376b67eb3bef59373632461e39f
(cherry picked from commit 0e682d47a792497211d33779312ca2cad9874ffb)
Reviewed-on: https://gerrit.libreoffice.org/18490
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/opengl/gdiimpl.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx index 10b5c35653a0..85c3a3a1ab13 100644 --- a/vcl/opengl/gdiimpl.cxx +++ b/vcl/opengl/gdiimpl.cxx @@ -773,6 +773,12 @@ void OpenGLSalGraphicsImpl::DrawTrapezoid( const basegfx::B2DTrapezoid& trapezoi aVertices[j+1] = GLfloat(rPt.getY()); } + if (!mpProgram) + { + SAL_WARN("vcl.opengl", "OpenGLSalGraphicsImpl::DrawTrapezoid: mpProgram is 0"); + return; + } + ApplyProgramMatrices(); mpProgram->SetVertices( &aVertices[0] ); glDrawArrays( GL_TRIANGLE_FAN, 0, nPoints ); |