summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouai Al-Khanji <louai.al-khanji@theqtcompany.com>2016-02-29 13:33:46 -0800
committerLouai Al-Khanji <louai.al-khanji@qt.io>2016-04-27 17:23:26 +0000
commit15cd497e00b62466dafa5b8c33af40e9a46696df (patch)
tree05da3a4eeee43f7431e48b73f127ced736382639
parent5a12ca82b2885e66958d287150fe5ad6b0a471ea (diff)
Remove left over files
Change-Id: I725eb0561c6f92e4698d85a1ca7ac7b9a700ebbd Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
-rw-r--r--src/compositor/compositor_api/qwaylandtexturebufferattacher.cpp107
-rw-r--r--src/compositor/compositor_api/qwaylandtexturebufferattacher_p.h90
2 files changed, 0 insertions, 197 deletions
diff --git a/src/compositor/compositor_api/qwaylandtexturebufferattacher.cpp b/src/compositor/compositor_api/qwaylandtexturebufferattacher.cpp
deleted file mode 100644
index 7466fd126..000000000
--- a/src/compositor/compositor_api/qwaylandtexturebufferattacher.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 LG Electronics Inc, author: <mikko.levonmaa@lge.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qwaylandtexturebufferattacher_p.h"
-
-#include <QQuickWindow>
-#include <QSGTexture>
-
-#include <QtCompositor/qwaylandquicksurface.h>
-#include <QtCompositor/qwaylandoutput.h>
-
-QWaylandTextureBufferAttacher::QWaylandTextureBufferAttacher(QWaylandQuickSurface *surface)
- : m_surface(surface)
- , m_texture(0)
- , m_update(false)
-{
-}
-
-QWaylandTextureBufferAttacher::~QWaylandTextureBufferAttacher()
-{
- if (m_texture)
- m_texture->deleteLater();
- m_buffer = QWaylandBufferRef();
- m_nextBuffer = QWaylandBufferRef();
-}
-
-void QWaylandTextureBufferAttacher::attach(const QWaylandBufferRef &ref)
-{
- m_nextBuffer = ref;
- m_update = true;
-}
-
-void QWaylandTextureBufferAttacher::updateTexture()
-{
- m_buffer = m_nextBuffer;
- delete m_texture;
- m_texture = 0;
-
- QQuickWindow *window = static_cast<QQuickWindow *>(m_surface->mainOutput()->window());
- if (m_nextBuffer) {
- if (m_buffer.isShm()) {
- m_texture = window->createTextureFromImage(m_buffer.image());
- } else {
- QQuickWindow::CreateTextureOptions opt = 0;
- if (m_surface->useTextureAlpha()) {
- opt |= QQuickWindow::TextureHasAlphaChannel;
- }
- m_texture = window->createTextureFromId(m_buffer.createTexture(), m_surface->size(), opt);
- }
- m_texture->bind();
- }
-
- m_update = false;
-}
-
-void QWaylandTextureBufferAttacher::unmap()
-{
- m_nextBuffer = QWaylandBufferRef();
- m_update = true;
-}
-
-void QWaylandTextureBufferAttacher::invalidateTexture()
-{
- if (m_buffer)
- m_buffer.destroyTexture();
- delete m_texture;
- m_texture = 0;
- m_update = true;
- m_buffer = QWaylandBufferRef();
-}
-
diff --git a/src/compositor/compositor_api/qwaylandtexturebufferattacher_p.h b/src/compositor/compositor_api/qwaylandtexturebufferattacher_p.h
deleted file mode 100644
index c861072c7..000000000
--- a/src/compositor/compositor_api/qwaylandtexturebufferattacher_p.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 LG Electronics Inc, author: <mikko.levonmaa@lge.com>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QWAYLANDTEXTUREBUFFERATTACHER_H
-#define QWAYLANDTEXTUREBUFFERATTACHER_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCompositor/qwaylandsurface.h>
-#include <QtCompositor/qwaylandbufferref.h>
-
-QT_BEGIN_NAMESPACE
-
-class QSGTexture;
-class QWaylandQuickSurface;
-
-class QWaylandTextureBufferAttacher : public QWaylandBufferAttacher
-{
-public:
- QWaylandTextureBufferAttacher(QWaylandQuickSurface *surface);
- virtual ~QWaylandTextureBufferAttacher();
-
- void updateTexture();
- void invalidateTexture();
-
- bool isDirty() const { return m_update; }
- QSGTexture* texture() const { return m_texture; }
- QWaylandBufferRef currentBuffer() const { return m_buffer; }
-
-protected:
- virtual void attach(const QWaylandBufferRef &ref) Q_DECL_OVERRIDE;
- virtual void unmap() Q_DECL_OVERRIDE;
-
- QWaylandQuickSurface *m_surface;
- QSGTexture *m_texture;
-
- QWaylandBufferRef m_buffer;
- QWaylandBufferRef m_nextBuffer;
- bool m_update;
-};
-
-QT_END_NAMESPACE
-#endif
-
-