[Libreoffice-commits] core.git: slideshow/source

[Tor Lillqvist]

 slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 76cfcea67284c246e04efce836327ec0dd2bfb66
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Oct 30 13:40:56 2015 +0200

    The fglrx driver is an X11 only thing
    
    It means "FireGL and Radeon for X".
    
    Change-Id: I188fa03a113d9977a7a240bc0fc9f6dc9be054b8

diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index e386a08..195e2a4 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -330,9 +330,10 @@ void OGLTransitionerImpl::impl_initializeFlags( bool const bValidContext )
         SAL_INFO("slideshow.opengl", "GL version: " << mnGLVersion << "" );
 
         const GLubyte* vendor = glGetString( GL_VENDOR );
-
+#if defined( UNX ) && !defined( MACOSX )
         /* TODO: check for version once the bug in fglrx driver is fixed */
         mbBrokenTexturesATI = (vendor && strcmp( reinterpret_cast<const char *>(vendor), "ATI Technologies Inc." ) == 0 );
+#endif
     }
     CHECK_GL_ERROR();
 }