From 81ba77d736f07efac37d284cd741d71f9dad4149 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Tue, 1 Apr 2014 09:39:28 +0200 Subject: [PATCH] Prevent crash when mixing shaders from different windows Change-Id: Iad9383ff02cb3130d725a215582400e7806df1dc Reviewed-by: Laszlo Agocs --- src/quick/items/qquickshadereffectsource.cpp | 10 ++- .../shadersource/tst_DynamicallyCreated.qml | 84 ++++++++++++++++++++++ .../shadersource/tst_SourceInOtherWindow.qml | 81 +++++++++++++++++++++ .../shadersource/tst_SourcedFromOtherWindow.qml | 81 +++++++++++++++++++++ 4 files changed, 254 insertions(+), 2 deletions(-) create mode 100644 tests/auto/qmltest/shadersource/tst_DynamicallyCreated.qml create mode 100644 tests/auto/qmltest/shadersource/tst_SourceInOtherWindow.qml create mode 100644 tests/auto/qmltest/shadersource/tst_SourcedFromOtherWindow.qml diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp index ebeff59..44cafe3 100644 --- a/src/quick/items/qquickshadereffectsource.cpp +++ b/src/quick/items/qquickshadereffectsource.cpp @@ -710,9 +710,15 @@ void QQuickShaderEffectSource::setSourceItem(QQuickItem *item) if (window()) d->derefWindow(); } - m_sourceItem = item; - if (item) { + if (window() == item->window()) { + m_sourceItem = item; + } else { + qWarning("ShaderEffectSource: sourceItem and ShaderEffectSource must both be children of the same window."); + m_sourceItem = 0; + } + + if (m_sourceItem) { QQuickItemPrivate *d = QQuickItemPrivate::get(item); // 'item' needs a window to get a scene graph node. It usually gets one through its // parent, but if the source item is "inline" rather than a reference -- i.e. diff --git a/tests/auto/qmltest/shadersource/tst_DynamicallyCreated.qml b/tests/auto/qmltest/shadersource/tst_DynamicallyCreated.qml new file mode 100644 index 0000000..ba0289f --- /dev/null +++ b/tests/auto/qmltest/shadersource/tst_DynamicallyCreated.qml @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Jolla Ltd, author: +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.2 +import QtQuick.Window 2.0 +import QtTest 1.0 + +Item { + width: 100 + height: 100 + + Window { + id: win + + width: 100 + height: 100 + + property bool rendered: false; + visible: true + + title: "QML window" + + onFrameSwapped: { + if (shaderSource.sourceItem) { + rendered = true; + } else { + var com = Qt.createQmlObject('import QtQuick 2.2; Rectangle { color: "red"; width: 100; height: 100 }', win); + shaderSource.sourceItem = com; + } + } + + ShaderEffectSource { + id: shaderSource + } + + } + + TestCase { + when: win.rendered; + name: "shadersource-dynamic-sourceobject" + function test_endresult() { + var image = grabImage(shaderSource); + compare(image.pixel(0, 0), Qt.rgba(1, 0, 0, 1)); + } + } +} diff --git a/tests/auto/qmltest/shadersource/tst_SourceInOtherWindow.qml b/tests/auto/qmltest/shadersource/tst_SourceInOtherWindow.qml new file mode 100644 index 0000000..d9959d7 --- /dev/null +++ b/tests/auto/qmltest/shadersource/tst_SourceInOtherWindow.qml @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Jolla Ltd, author: +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Window 2.0 + +import QtTest 1.0 + +Item { + Rectangle { + id: box + color: "red" + } + + Window { + id: childWindow + + width: 100 + height: 100 + + property bool rendered: false; + visible: true + onFrameSwapped: rendered = true; + + ShaderEffectSource { + id: theSource + sourceItem: box + } + + ShaderEffect { + property variant source: theSource; + anchors.fill: parent + } + } + + TestCase { + name: "shadersource-from-other-window" + when: childWindow.isRendered + function test_endresult() { + verify(true); // that we got here without problems... + } + } +} diff --git a/tests/auto/qmltest/shadersource/tst_SourcedFromOtherWindow.qml b/tests/auto/qmltest/shadersource/tst_SourcedFromOtherWindow.qml new file mode 100644 index 0000000..436705b --- /dev/null +++ b/tests/auto/qmltest/shadersource/tst_SourcedFromOtherWindow.qml @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Jolla Ltd, author: +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Window 2.0 + +import QtTest 1.0 + +Item { + Rectangle { + id: box + color: "red" + } + + ShaderEffectSource { + id: theSource + sourceItem: box + } + + Window { + id: childWindow + + width: 100 + height: 100 + + property bool rendered: false; + visible: true + onFrameSwapped: rendered = true; + + ShaderEffect { + property variant source: theSource; + anchors.fill: parent + } + } + + TestCase { + name: "shadersource-from-other-window" + when: childWindow.isRendered + function test_endresult() { + verify(true); // that we got here without problems... + } + } +} -- 2.7.4