[wayland] Add support for binding buffer as texture
Adds proper support for binding Wayland buffers to EGLImage. The loading is split into a shm part and a Wayland buffer part, so that both is supported. Wayland buffer support is limited to format EGL_TEXTURE_RGB and EGL_TEXTURE_RGBA. Other formats and multiple texture are not supported.
This commit is contained in:
parent
50ef02fa1b
commit
70a9c580fc
2 changed files with 100 additions and 8 deletions
|
@ -39,8 +39,20 @@ namespace KWin
|
||||||
|
|
||||||
typedef GLboolean(*eglBindWaylandDisplayWL_func)(EGLDisplay dpy, wl_display *display);
|
typedef GLboolean(*eglBindWaylandDisplayWL_func)(EGLDisplay dpy, wl_display *display);
|
||||||
typedef GLboolean(*eglUnbindWaylandDisplayWL_func)(EGLDisplay dpy, wl_display *display);
|
typedef GLboolean(*eglUnbindWaylandDisplayWL_func)(EGLDisplay dpy, wl_display *display);
|
||||||
|
typedef GLboolean(*eglQueryWaylandBufferWL_func)(EGLDisplay dpy, struct wl_resource *buffer, EGLint attribute, EGLint *value);
|
||||||
eglBindWaylandDisplayWL_func eglBindWaylandDisplayWL = nullptr;
|
eglBindWaylandDisplayWL_func eglBindWaylandDisplayWL = nullptr;
|
||||||
eglUnbindWaylandDisplayWL_func eglUnbindWaylandDisplayWL = nullptr;
|
eglUnbindWaylandDisplayWL_func eglUnbindWaylandDisplayWL = nullptr;
|
||||||
|
eglQueryWaylandBufferWL_func eglQueryWaylandBufferWL = nullptr;
|
||||||
|
|
||||||
|
#ifndef EGL_WAYLAND_BUFFER_WL
|
||||||
|
#define EGL_WAYLAND_BUFFER_WL 0x31D5
|
||||||
|
#endif
|
||||||
|
#ifndef EGL_WAYLAND_PLANE_WL
|
||||||
|
#define EGL_WAYLAND_PLANE_WL 0x31D6
|
||||||
|
#endif
|
||||||
|
#ifndef EGL_WAYLAND_Y_INVERTED_WL
|
||||||
|
#define EGL_WAYLAND_Y_INVERTED_WL 0x31DB
|
||||||
|
#endif
|
||||||
|
|
||||||
EglWaylandBackend::EglWaylandBackend()
|
EglWaylandBackend::EglWaylandBackend()
|
||||||
: QObject(NULL)
|
: QObject(NULL)
|
||||||
|
@ -162,8 +174,10 @@ void EglWaylandBackend::init()
|
||||||
if (hasGLExtension(QByteArrayLiteral("EGL_WL_bind_wayland_display"))) {
|
if (hasGLExtension(QByteArrayLiteral("EGL_WL_bind_wayland_display"))) {
|
||||||
eglBindWaylandDisplayWL = (eglBindWaylandDisplayWL_func)eglGetProcAddress("eglBindWaylandDisplayWL");
|
eglBindWaylandDisplayWL = (eglBindWaylandDisplayWL_func)eglGetProcAddress("eglBindWaylandDisplayWL");
|
||||||
eglUnbindWaylandDisplayWL = (eglUnbindWaylandDisplayWL_func)eglGetProcAddress("eglUnbindWaylandDisplayWL");
|
eglUnbindWaylandDisplayWL = (eglUnbindWaylandDisplayWL_func)eglGetProcAddress("eglUnbindWaylandDisplayWL");
|
||||||
|
eglQueryWaylandBufferWL = (eglQueryWaylandBufferWL_func)eglGetProcAddress("eglQueryWaylandBufferWL");
|
||||||
if (!eglBindWaylandDisplayWL(m_display, *(WaylandServer::self()->display()))) {
|
if (!eglBindWaylandDisplayWL(m_display, *(WaylandServer::self()->display()))) {
|
||||||
eglUnbindWaylandDisplayWL = nullptr;
|
eglUnbindWaylandDisplayWL = nullptr;
|
||||||
|
eglQueryWaylandBufferWL = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -398,6 +412,9 @@ EglWaylandTexture::EglWaylandTexture(KWin::SceneOpenGL::Texture *texture, KWin::
|
||||||
|
|
||||||
EglWaylandTexture::~EglWaylandTexture()
|
EglWaylandTexture::~EglWaylandTexture()
|
||||||
{
|
{
|
||||||
|
if (m_image != EGL_NO_IMAGE_KHR) {
|
||||||
|
eglDestroyImageKHR(m_backend->m_display, m_image);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
OpenGLBackend *EglWaylandTexture::backend()
|
OpenGLBackend *EglWaylandTexture::backend()
|
||||||
|
@ -407,14 +424,23 @@ OpenGLBackend *EglWaylandTexture::backend()
|
||||||
|
|
||||||
bool EglWaylandTexture::loadTexture(WindowPixmap *pixmap)
|
bool EglWaylandTexture::loadTexture(WindowPixmap *pixmap)
|
||||||
{
|
{
|
||||||
if (GLPlatform::instance()->isGLES()) {
|
|
||||||
// FIXME
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
const auto &buffer = pixmap->buffer();
|
const auto &buffer = pixmap->buffer();
|
||||||
if (buffer.isNull()) {
|
if (buffer.isNull()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (buffer->shmBuffer()) {
|
||||||
|
return loadShmTexture(buffer);
|
||||||
|
} else {
|
||||||
|
return loadEglTexture(buffer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool EglWaylandTexture::loadShmTexture(const QPointer< KWayland::Server::BufferInterface > &buffer)
|
||||||
|
{
|
||||||
|
if (GLPlatform::instance()->isGLES()) {
|
||||||
|
// FIXME
|
||||||
|
return false;
|
||||||
|
}
|
||||||
const QImage &image = buffer->data();
|
const QImage &image = buffer->data();
|
||||||
if (image.isNull()) {
|
if (image.isNull()) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -449,17 +475,52 @@ bool EglWaylandTexture::loadTexture(WindowPixmap *pixmap)
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool EglWaylandTexture::loadEglTexture(const QPointer< KWayland::Server::BufferInterface > &buffer)
|
||||||
|
{
|
||||||
|
if (!eglQueryWaylandBufferWL) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!buffer->resource()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
glGenTextures(1, &m_texture);
|
||||||
|
q->setWrapMode(GL_CLAMP_TO_EDGE);
|
||||||
|
q->setFilter(GL_LINEAR);
|
||||||
|
q->bind();
|
||||||
|
m_image = attach(buffer);
|
||||||
|
q->unbind();
|
||||||
|
|
||||||
|
if (EGL_NO_IMAGE_KHR == m_image) {
|
||||||
|
qCDebug(KWIN_CORE) << "failed to create egl image";
|
||||||
|
q->discard();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void EglWaylandTexture::updateTexture(WindowPixmap *pixmap)
|
void EglWaylandTexture::updateTexture(WindowPixmap *pixmap)
|
||||||
{
|
{
|
||||||
if (GLPlatform::instance()->isGLES()) {
|
|
||||||
// FIXME
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const auto &buffer = pixmap->buffer();
|
const auto &buffer = pixmap->buffer();
|
||||||
if (buffer.isNull()) {
|
if (buffer.isNull()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (!buffer->shmBuffer()) {
|
||||||
|
q->bind();
|
||||||
|
EGLImage image = attach(buffer);
|
||||||
|
q->unbind();
|
||||||
|
if (image != EGL_NO_IMAGE_KHR) {
|
||||||
|
eglDestroyImageKHR(m_backend->m_display, m_image);
|
||||||
|
m_image = image;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// shm fallback
|
||||||
|
if (GLPlatform::instance()->isGLES()) {
|
||||||
|
// FIXME
|
||||||
|
return;
|
||||||
|
}
|
||||||
const QImage &image = buffer->data();
|
const QImage &image = buffer->data();
|
||||||
if (image.isNull()) {
|
if (image.isNull()) {
|
||||||
return;
|
return;
|
||||||
|
@ -477,4 +538,31 @@ void EglWaylandTexture::updateTexture(WindowPixmap *pixmap)
|
||||||
q->unbind();
|
q->unbind();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EGLImage EglWaylandTexture::attach(const QPointer< KWayland::Server::BufferInterface > &buffer)
|
||||||
|
{
|
||||||
|
EGLint format, width, height, yInverted;
|
||||||
|
eglQueryWaylandBufferWL(m_backend->m_display, buffer->resource(), EGL_TEXTURE_FORMAT, &format);
|
||||||
|
if (format != EGL_TEXTURE_RGB && format != EGL_TEXTURE_RGBA) {
|
||||||
|
qCDebug(KWIN_CORE) << "Unsupported texture format: " << format;
|
||||||
|
return EGL_NO_IMAGE_KHR;
|
||||||
|
}
|
||||||
|
eglQueryWaylandBufferWL(m_backend->m_display, buffer->resource(), EGL_WAYLAND_Y_INVERTED_WL, &yInverted);
|
||||||
|
eglQueryWaylandBufferWL(m_backend->m_display, buffer->resource(), EGL_WIDTH, &width);
|
||||||
|
eglQueryWaylandBufferWL(m_backend->m_display, buffer->resource(), EGL_HEIGHT, &height);
|
||||||
|
|
||||||
|
const EGLint attribs[] = {
|
||||||
|
EGL_WAYLAND_PLANE_WL, 0,
|
||||||
|
EGL_NONE
|
||||||
|
};
|
||||||
|
EGLImage image = eglCreateImageKHR(m_backend->m_display, EGL_NO_CONTEXT, EGL_WAYLAND_BUFFER_WL,
|
||||||
|
(EGLClientBuffer)buffer->resource(), attribs);
|
||||||
|
if (image != EGL_NO_IMAGE_KHR) {
|
||||||
|
glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, (GLeglImageOES)image);
|
||||||
|
m_size = QSize(width, height);
|
||||||
|
updateMatrix();
|
||||||
|
q->setYInverted(yInverted);
|
||||||
|
}
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
|
@ -97,8 +97,12 @@ public:
|
||||||
private:
|
private:
|
||||||
friend class EglWaylandBackend;
|
friend class EglWaylandBackend;
|
||||||
EglWaylandTexture(SceneOpenGL::Texture *texture, EglWaylandBackend *backend);
|
EglWaylandTexture(SceneOpenGL::Texture *texture, EglWaylandBackend *backend);
|
||||||
|
bool loadShmTexture(const QPointer<KWayland::Server::BufferInterface> &buffer);
|
||||||
|
bool loadEglTexture(const QPointer<KWayland::Server::BufferInterface> &buffer);
|
||||||
|
EGLImage attach(const QPointer<KWayland::Server::BufferInterface> &buffer);
|
||||||
SceneOpenGL::Texture *q;
|
SceneOpenGL::Texture *q;
|
||||||
EglWaylandBackend *m_backend;
|
EglWaylandBackend *m_backend;
|
||||||
|
EGLImageKHR m_image;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
Loading…
Reference in a new issue