yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
kwin/egl_context_attribute_builder.cpp

75 lines
2.7 KiB
C++
Raw Normal View History

Refactor the specification of OpenGL context attributes Summary: The current way to specify the OpenGL context attributes does no longer scale as can be seen in D6344. There are too many different context attribute sets and with every addition we grow lots of copied code. The chances to introduce errors in that code which is difficult to debug are very high. As can be seen in the glx backend which defines major 1, minor 2, but it should be major 2, minor 1. This change reworks this code by creating a builder class which contains only an abstract definition of what needs to be in the attributes. E.g. the version, whether it's robust and so on. Now we can just have a list of possible attributes in a well described way: auto builder; builder.setVersion(3, 1); builder.setRobust(true); All possible builders are added to a list and operated on in a for loop which tries to creat a context. Once it succeeded it breaks the list. In addition a debug statement is added which prints out the set of options which went into the context. So far this is only done for EGL, GLX can follow once D6344 is merged. Test Plan: New unit test added, kwin_wayland OpenGL tests run and verified Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6396
2017-06-26 04:56:55 +00:00
/********************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2017 Martin Flöser <mgraesslin@kde.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "egl_context_attribute_builder.h"
#include <epoxy/egl.h>
namespace KWin
{
std::vector<int> EglContextAttributeBuilder::build() const
{
std::vector<int> attribs;
if (isVersionRequested()) {
attribs.emplace_back(EGL_CONTEXT_MAJOR_VERSION_KHR);
attribs.emplace_back(majorVersion());
attribs.emplace_back(EGL_CONTEXT_MINOR_VERSION_KHR);
attribs.emplace_back(minorVersion());
}
[qpa] Use the new OpenGLContextAttributeBuilder to create Qt's OpenGL context Summary: Introduces a few more attributes needed for creating the OpenGL context used by the QPA. Test Plan: Extended test and run KWin/Wayland and verified that OpenGL context gets created correctly. Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6734
2017-07-16 15:31:09 +00:00
int contextFlags = 0;
Refactor the specification of OpenGL context attributes Summary: The current way to specify the OpenGL context attributes does no longer scale as can be seen in D6344. There are too many different context attribute sets and with every addition we grow lots of copied code. The chances to introduce errors in that code which is difficult to debug are very high. As can be seen in the glx backend which defines major 1, minor 2, but it should be major 2, minor 1. This change reworks this code by creating a builder class which contains only an abstract definition of what needs to be in the attributes. E.g. the version, whether it's robust and so on. Now we can just have a list of possible attributes in a well described way: auto builder; builder.setVersion(3, 1); builder.setRobust(true); All possible builders are added to a list and operated on in a for loop which tries to creat a context. Once it succeeded it breaks the list. In addition a debug statement is added which prints out the set of options which went into the context. So far this is only done for EGL, GLX can follow once D6344 is merged. Test Plan: New unit test added, kwin_wayland OpenGL tests run and verified Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6396
2017-06-26 04:56:55 +00:00
if (isRobust()) {
attribs.emplace_back(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR);
attribs.emplace_back(EGL_LOSE_CONTEXT_ON_RESET_KHR);
[qpa] Use the new OpenGLContextAttributeBuilder to create Qt's OpenGL context Summary: Introduces a few more attributes needed for creating the OpenGL context used by the QPA. Test Plan: Extended test and run KWin/Wayland and verified that OpenGL context gets created correctly. Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6734
2017-07-16 15:31:09 +00:00
contextFlags |= EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR;
}
if (isForwardCompatible()) {
contextFlags |= EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR;
}
if (contextFlags != 0) {
Refactor the specification of OpenGL context attributes Summary: The current way to specify the OpenGL context attributes does no longer scale as can be seen in D6344. There are too many different context attribute sets and with every addition we grow lots of copied code. The chances to introduce errors in that code which is difficult to debug are very high. As can be seen in the glx backend which defines major 1, minor 2, but it should be major 2, minor 1. This change reworks this code by creating a builder class which contains only an abstract definition of what needs to be in the attributes. E.g. the version, whether it's robust and so on. Now we can just have a list of possible attributes in a well described way: auto builder; builder.setVersion(3, 1); builder.setRobust(true); All possible builders are added to a list and operated on in a for loop which tries to creat a context. Once it succeeded it breaks the list. In addition a debug statement is added which prints out the set of options which went into the context. So far this is only done for EGL, GLX can follow once D6344 is merged. Test Plan: New unit test added, kwin_wayland OpenGL tests run and verified Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6396
2017-06-26 04:56:55 +00:00
attribs.emplace_back(EGL_CONTEXT_FLAGS_KHR);
[qpa] Use the new OpenGLContextAttributeBuilder to create Qt's OpenGL context Summary: Introduces a few more attributes needed for creating the OpenGL context used by the QPA. Test Plan: Extended test and run KWin/Wayland and verified that OpenGL context gets created correctly. Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6734
2017-07-16 15:31:09 +00:00
attribs.emplace_back(contextFlags);
}
if (isCoreProfile() || isCompatibilityProfile()) {
attribs.emplace_back(EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR);
if (isCoreProfile()) {
attribs.emplace_back(EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR);
} else if (isCompatibilityProfile()) {
attribs.emplace_back(EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR);
}
Refactor the specification of OpenGL context attributes Summary: The current way to specify the OpenGL context attributes does no longer scale as can be seen in D6344. There are too many different context attribute sets and with every addition we grow lots of copied code. The chances to introduce errors in that code which is difficult to debug are very high. As can be seen in the glx backend which defines major 1, minor 2, but it should be major 2, minor 1. This change reworks this code by creating a builder class which contains only an abstract definition of what needs to be in the attributes. E.g. the version, whether it's robust and so on. Now we can just have a list of possible attributes in a well described way: auto builder; builder.setVersion(3, 1); builder.setRobust(true); All possible builders are added to a list and operated on in a for loop which tries to creat a context. Once it succeeded it breaks the list. In addition a debug statement is added which prints out the set of options which went into the context. So far this is only done for EGL, GLX can follow once D6344 is merged. Test Plan: New unit test added, kwin_wayland OpenGL tests run and verified Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6396
2017-06-26 04:56:55 +00:00
}
attribs.emplace_back(EGL_NONE);
return attribs;
}
std::vector<int> EglOpenGLESContextAttributeBuilder::build() const
{
std::vector<int> attribs;
attribs.emplace_back(EGL_CONTEXT_CLIENT_VERSION);
attribs.emplace_back(majorVersion());
if (isRobust()) {
attribs.emplace_back(EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT);
attribs.emplace_back(EGL_TRUE);
attribs.emplace_back(EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT);
attribs.emplace_back(EGL_LOSE_CONTEXT_ON_RESET_EXT);
}
attribs.emplace_back(EGL_NONE);
return attribs;
}
}
Reference in a new issue Copy permalink