diff options
Diffstat (limited to 'examples/server-buffer/compositor/main.cpp')
-rw-r--r-- | examples/server-buffer/compositor/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/server-buffer/compositor/main.cpp b/examples/server-buffer/compositor/main.cpp index 24e9e7fb..68aaea67 100644 --- a/examples/server-buffer/compositor/main.cpp +++ b/examples/server-buffer/compositor/main.cpp @@ -55,7 +55,7 @@ #include "qwayland-server-share-buffer.h" #include <QtCompositor/private/qwlcompositor_p.h> -#include <QtCompositor/qwaylandserverbufferintegration.h> +#include <QtCompositor/private/qwlserverbufferintegration_p.h> #include "serverbufferitem.h" @@ -138,12 +138,12 @@ private slots: openglContext()->makeCurrent(this); - QWaylandServerBufferIntegration *sbi = QWaylandCompositor::handle()->serverBufferIntegration(); + QtWayland::ServerBufferIntegration *sbi = QWaylandCompositor::handle()->serverBufferIntegration(); if (!sbi) { qWarning("Could not find a Server Buffer Integration"); return; } - if (sbi->supportsFormat(QWaylandServerBuffer::RGBA32)) { + if (sbi->supportsFormat(QtWayland::ServerBuffer::RGBA32)) { QImage image(100,100,QImage::Format_ARGB32_Premultiplied); image.fill(QColor(0x55,0x0,0x55,0x01)); { @@ -162,7 +162,7 @@ private slots: } image = image.convertToFormat(QImage::Format_RGBA8888); - m_server_buffer_32_bit = sbi->createServerBuffer(image.size(),QWaylandServerBuffer::RGBA32); + m_server_buffer_32_bit = sbi->createServerBuffer(image.size(),QtWayland::ServerBuffer::RGBA32); GLuint texture_32_bit; glGenTextures(1, &texture_32_bit); @@ -176,13 +176,13 @@ private slots: } - if (sbi->supportsFormat(QWaylandServerBuffer::A8)) { + if (sbi->supportsFormat(QtWayland::ServerBuffer::A8)) { QRawFont defaultRaw = QRawFont::fromFont(QFont(), QFontDatabase::Latin); QVector<quint32> index = defaultRaw.glyphIndexesForString(QStringLiteral("R")); QDistanceField distanceField(defaultRaw, index.front(), true); QImage img = distanceField.toImage(QImage::Format_Indexed8); - m_server_buffer_8_bit = sbi->createServerBuffer(img.size(), QWaylandServerBuffer::A8); + m_server_buffer_8_bit = sbi->createServerBuffer(img.size(), QtWayland::ServerBuffer::A8); GLuint texture_8_bit; glGenTextures(1, &texture_8_bit); glBindTexture(GL_TEXTURE_2D, texture_8_bit); @@ -240,9 +240,9 @@ protected: } private: - QWaylandServerBuffer *m_server_buffer_32_bit; + QtWayland::ServerBuffer *m_server_buffer_32_bit; ServerBufferItem *m_server_buffer_item_32_bit; - QWaylandServerBuffer *m_server_buffer_8_bit; + QtWayland::ServerBuffer *m_server_buffer_8_bit; ServerBufferItem *m_server_buffer_item_8_bit; }; |