Kaydet (Commit) aeeddd97 authored tarafından Zolnai Tamás's avatar Zolnai Tamás

Revert also an other part of "Extract getGLVersion() method to OpenGLHelper"

This partly reverts commit 23c876de.

Change-Id: I9ba7a2e8286b5fa6064c3b9e2d680fedf402f1a2
üst 70df3e3e
...@@ -56,8 +56,6 @@ ...@@ -56,8 +56,6 @@
#include <vcl/syschild.hxx> #include <vcl/syschild.hxx>
#include <vcl/sysdata.hxx> #include <vcl/sysdata.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <GL/gl.h> #include <GL/gl.h>
...@@ -316,8 +314,14 @@ bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowV ...@@ -316,8 +314,14 @@ bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowV
instance = new OGLTransitionerImpl( NULL ); instance = new OGLTransitionerImpl( NULL );
if( instance->initWindowFromSlideShowView( xView ) ) { if( instance->initWindowFromSlideShowView( xView ) ) {
cnGLVersion = OpenGLHelper::getGLVersion(); const GLubyte* version = glGetString( GL_VERSION );
OSL_TRACE("GL version: %f", cnGLVersion ); if( version && version[0] ) {
cnGLVersion = version[0] - '0';
if( version[1] == '.' && version[2] )
cnGLVersion += (version[2] - '0')/10.0;
} else
cnGLVersion = 1.0;
OSL_TRACE("GL version: %s parsed: %f", version, cnGLVersion );
const GLubyte* vendor = glGetString( GL_VENDOR ); const GLubyte* vendor = glGetString( GL_VENDOR );
cbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) ); cbMesa = ( vendor && strstr( (const char *) vendor, "Mesa" ) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment