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

Restore correct type check for wl_drm client buffers

Browse source 
With the EGLStreams support gone, we can restore the correct type check
for wl_drm client buffers. The spec suggests to query the
EGL_TEXTURE_FORMAT attribute to determine whether the specified wl_buffer
is a wl_drm buffer.
This commit is contained in:
Vlad Zahorodnii 2021-11-10 13:54:56 +02:00
parent 26233a8dfb
commit 128570ed53
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/wayland/drmclientbuffer.cpp
View file

@ -36,12 +36,7 @@ DrmClientBuffer::DrmClientBuffer(wl_resource *resource, DrmClientBufferIntegrati
Q_D(DrmClientBuffer); Q_D(DrmClientBuffer);
EGLDisplay eglDisplay = integration->display()->eglDisplay(); EGLDisplay eglDisplay = integration->display()->eglDisplay();
if (!eglQueryWaylandBufferWL(eglDisplay, resource, EGL_TEXTURE_FORMAT, &d->textureFormat)) { eglQueryWaylandBufferWL(eglDisplay, resource, EGL_TEXTURE_FORMAT, &d->textureFormat);
// The proprietary Nvidia driver doesn't support querying the EGL_TEXTURE_FORMAT.
// We must assume that the buffer has an alpha channel for transparency to work.
d->textureFormat = EGL_TEXTURE_RGBA;
}
eglQueryWaylandBufferWL(eglDisplay, resource, EGL_WIDTH, &d->width); eglQueryWaylandBufferWL(eglDisplay, resource, EGL_WIDTH, &d->width);
eglQueryWaylandBufferWL(eglDisplay, resource, EGL_HEIGHT, &d->height); eglQueryWaylandBufferWL(eglDisplay, resource, EGL_HEIGHT, &d->height);
@ -89,8 +84,8 @@ ClientBuffer *DrmClientBufferIntegration::createBuffer(::wl_resource *resource)
resolved = true; resolved = true;
} }
EGLint height; EGLint format;
if (eglQueryWaylandBufferWL(eglDisplay, resource, EGL_HEIGHT, &height)) { if (eglQueryWaylandBufferWL(eglDisplay, resource, EGL_TEXTURE_FORMAT, &format)) {
return new DrmClientBuffer(resource, this); return new DrmClientBuffer(resource, this);
} }
return nullptr; return nullptr;