Include the version in the blacklist separated from the renderer by colon dash colon.

svn path=/trunk/KDE/kdebase/workspace/; revision=1146496
icc-effect-5.14.5
Martin Gräßlin 2010-07-06 07:00:08 +00:00
parent ed8788d3af
commit e39354ac81
2 changed files with 4 additions and 1 deletions

View File

@ -500,6 +500,8 @@ bool EffectsHandler::checkDriverBlacklist( const KConfigGroup& blacklist )
{
QString vendor = QString((const char*)glGetString( GL_VENDOR ));
QString renderer = QString((const char*)glGetString( GL_RENDERER ));
renderer.append( ":-:" );
renderer.append((const char*)glGetString( GL_VERSION ));
foreach( const QString& key, blacklist.keyList() )
{
// the key is a word in the renderer string or vendor referrencing the vendor in case of mesa

View File

@ -793,7 +793,8 @@ class KWIN_EXPORT EffectsHandler
/**
* Checks if the driver is on given blacklist.
* The format of the blacklist is driver identifier as key (e.g. Intel) with a list of
* concrete driver render strings as the values.
* concrete driver render strings as the values. The renderer string consists of GL_RENDERER
* and GL_VERSION separated by colon dash colon. E.g.: GeForce 9400M/PCI/SSE2:-:3.2.0 NVIDIA 195.36.24
* This method is only used for OpenGL compositing. If not using OpenGL it will return false.
* @returns true if the driver is blacklisted, false otherwise
* @since 4.5