c3ae30085e
Introduces a new QRhiShaderResourceBinding function that takes an array of texture-sampler pairs. The existing function is also available and is equivalent to calling the array-based version with array size 1. It is important to note that for Metal one needs MSL 2.0 for array of textures, so qsb needs --msl 20 instead of --msl 12 for such shaders. Comes with an autotest, and also updates all .qsb files for said test with the latest shadertools. Task-number: QTBUG-82624 Change-Id: Ibc1973aae826836f16d842c41d6c8403fd7ff876 Reviewed-by: Christian Strømme <christian.stromme@qt.io>
50 lines
2.7 KiB
Batchfile
50 lines
2.7 KiB
Batchfile
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
|
::
|
|
:: Copyright (C) 2019 The Qt Company Ltd.
|
|
:: Contact: https://www.qt.io/licensing/
|
|
::
|
|
:: This file is part of the QtQuick module 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$
|
|
::
|
|
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
|
|
|
:: Note the -c argument: we do not want runtime HLSL compilation since that is
|
|
:: not an option on UWP (WinRT). This means that running qsb must happen on Windows.
|
|
|
|
qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o simple.vert.qsb simple.vert
|
|
qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o simple.frag.qsb simple.frag
|
|
qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o simpletextured.vert.qsb simpletextured.vert
|
|
qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o simpletextured.frag.qsb simpletextured.frag
|
|
qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 20 -o simpletextured_array.frag.qsb simpletextured_array.frag
|
|
qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o textured.vert.qsb textured.vert
|
|
qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o textured.frag.qsb textured.frag
|