@ -755,7 +755,6 @@ GLPlatform::GLPlatform()
, m_recommendedCompositor ( QPainterCompositing )
, m_looseBinding ( false )
, m_supportsGLSL ( false )
, m_limitedGLSL ( false )
, m_textureNPOT ( false )
, m_limitedNPOT ( false )
, m_packInvert ( false )
@ -1018,7 +1017,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
m_supportsGLSL = false ;
}
m_limitedGLSL = false ;
m_limitedNPOT = false ;
if ( m_chipClass < R600 ) {
@ -1027,8 +1025,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
} else if ( driver ( ) = = Driver_R300G ) {
m_limitedNPOT = m_textureNPOT ;
}
m_limitedGLSL = m_supportsGLSL ;
}
if ( m_chipClass < R300 ) {
@ -1063,7 +1059,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
}
m_limitedNPOT = m_textureNPOT & & m_chipClass < NV40 ;
m_limitedGLSL = m_supportsGLSL & & m_chipClass < G80 ;
}
if ( isIntel ( ) ) {
@ -1071,7 +1066,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
m_supportsGLSL = false ;
}
m_limitedGLSL = m_supportsGLSL & & m_chipClass < I965 ;
// see https://bugs.freedesktop.org/show_bug.cgi?id=80349#c1
m_looseBinding = false ;
@ -1113,11 +1107,10 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
// we recommend QPainter
m_recommendedCompositor = QPainterCompositing ;
// Software emulation does not provide GLSL
m_ limitedGLSL = m_ supportsGLSL = false ;
m_ supportsGLSL = false ;
} else {
// llvmpipe does support GLSL
m_recommendedCompositor = OpenGLCompositing ;
m_limitedGLSL = false ;
m_supportsGLSL = true ;
}
}
@ -1155,7 +1148,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
// and force back to shader supported on gles, we wouldn't have got a context if not supported
if ( isGLES ( ) ) {
m_supportsGLSL = true ;
m_limitedGLSL = false ;
}
}
@ -1200,7 +1192,7 @@ void GLPlatform::printResults() const
}
print ( QByteArrayLiteral ( " Requires strict binding: " ) , ! m_looseBinding ? QByteArrayLiteral ( " yes " ) : QByteArrayLiteral ( " no " ) ) ;
print ( QByteArrayLiteral ( " GLSL shaders: " ) , m_supportsGLSL ? ( m_limitedGLSL ? QByteArrayLiteral ( " limited " ) : QByteArrayLiteral ( " yes " ) ) : QByteArrayLiteral ( " no " ) ) ;
print ( QByteArrayLiteral ( " GLSL shaders: " ) , m_supportsGLSL ? QByteArrayLiteral ( " yes " ) : QByteArrayLiteral ( " no " ) ) ;
print ( QByteArrayLiteral ( " Texture NPOT support: " ) , m_textureNPOT ? ( m_limitedNPOT ? QByteArrayLiteral ( " limited " ) : QByteArrayLiteral ( " yes " ) ) : QByteArrayLiteral ( " no " ) ) ;
print ( QByteArrayLiteral ( " Virtual Machine: " ) , m_virtualMachine ? QByteArrayLiteral ( " yes " ) : QByteArrayLiteral ( " no " ) ) ;
print ( QByteArrayLiteral ( " Timer query support: " ) , m_supportsTimerQuery ? QByteArrayLiteral ( " yes " ) : QByteArrayLiteral ( " no " ) ) ;
@ -1213,8 +1205,6 @@ bool GLPlatform::supports(GLFeature feature) const
return m_looseBinding ;
case GLFeature : : GLSL :
return m_supportsGLSL ;
case GLFeature : : LimitedGLSL :
return m_limitedGLSL ;
case GLFeature : : TextureNPOT :
return m_textureNPOT ;
case GLFeature : : LimitedNPOT :