Differential D2933 Diff 7089 plugins/platforms/x11/common/eglonxbackend.cpp

Changeset View

Standalone View

View Options

plugins/platforms/x11/common/eglonxbackend.cpp

Show First 20 Lines • Show All 174 Lines • ▼ Show 20 Line(s)173{
175 EGLDisplay dpy = kwinApp()->platform()->sceneEglDisplay(); 175​ EGLDisplay dpy = kwinApp()->platform()->sceneEglDisplay();
176 176​
177 // Use eglGetPlatformDisplayEXT() to get the display pointer 177​ // Use eglGetPlatformDisplayEXT() to get the display pointer
178 // if the implementation supports it. 178​ // if the implementation supports it.
179 if (dpy == EGL_NO_DISPLAY) { 179​ if (dpy == EGL_NO_DISPLAY) {
180 const bool havePlatformBase = hasClientExtension(QByteArrayLiteral("EGL_EXT_platform_base")); 180​ const bool havePlatformBase = hasClientExtension(QByteArrayLiteral("EGL_EXT_platform_base"));
181 setHavePlatformBase(havePlatformBase); 181​ setHavePlatformBase(havePlatformBase);
182 if (havePlatformBase) { 182​ if (havePlatformBase) {
183 // Make sure that the X11 platform is supported 183​ // Make sure that the X11 platform is supported
184 if (!hasClientExtension(QByteArrayLiteral("EGL_EXT_platform_x11"))) { 184​ if (!hasClientExtension(QByteArrayLiteral("EGL_EXT_platform_x11")) &&
graesslinUnsubmitted
Not Done

are you sure that you want to check for or here? I thought you need an and

graesslin: are you sure that you want to check for or here? I thought you need an and
gargAuthorUnsubmitted
Not Done

No, the Mali driver only reports EGL_KHR_platform_x11, not EGL_KHR_platform_x11 and EGL_EXT_platform_x11. Hence why imo the check should be a or.

garg: No, the Mali driver only reports EGL_KHR_platform_x11, not EGL_KHR_platform_x11 and…
luebkingUnsubmitted
Not Done

The code now requires both, so if the mali driver only supports one, it will fail the check.
You might want to pull the negation outside the check?

luebking: The code now requires both, so if the mali driver only supports one, it will fail the check.
gargAuthorUnsubmitted
Not Done

Ah you are correct.

garg: Ah you are correct.
185 qCWarning(KWIN_CORE) << "EGL_EXT_platform_base is supported, but EGL_EXT_platform_x11 is not. Cannot create EGLDisplay on X11"; 185​ !hasClientExtension(QByteArrayLiteral("EGL_KHR_platform_x11")) {
186​ qCWarning(KWIN_CORE) << "EGL_EXT_platform_base is supported, but neither EGL_EXT_platform_x11 nor EGL_KHR_platform_x11 is supported."
187​ << "Cannot create EGLDisplay on X11";
graesslinUnsubmitted
Done

the debug message should be updated to say that neither EGL_EXT_platform_x11 nor EGL_KHR_platform_x11 is supported.

graesslin: the debug message should be updated to say that neither EGL_EXT_platform_x11 nor…
gargAuthorUnsubmitted
Done

Ack.

garg: Ack.
186 return false; 188​ return false;
187 } 189​ }
188 190​
189 const int attribs[] = { 191​ const int attribs[] = {
190 EGL_PLATFORM_X11_SCREEN_EXT, m_x11ScreenNumber, 192​ EGL_PLATFORM_X11_SCREEN_EXT, m_x11ScreenNumber,
191 EGL_NONE 193​ EGL_NONE
192 }; 194​ };
193 195​
▲ Show 20 Lines • Show All 348 Lines • Show Last 20 Lines