summaryrefslogtreecommitdiff
path: root/vcl/opengl/x11/gdiimpl.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-11-24 20:47:05 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-11-24 20:47:33 +0000
commit48138a1d60fafa0bf3412aa6b518a9c0a4f6d492 (patch)
treeecb9030453a3bc95781a302f208411f88f223d40 /vcl/opengl/x11/gdiimpl.cxx
parent68c1cc33810e14c2e45e7da9f7a60429c8a942a6 (diff)
WaE: might be used unintialized
Change-Id: I036a5a1c8c8cca09bb6bddef2e0c8f172fe22e77
Diffstat (limited to 'vcl/opengl/x11/gdiimpl.cxx')
-rw-r--r--vcl/opengl/x11/gdiimpl.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx
index 221c1ef84515..80db3a9a66ef 100644
--- a/vcl/opengl/x11/gdiimpl.cxx
+++ b/vcl/opengl/x11/gdiimpl.cxx
@@ -156,9 +156,6 @@ bool X11OpenGLSalGraphicsImpl::RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixm
None
};
Display* pDisplay = mrParent.GetXDisplay();
- GLXFBConfig pFbConfig;
- GLXPixmap pGlxPixmap;
- GLXPixmap pGlxMask;
bool bInverted;
SAL_INFO( "vcl.opengl", "RenderPixmapToScreen (" << nX << " " << nY << ")" );
@@ -171,10 +168,13 @@ bool X11OpenGLSalGraphicsImpl::RenderPixmapToScreen( X11Pixmap* pPixmap, X11Pixm
//glClear( GL_COLOR_BUFFER_BIT );
XSync( pDisplay, 0 );
- pFbConfig = OpenGLHelper::GetPixmapFBConfig( pDisplay, bInverted );
- pGlxPixmap = glXCreatePixmap( pDisplay, pFbConfig, pPixmap->GetPixmap(), aAttribs);
+ GLXFBConfig pFbConfig = OpenGLHelper::GetPixmapFBConfig( pDisplay, bInverted );
+ GLXPixmap pGlxPixmap = glXCreatePixmap( pDisplay, pFbConfig, pPixmap->GetPixmap(), aAttribs);
+ GLXPixmap pGlxMask;
if( pMask != NULL )
pGlxMask = glXCreatePixmap( pDisplay, pFbConfig, pMask->GetPixmap(), aAttribs);
+ else
+ pGlxMask = 0;
XSync( pDisplay, 0 );
if( !pGlxPixmap )