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

Drop OpenGL 1 

KWin doesn't support OpenGL 1 any more so we should not allow the
user to switch to it.

REVIEW: 116636
icc-effect-5.14.5
Martin Gräßlin 2014-03-06 15:45:42 +01:00
parent e4fe1b360f
commit edc399a444
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kcmkwin/kwincompositing/compositing.cpp
View File

@ -93,13 +93,10 @@ void Compositing::reset()
auto type = [&kwinConfig]{ auto type = [&kwinConfig]{
const QString backend = kwinConfig.readEntry("Backend", "OpenGL"); const QString backend = kwinConfig.readEntry("Backend", "OpenGL");
const bool glLegacy = kwinConfig.readEntry("GLLegacy", false);
const bool glCore = kwinConfig.readEntry("GLCore", false); const bool glCore = kwinConfig.readEntry("GLCore", false);
if (backend == QStringLiteral("OpenGL")) { if (backend == QStringLiteral("OpenGL")) {
if (glLegacy) { if (glCore) {
return CompositingType::OPENGL12_INDEX;
} else if (glCore) {
return CompositingType::OPENGL31_INDEX; return CompositingType::OPENGL31_INDEX;
} else { } else {
return CompositingType::OPENGL20_INDEX; return CompositingType::OPENGL20_INDEX;
@ -306,32 +303,22 @@ void Compositing::save()
kwinConfig.writeEntry("GLPreferBufferSwap", swapStrategy()); kwinConfig.writeEntry("GLPreferBufferSwap", swapStrategy());
kwinConfig.writeEntry("GLColorCorrection", glColorCorrection()); kwinConfig.writeEntry("GLColorCorrection", glColorCorrection());
QString backend; QString backend;
bool glLegacy = false;
bool glCore = false; bool glCore = false;
switch (compositingType()) { switch (compositingType()) {
case CompositingType::OPENGL31_INDEX: case CompositingType::OPENGL31_INDEX:
backend = "OpenGL"; backend = "OpenGL";
glLegacy = false;
glCore = true; glCore = true;
break; break;
case CompositingType::OPENGL20_INDEX: case CompositingType::OPENGL20_INDEX:
backend = "OpenGL"; backend = "OpenGL";
glLegacy = false;
glCore = false;
break;
case CompositingType::OPENGL12_INDEX:
backend = "OpenGL";
glLegacy = true;
glCore = false; glCore = false;
break; break;
case CompositingType::XRENDER_INDEX: case CompositingType::XRENDER_INDEX:
backend = "XRender"; backend = "XRender";
glLegacy = false;
glCore = false; glCore = false;
break; break;
} }
kwinConfig.writeEntry("Backend", backend); kwinConfig.writeEntry("Backend", backend);
kwinConfig.writeEntry("GLLegacy", glLegacy);
kwinConfig.writeEntry("GLCore", glCore); kwinConfig.writeEntry("GLCore", glCore);
kwinConfig.sync(); kwinConfig.sync();
@ -357,7 +344,6 @@ void CompositingType::generateCompositing()
compositingTypes[i18n("OpenGL 3.1")] = CompositingType::OPENGL31_INDEX; compositingTypes[i18n("OpenGL 3.1")] = CompositingType::OPENGL31_INDEX;
compositingTypes[i18n("OpenGL 2.0")] = CompositingType::OPENGL20_INDEX; compositingTypes[i18n("OpenGL 2.0")] = CompositingType::OPENGL20_INDEX;
compositingTypes[i18n("OpenGL 1.2")] = CompositingType::OPENGL12_INDEX;
compositingTypes[i18n("XRender")] = CompositingType::XRENDER_INDEX; compositingTypes[i18n("XRender")] = CompositingType::XRENDER_INDEX;
CompositingData data; CompositingData data;

1
kcmkwin/kwincompositing/compositing.h
View File

@ -111,7 +111,6 @@ public:
enum CompositingTypeIndex { enum CompositingTypeIndex {
OPENGL31_INDEX = 0, OPENGL31_INDEX = 0,
OPENGL20_INDEX, OPENGL20_INDEX,
OPENGL12_INDEX,
XRENDER_INDEX XRENDER_INDEX
}; };