Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-shadertools for openSUSE:Factory
checked in at 2023-01-11 14:34:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-shadertools (Old)
and /work/SRC/openSUSE:Factory/.qt6-shadertools.new.32243 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-shadertools"
Wed Jan 11 14:34:12 2023 rev:19 rq:1057279 version:6.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-shadertools/qt6-shadertools.changes
2022-11-21 15:29:29.140614816 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-shadertools.new.32243/qt6-shadertools.changes
2023-01-11 14:35:16.061303228 +0100
@@ -1,0 +2,6 @@
+Fri Jan 6 16:46:51 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 6.4.2:
+ * https://www.qt.io/blog/qt-6.4.2-released
+
+-------------------------------------------------------------------
Old:
----
qtshadertools-everywhere-src-6.4.1.tar.xz
New:
----
qtshadertools-everywhere-src-6.4.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-shadertools.spec ++++++
--- /var/tmp/diff_new_pack.gLodMI/_old 2023-01-11 14:35:16.509305760 +0100
+++ /var/tmp/diff_new_pack.gLodMI/_new 2023-01-11 14:35:16.513305782 +0100
@@ -16,7 +16,7 @@
#
-%define real_version 6.4.1
+%define real_version 6.4.2
%define short_version 6.4
%define tar_name qtshadertools-everywhere-src
%define tar_suffix %{nil}
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-shadertools%{?pkg_suffix}
-Version: 6.4.1
+Version: 6.4.2
Release: 0
Summary: Qt 6 ShaderTools library
License: GPL-3.0-or-later
++++++ qtshadertools-everywhere-src-6.4.1.tar.xz ->
qtshadertools-everywhere-src-6.4.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.4.1/.cmake.conf
new/qtshadertools-everywhere-src-6.4.2/.cmake.conf
--- old/qtshadertools-everywhere-src-6.4.1/.cmake.conf 2022-11-08
16:10:00.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.4.2/.cmake.conf 2022-12-12
15:01:49.000000000 +0100
@@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.4.1")
+set(QT_REPO_MODULE_VERSION "6.4.2")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.4.1/.tag
new/qtshadertools-everywhere-src-6.4.2/.tag
--- old/qtshadertools-everywhere-src-6.4.1/.tag 2022-11-08 16:10:00.000000000
+0100
+++ new/qtshadertools-everywhere-src-6.4.2/.tag 2022-12-12 15:01:49.000000000
+0100
@@ -1 +1 @@
-165cdfe9777efe19b77f12609642e8508aa366a8
+84b29dbc1d8ec567917c46eaedfc1cabb94fca9d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.4.1/dependencies.yaml
new/qtshadertools-everywhere-src-6.4.2/dependencies.yaml
--- old/qtshadertools-everywhere-src-6.4.1/dependencies.yaml 2022-11-08
16:10:00.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.4.2/dependencies.yaml 2022-12-12
15:01:49.000000000 +0100
@@ -1,4 +1,4 @@
dependencies:
../qtbase:
- ref: 905755304a474c942346774d930b92e3665c1bab
+ ref: e3e40c44d3f998a433a6a1080297c5f28e9a768f
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qshaderbaker_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qshaderbaker_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qshaderbaker_p.h
2022-11-08 16:10:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qshaderbaker_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qshaderbaker_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qshaderbatchablerewriter_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qshaderbatchablerewriter_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qshaderbatchablerewriter_p.h
2022-11-08 16:10:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qshaderbatchablerewriter_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qshaderbatchablerewriter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvcompiler_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvcompiler_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvcompiler_p.h
2022-11-08 16:10:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvcompiler_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qspirvcompiler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvshader_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvshader_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvshader_p.h
2022-11-08 16:10:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvshader_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qspirvshader_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvshaderremap_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvshaderremap_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvshaderremap_p.h
2022-11-08 16:10:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qspirvshaderremap_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qspirvshaderremap_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qtshadertoolsglobal_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qtshadertoolsglobal_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.1/QtShaderTools/private/qtshadertoolsglobal_p.h
2022-11-08 16:10:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.1/QtShaderTools/private/qtshadertoolsglobal_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/shadertools/qtshadertoolsglobal_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qshaderbaker_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qshaderbaker_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qshaderbaker_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qshaderbaker_p.h
2022-12-12 15:01:49.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qshaderbaker_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qshaderbatchablerewriter_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qshaderbatchablerewriter_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qshaderbatchablerewriter_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qshaderbatchablerewriter_p.h
2022-12-12 15:01:49.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qshaderbatchablerewriter_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvcompiler_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvcompiler_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvcompiler_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvcompiler_p.h
2022-12-12 15:01:49.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qspirvcompiler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvshader_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvshader_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvshader_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvshader_p.h
2022-12-12 15:01:49.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qspirvshader_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvshaderremap_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvshaderremap_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvshaderremap_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qspirvshaderremap_p.h
2022-12-12 15:01:49.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qspirvshaderremap_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qtshadertoolsglobal_p.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qtshadertoolsglobal_p.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/6.4.2/QtShaderTools/private/qtshadertoolsglobal_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/6.4.2/QtShaderTools/private/qtshadertoolsglobal_p.h
2022-12-12 15:01:49.000000000 +0100
@@ -0,0 +1 @@
+#include "../../../../../src/shadertools/qtshadertoolsglobal_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/qtshadertoolsversion.h
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/qtshadertoolsversion.h
---
old/qtshadertools-everywhere-src-6.4.1/include/QtShaderTools/qtshadertoolsversion.h
2022-11-10 12:06:06.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/include/QtShaderTools/qtshadertoolsversion.h
2022-12-13 08:05:09.000000000 +0100
@@ -2,8 +2,8 @@
#ifndef QT_QTSHADERTOOLS_VERSION_H
#define QT_QTSHADERTOOLS_VERSION_H
-#define QTSHADERTOOLS_VERSION_STR "6.4.1"
+#define QTSHADERTOOLS_VERSION_STR "6.4.2"
-#define QTSHADERTOOLS_VERSION 0x060401
+#define QTSHADERTOOLS_VERSION 0x060402
#endif // QT_QTSHADERTOOLS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/src/shadertools/doc/src/qtshadertools-build.qdoc
new/qtshadertools-everywhere-src-6.4.2/src/shadertools/doc/src/qtshadertools-build.qdoc
---
old/qtshadertools-everywhere-src-6.4.1/src/shadertools/doc/src/qtshadertools-build.qdoc
2022-11-08 16:10:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/src/shadertools/doc/src/qtshadertools-build.qdoc
2022-12-12 15:01:49.000000000 +0100
@@ -179,9 +179,8 @@
Manual}{qsb}, depending on the platform. When building on Windows, this
leads to invoking \c fxc from the Windows SDK to do the first phase of
compilation (HLSL source to DXBC bytecode) at build time instead of at run
- time. On macOS it uses invokves the Metal tools to generate a Metal
library.
- In either case the resulting \c{.qsb} file will only include the
compilation
- results, not the HLSL or MSL source.
+ time. The resulting \c{.qsb} file will only include the compilation results
+ (the intermediate shader format), not the original shader source code.
\li \c OPTIMIZED - Invokes \c spirv-opt (which must be available from the
Vulkan SDK or elsewhere) to perform optimizations on the SPIR-V
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/src/shadertools/doc/src/qtshadertools-qsb.qdoc
new/qtshadertools-everywhere-src-6.4.2/src/shadertools/doc/src/qtshadertools-qsb.qdoc
---
old/qtshadertools-everywhere-src-6.4.1/src/shadertools/doc/src/qtshadertools-qsb.qdoc
2022-11-08 16:10:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.4.2/src/shadertools/doc/src/qtshadertools-qsb.qdoc
2022-12-12 15:01:49.000000000 +0100
@@ -78,7 +78,7 @@
form) and the included shaders.
\li Extraction mode. This allows writing a given shader from an
- existing \c{.qsb} file into a separate file. For examples, \c{qsb
+ existing \c{.qsb} file into a separate file. For example, \c{qsb
-x spirv.100 -o myshader.spv myshader.frag.qsb} writes the SPIR-V
binary into \c myshader.spv.
@@ -177,7 +177,7 @@
\endcode
This leads to generating a shader package that makes it suitable for
OpenGL,
- Direct 3D, and Metal as well. The features used in this shader are basic,
+ Direct 3D, and Metal as well. The features used in this shader are basic,
and even GLSL ES 100 (the shading language of OpenGL ES 2.0) is suitable.
Inspecting the result shows:
@@ -323,12 +323,12 @@
1 -> [0, 0]
\endcode
- Internally this allows mapping a SPIR-V style binding point \c 0 to the
HLSL
- register \c b0 and binding \c 1 to \c t0 and \c s0. This helps making the
- differences in resource bindings between the various shading languages
+ Internally, this allows mapping a SPIR-V style binding point \c 0 to the
+ HLSL register \c b0 and binding \c 1 to \c t0 and \c s0. This helps making
+ the differences in resource bindings between the various shading languages
transparent to the users of the Rendering Hardware Interface, and allows
- everything in Qt to operate with Vulkan/SPIR-V style binding points as
- they are specified in the original Vulkan-style GLSL source code.
+ everything in Qt to operate with Vulkan/SPIR-V style binding points as they
+ are specified in the original Vulkan-style GLSL source code.
\section1 Shader Types
@@ -358,7 +358,7 @@
of version 3.2 and higher.
If the shader uses functions or constructs that do not have an equivalent
in
- the specified targets, \c qsb will fail. If that is the case, the targets
+ the specified targets, \c qsb will fail. If that is the case, the targets
will need to be adjusted, and this also means that the application's
minimum
system requirements get adjusted implicitly. As an example, take the \c
textureLod GLSL function that is only available with OpenGL ES 3.0 and up
@@ -367,7 +367,7 @@
file will now require OpenGL ES 3.0 or higher and will not be compatible
with OpenGL ES 2.0 based systems.
- Another obvious example of this are compute shaders: \c{.comp} shaders will
+ Another obvious example of this is compute shaders: \c{.comp} shaders will
need to specify \c{--glsl 310es,430} as compute shaders are only available
with OpenGL ES 3.1 or newer and OpenGL 4.3 or newer.
@@ -384,8 +384,8 @@
supplied GLSL vertex shader code. In Qt 6 that is not an option. Instead,
batchable variants of vertex shaders can be built by the \c qsb tool. This
is requested by the \c{-b} argument. When the input is not a vertex shader
- with \c{.vert} extension, it has no effect. For vertex shaders however, it
- will lead to generating to versions for each target. Qt Quick will then
+ with \c{.vert} extension, it has no effect. For vertex shaders, however, it
+ will lead to generating two versions for each target. Qt Quick will then
automatically pick the right variant (standard or batchable) at run time.
\note Applications do not have to concern themselves with the details of
@@ -452,10 +452,10 @@
stored in the \c{.qsb} file instead of HLSL. Qt will automatically pick it
up at run time, so it is up to the \c{.qsb} file's creator to decide what
to
include, HLSL source or the intermediate format. Whenever possible, prefer
- the latter since it eliminates the need for parsing and HLSL source at run
+ the latter since it eliminates the need for parsing an HLSL source at run
time, leading to potentially significant performance gains upon graphics
pipeline creation. The downside is that this argument can only be used when
- \c qsb is being run on Windows.
+ \c qsb runs on Windows.
\li \c{-t} or \c{--metallib} - invokves the appropriate XCode Metal tools
to
generate a .metallib file and includes that in the \c{.qsb} package instead
@@ -554,7 +554,7 @@
Let's call this \c{shader_gles.frag}. Once \c{qsb --glsl 100es -o
shader.frag.qsb shader.frag} completes, giving us a (half-ready) .qsb file,
we can do \c{qsb -r glsl,100es,shader_gles.frag shader.frag.qsb} to update
- update \c{shader.frag.qsb} by substituting the shader for GLSL 100 es with
+ \c{shader.frag.qsb} by substituting the shader for GLSL 100 es with
the contents of the specified file (\c{shader_gles.frag}). Now
\c{shader.frag.qsb} is ready to be used at run time with OpenGL ES.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.4.1/src/shadertools/qshaderbaker.cpp
new/qtshadertools-everywhere-src-6.4.2/src/shadertools/qshaderbaker.cpp
--- old/qtshadertools-everywhere-src-6.4.1/src/shadertools/qshaderbaker.cpp
2022-11-08 16:10:00.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.4.2/src/shadertools/qshaderbaker.cpp
2022-12-12 15:01:49.000000000 +0100
@@ -503,7 +503,7 @@
// Now spirv, and, if in use, batchableSpirv, contain at least one,
// optionally more SPIR-V binaries.
- Q_ASSERT(!spirv.isEmpty() && (d->perTargetEnabled || spirv.count() == 1));
+ Q_ASSERT(!spirv.isEmpty() && (d->perTargetEnabled || spirv.size() == 1));
QShader bs;
bs.setStage(d->stage);
@@ -579,13 +579,13 @@
for (const
QSpirvShader::SeparateToCombinedImageSamplerMapping &mapping :
separateToCombinedImageSamplerMappings) {
int textureBinding = -1;
int samplerBinding = -1;
- for (int i = 0, count = separateImages.count(); i <
count; ++i) {
+ for (int i = 0, count = separateImages.size(); i <
count; ++i) {
if (separateImages[i].name == mapping.textureName)
{
textureBinding = separateImages[i].binding;
break;
}
}
- for (int i = 0, count = separateSamplers.count(); i <
count; ++i) {
+ for (int i = 0, count = separateSamplers.size(); i <
count; ++i) {
if (separateSamplers[i].name ==
mapping.samplerName) {
samplerBinding = separateSamplers[i].binding;
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.4.1/tools/qsb/qsb.cpp
new/qtshadertools-everywhere-src-6.4.2/tools/qsb/qsb.cpp
--- old/qtshadertools-everywhere-src-6.4.1/tools/qsb/qsb.cpp 2022-11-08
16:10:00.000000000 +0100
+++ new/qtshadertools-everywhere-src-6.4.2/tools/qsb/qsb.cpp 2022-12-12
15:01:49.000000000 +0100
@@ -191,15 +191,15 @@
ts << "QSB_VERSION: " << QShaderPrivate::get(&bs)->qsbVersion << "\n";
#endif
const QList<QShaderKey> keys = bs.availableShaders();
- ts << "Has " << keys.count() << " shaders: (unordered list)\n";
- for (int i = 0; i < keys.count(); ++i) {
+ ts << "Has " << keys.size() << " shaders: (unordered list)\n";
+ for (int i = 0; i < keys.size(); ++i) {
ts << " Shader " << i << ": " << sourceStr(keys[i].source())
<< " " << sourceVersionStr(keys[i].sourceVersion())
<< " [" << sourceVariantStr(keys[i].sourceVariant()) << "]\n";
}
ts << "\n";
ts << "Reflection info: " << bs.description().toJson() << "\n\n";
- for (int i = 0; i < keys.count(); ++i) {
+ for (int i = 0; i < keys.size(); ++i) {
ts << "Shader " << i << ": " << sourceStr(keys[i].source())
<< " " << sourceVersionStr(keys[i].sourceVersion())
<< " [" << sourceVariantStr(keys[i].sourceVariant()) << "]\n";
@@ -240,7 +240,7 @@
static QShaderKey shaderKeyFromWhatSpec(const QString &what, QShader::Variant
variant)
{
const QStringList typeAndVersion = what.split(QLatin1Char(','),
Qt::SkipEmptyParts);
- if (typeAndVersion.count() < 2)
+ if (typeAndVersion.size() < 2)
return {};
QShader::Source src;
@@ -264,10 +264,10 @@
QShaderVersion::Flags flags;
QString version = typeAndVersion[1];
if (version.endsWith(QLatin1String(" es"))) {
- version = version.left(version.length() - 3);
+ version = version.left(version.size() - 3);
flags |= QShaderVersion::GlslEs;
} else if (version.endsWith(QLatin1String("es"))) {
- version = version.left(version.length() - 2);
+ version = version.left(version.size() - 2);
flags |= QShaderVersion::GlslEs;
}
const int ver = version.toInt();
@@ -308,7 +308,7 @@
QShader workShaderPack = shaderPack;
for (const QString &what : whatList) {
const QStringList spec = what.split(QLatin1Char(','),
Qt::SkipEmptyParts);
- if (spec.count() < 3) {
+ if (spec.size() < 3) {
printError("Invalid replace spec '%s'", qPrintable(what));
return false;
}
@@ -566,10 +566,10 @@
for (QString version : versions) {
QShaderVersion::Flags flags;
if (version.endsWith(QLatin1String(" es"))) {
- version = version.left(version.length() - 3);
+ version = version.left(version.size() - 3);
flags |= QShaderVersion::GlslEs;
} else if (version.endsWith(QLatin1String("es"))) {
- version = version.left(version.length() - 2);
+ version = version.left(version.size() - 2);
flags |= QShaderVersion::GlslEs;
}
bool ok = false;
