vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Detect latest Intel hardware in GLPlatform 

Added support for IvyBridge and Haswell.

REVIEW: 106819
icc-effect-5.14.5
Martin Gräßlin 2012-10-13 08:35:30 +02:00
parent 986d9e5613
commit 711b434970
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libkwineffects/kwinglplatform.cpp
View File

@ -335,6 +335,7 @@ static ChipClass detectNVidiaClass(const QString &chipset)
static ChipClass detectIntelClass(const QByteArray &chipset)
{
// see mesa repository: src/mesa/drivers/dri/intel/intel_context.c
// GL 1.3, DX8? SM ?
if (chipset.contains("845G") ||
chipset.contains("830M") ||
@ -374,6 +375,16 @@ static ChipClass detectIntelClass(const QByteArray &chipset)
return SandyBridge;
}
// GL4.0, CL1.1, DX11, SM 5.0
if (chipset.contains("Ivybridge")) {
return IvyBridge;
}
// GL4.0, CL1.2, DX11.1, SM 5.0
if (chipset.contains("Haswell")) {
return Haswell;
}
return UnknownIntel;
}
@ -468,6 +479,10 @@ QString GLPlatform::chipClassToString(ChipClass chipClass)
return "i965";
case SandyBridge:
return "SandyBridge";
case IvyBridge:
return "IvyBridge";
case Haswell:
return "Haswell";
default:
return "Unknown";

2
libkwineffects/kwinglplatform.h
View File

@ -126,6 +126,8 @@ enum ChipClass {
I915, // GL1.4/1.5 DX9/DX9c SM 2.0 2004
I965, // GL2.0/2.1 DX9/DX10 SM 3.0/4.0 2006
SandyBridge, // GL3.1 CL1.1 DX10.1 SM 4.0 2010
IvyBridge, // GL4.0 CL1.1 DX11 SM 5.0 2012
Haswell, // GL4.0 CL1.2 DX11.1 SM 5.0 2013
UnknownIntel = 2999,
UnknownChipClass = 99999