Release 1.12.

For consistency with the other VKD3D_TEST_* environment variables.

.mailmap

@@ -0,0 +1,2 @@
+Elizabeth Figura <z.figura12@gmail.com>
+Elizabeth Figura <zfigura@codeweavers.com>

AUTHORS

@@ -10,6 +10,7 @@ Chip Davis
 Conor McCarthy
 David Gow
 Derek Lesho
+Elizabeth Figura
 Ethan Lee
 Evan Tang
 Fabian Maurer
@@ -36,5 +37,4 @@ Stefan Dösinger
 Sven Hesse
 Victor Chiletto
 Vinson Lee
-Zebediah Figura
 Zhiyi Zhang

Makefile.am

@@ -65,6 +65,7 @@ vkd3d_shader_tests = \
 	tests/hlsl/bitwise.shader_test \
 	tests/hlsl/bool-cast.shader_test \
 	tests/hlsl/bool-semantics.shader_test \
+	tests/hlsl/calculate-lod.shader_test \
 	tests/hlsl/cast-64-bit.shader_test \
 	tests/hlsl/cast-broadcast.shader_test \
 	tests/hlsl/cast-componentwise-compatible.shader_test \
@@ -77,19 +78,31 @@ vkd3d_shader_tests = \
 	tests/hlsl/ceil.shader_test \
 	tests/hlsl/cf-cond-types.shader_test \
 	tests/hlsl/clamp.shader_test \
+	tests/hlsl/clip-distance.shader_test \
 	tests/hlsl/clip.shader_test \
 	tests/hlsl/combined-samplers.shader_test \
 	tests/hlsl/comma.shader_test \
 	tests/hlsl/compute.shader_test \
 	tests/hlsl/conditional.shader_test \
 	tests/hlsl/const.shader_test \
+	tests/hlsl/coverage.shader_test \
 	tests/hlsl/cross.shader_test \
 	tests/hlsl/d3dcolor-to-ubyte4.shader_test \
 	tests/hlsl/ddxddy.shader_test \
+	tests/hlsl/default-values.shader_test \
+	tests/hlsl/depth-out.shader_test \
+	tests/hlsl/determinant.shader_test \
 	tests/hlsl/discard.shader_test \
 	tests/hlsl/distance.shader_test \
 	tests/hlsl/dot.shader_test \
 	tests/hlsl/duplicate-modifiers.shader_test \
+	tests/hlsl/effect-compile.shader_test \
+	tests/hlsl/effect-shader-objects-fx_2.shader_test \
+	tests/hlsl/effect-shader-objects-fx_5.shader_test \
+	tests/hlsl/effect-technique-fx_2.shader_test \
+	tests/hlsl/effect-technique-fx_4.shader_test \
+	tests/hlsl/effect-technique-fx_5.shader_test \
+	tests/hlsl/effect-variables-fx_2.shader_test \
 	tests/hlsl/entry-point-semantics.shader_test \
 	tests/hlsl/exp.shader_test \
 	tests/hlsl/expr-indexing.shader_test \
@@ -103,8 +116,11 @@ vkd3d_shader_tests = \
 	tests/hlsl/function-return.shader_test \
 	tests/hlsl/function.shader_test \
 	tests/hlsl/fwidth.shader_test \
+	tests/hlsl/fxgroup-syntax.shader_test \
 	tests/hlsl/gather-offset.shader_test \
 	tests/hlsl/gather.shader_test \
+	tests/hlsl/geometry.shader_test \
+	tests/hlsl/get-sample-pos.shader_test \
 	tests/hlsl/getdimensions.shader_test \
 	tests/hlsl/half.shader_test \
 	tests/hlsl/hard-copy-prop.shader_test \
@@ -119,6 +135,7 @@ vkd3d_shader_tests = \
 	tests/hlsl/initializer-objects.shader_test \
 	tests/hlsl/initializer-static-array.shader_test \
 	tests/hlsl/initializer-struct.shader_test \
+	tests/hlsl/instance-id.shader_test \
 	tests/hlsl/intrinsic-override.shader_test \
 	tests/hlsl/invalid.shader_test \
 	tests/hlsl/inverse-trig.shader_test \
@@ -137,7 +154,7 @@ vkd3d_shader_tests = \
 	tests/hlsl/math.shader_test \
 	tests/hlsl/matrix-indexing.shader_test \
 	tests/hlsl/matrix-semantics.shader_test \
-	tests/hlsl/max.shader_test \
+	tests/hlsl/max-min.shader_test \
 	tests/hlsl/minimum-precision.shader_test \
 	tests/hlsl/mul.shader_test \
 	tests/hlsl/multiple-rt.shader_test \
@@ -151,15 +168,22 @@ vkd3d_shader_tests = \
 	tests/hlsl/object-field-offsets.shader_test \
 	tests/hlsl/object-parameters.shader_test \
 	tests/hlsl/object-references.shader_test \
+	tests/hlsl/pointer-cast.shader_test \
 	tests/hlsl/pow.shader_test \
+	tests/hlsl/precise-modifier.shader_test \
 	tests/hlsl/rasteriser-ordered-views.shader_test \
 	tests/hlsl/reflect.shader_test \
+	tests/hlsl/refract.shader_test \
 	tests/hlsl/register-reservations-numeric.shader_test \
+	tests/hlsl/register-reservations-profile.shader_test \
 	tests/hlsl/register-reservations-resources.shader_test \
+	tests/hlsl/register-reservations-space.shader_test \
 	tests/hlsl/return-implicit-conversion.shader_test \
 	tests/hlsl/return.shader_test \
 	tests/hlsl/round.shader_test \
+	tests/hlsl/rt-get-sample-info.shader_test \
 	tests/hlsl/sample-bias.shader_test \
+	tests/hlsl/sample-cmp.shader_test \
 	tests/hlsl/sample-grad.shader_test \
 	tests/hlsl/sample-level.shader_test \
 	tests/hlsl/sampler-offset.shader_test \
@@ -170,16 +194,19 @@ vkd3d_shader_tests = \
 	tests/hlsl/side-effects.shader_test \
 	tests/hlsl/sign.shader_test \
 	tests/hlsl/single-numeric-initializer.shader_test \
+	tests/hlsl/sm1-const-allocation.shader_test \
 	tests/hlsl/sm1-const-folding.shader_test \
 	tests/hlsl/sm6-ternary.shader_test \
 	tests/hlsl/sm6-uav-rwtexture.shader_test \
 	tests/hlsl/smoothstep.shader_test \
 	tests/hlsl/sqrt.shader_test \
 	tests/hlsl/srv-buffers.shader_test \
+	tests/hlsl/state-block-function-syntax.shader_test \
 	tests/hlsl/state-block-syntax.shader_test \
 	tests/hlsl/static-initializer.shader_test \
 	tests/hlsl/step.shader_test \
 	tests/hlsl/storage-qualifiers.shader_test \
+	tests/hlsl/strings.shader_test \
 	tests/hlsl/struct-array.shader_test \
 	tests/hlsl/struct-assignment.shader_test \
 	tests/hlsl/struct-semantics.shader_test \
@@ -187,28 +214,35 @@ vkd3d_shader_tests = \
 	tests/hlsl/swizzle-constant-prop.shader_test \
 	tests/hlsl/swizzle-matrix.shader_test \
 	tests/hlsl/swizzles.shader_test \
-	tests/hlsl/technique-fx_2.shader_test \
-	tests/hlsl/technique-fx_4.shader_test \
-	tests/hlsl/technique-fx_5.shader_test \
 	tests/hlsl/ternary.shader_test \
+	tests/hlsl/tessellation.shader_test \
 	tests/hlsl/texture-load-offset.shader_test \
 	tests/hlsl/texture-load-typed.shader_test \
 	tests/hlsl/texture-load.shader_test \
 	tests/hlsl/texture-ordering.shader_test \
+	tests/hlsl/tgsm.shader_test \
 	tests/hlsl/transpose.shader_test \
 	tests/hlsl/trigonometry.shader_test \
 	tests/hlsl/trunc.shader_test \
 	tests/hlsl/type-names.shader_test \
 	tests/hlsl/uav-atomics.shader_test \
+	tests/hlsl/uav-counter.shader_test \
 	tests/hlsl/uav-load.shader_test \
 	tests/hlsl/uav-out-param.shader_test \
 	tests/hlsl/uav-rwbuffer.shader_test \
+	tests/hlsl/uav-rwbyteaddressbuffer.shader_test \
 	tests/hlsl/uav-rwstructuredbuffer.shader_test \
 	tests/hlsl/uav-rwtexture.shader_test \
+	tests/hlsl/unbounded-array-5.1.shader_test \
 	tests/hlsl/uniform-parameters.shader_test \
 	tests/hlsl/uniform-semantics.shader_test \
 	tests/hlsl/vector-indexing-uniform.shader_test \
 	tests/hlsl/vector-indexing.shader_test \
+	tests/hlsl/vertex-shader-ops.shader_test \
+	tests/hlsl/wave-ops-float.shader_test \
+	tests/hlsl/wave-ops-int.shader_test \
+	tests/hlsl/wave-ops-uint.shader_test \
+	tests/hlsl/wave-reconvergence.shader_test \
 	tests/hlsl/writemask-assignop-0.shader_test \
 	tests/hlsl/writemask-assignop-1.shader_test \
 	tests/hlsl/writemask-assignop-2.shader_test \
@@ -242,7 +276,6 @@ BUILT_SOURCES = $(widl_headers) \
 
 noinst_LTLIBRARIES = libvkd3d-common.la
 libvkd3d_common_la_SOURCES = \
-	include/private/vkd3d_debug.h \
 	libs/vkd3d-common/blob.c \
 	libs/vkd3d-common/debug.c \
 	libs/vkd3d-common/error.c \
@@ -298,7 +331,6 @@ libvkd3d_shader_la_SOURCES = \
 	include/private/list.h \
 	include/private/rbtree.h \
 	include/private/vkd3d_common.h \
-	include/private/vkd3d_debug.h \
 	include/private/vkd3d_memory.h \
 	include/vkd3d_shader.h \
 	libs/vkd3d-shader/checksum.c \
@@ -320,7 +352,7 @@ libvkd3d_shader_la_SOURCES = \
 	libs/vkd3d-shader/vkd3d_shader_main.c \
 	libs/vkd3d-shader/vkd3d_shader_private.h
 libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@
-libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 10:0:9
+libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 11:0:10
 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm
 if HAVE_LD_VERSION_SCRIPT
 libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map
@@ -336,7 +368,6 @@ EXTRA_DIST = \
 libvkd3d_la_SOURCES = \
 	include/private/vkd3d_blob.h \
 	include/private/vkd3d_common.h \
-	include/private/vkd3d_debug.h \
 	include/private/vkd3d_memory.h \
 	include/private/vkd3d_shader_utils.h \
 	include/private/vkd3d_test.h \
@@ -344,6 +375,7 @@ libvkd3d_la_SOURCES = \
 	include/vkd3d_d3d12.idl \
 	include/vkd3d_d3dcommon.idl \
 	include/vkd3d_unknown.idl \
+	libs/vkd3d/cache.c \
 	libs/vkd3d/command.c \
 	libs/vkd3d/device.c \
 	libs/vkd3d/resource.c \
@@ -355,7 +387,7 @@ libvkd3d_la_SOURCES = \
 	libs/vkd3d/vkd3d_shaders.h \
 	libs/vkd3d/vulkan_procs.h
 libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE
-libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 12:0:11
+libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 13:0:12
 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@
 if HAVE_LD_VERSION_SCRIPT
 libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map
@@ -368,7 +400,7 @@ libvkd3d_utils_la_SOURCES = \
 	libs/vkd3d-utils/vkd3d_utils_main.c \
 	libs/vkd3d-utils/vkd3d_utils_private.h
 libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE
-libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 6:0:5
+libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 6:1:5
 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la libvkd3d.la @PTHREAD_LIBS@
 if HAVE_LD_VERSION_SCRIPT
 libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map
@@ -403,6 +435,7 @@ TEST_EXTENSIONS = .shader_test
 
 if BUILD_TESTS
 check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) tests/shader_runner
+dist_check_SCRIPTS = tests/test-driver.sh
 TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests)
 tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @DL_LIBS@
 tests_d3d12_invalid_usage_LDADD = $(LDADD) @DL_LIBS@
@@ -419,6 +452,7 @@ tests_shader_runner_SOURCES = \
 tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@
 tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la
 SHADER_TEST_LOG_COMPILER = tests/shader_runner
+SHADER_TEST_LOG_DRIVER = $(srcdir)/tests/test-driver.sh
 endif
 
 EXTRA_DIST += $(vkd3d_shader_tests)
@@ -495,7 +529,8 @@ dummy-vkd3d-version:
 ## Cross-compile tests
 cross_implibs = crosslibs/d3d12
 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include -I$(builddir)/tests
-CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 -DVKD3D_CROSSTEST=1
+CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} \
+	-D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=0 -DVKD3D_CROSSTEST=1
 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def)
 EXTRA_DIST += tests/driver.c tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c
 

README

@@ -86,6 +86,9 @@ commas or semicolons.
    platform controls the behavior of todo(), todo_if(), bug_if() and broken()
    conditions in tests.
 
+ * VKD3D_TEST_SKIP_DXC - when set, tests requiring the dxcompiler library will
+   be skipped.
+
  * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests.
 
 If the configuration defines 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', Shader

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([vkd3d],[1.11])
+AC_INIT([vkd3d],[1.12])
 
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])
@@ -55,8 +55,9 @@ gl_LD_VERSION_SCRIPT
 dnl Check compiler specific flags
 AC_SUBST([VKD3D_CFLAGS])
 AS_IF([test "x${GCC}" = "xyes"],
-      [VKD3D_CFLAGS="-Wall -pipe"
+      [VKD3D_CFLAGS="-Wall -pipe -D_WIN32_WINNT=0x0600"
       VKD3D_CHECK_CFLAGS([-std=c99])
+      VKD3D_CHECK_CFLAGS([-flto=auto])
       VKD3D_CHECK_CFLAGS([-fvisibility=hidden])
       VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement])
       VKD3D_CHECK_CFLAGS([-Wempty-body])

demos/demo_xcb.h

@@ -19,7 +19,7 @@
 
 #define VK_NO_PROTOTYPES
 #define VK_USE_PLATFORM_XCB_KHR
-#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_11
+#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_12
 #include "config.h"
 #include <vkd3d.h>
 #include <vkd3d_utils.h>

gitlab/README

@@ -8,7 +8,22 @@ the vkd3d tests on each merge request.
 The CI target image-linux, in the file image.yml, builds a Docker
 image based on Debian bookworm with all the packages required for
 testing, and uploads it to the GitLab container registry. The Docker
-script is in the file image.docker.
+script is in the file image.docker. Most of the dependencies are
+installed directly from the Debian repositories, with a few
+exceptions:
+
+ * widl is compiled from Wine sources, because installing it from the
+   Debian repositories would carry all the rest of Wine and make the
+   Docker image quite larger;
+
+ * SPIRV-Tools are recompiled from sources, because the packages in
+   Debian do not ship shared objects and are not multiarch-compatible;
+   in order to make the packages multiarch-compatible, the utilities
+   are dropped (they're not used by the CI anyway);
+
+ * llvmpipe from Mesa 24.0.1 is compiled (in addition to version
+   22.3.6 available in Debian bookworm), because some Vulkan features
+   required by vkd3d are not available in Mesa 22.3.6.
 
 The file build.yml contains the actual testing targets. Currently
 vkd3d is tested on Linux, on x86-64 and i386, each architecture with

gitlab/build-crosstest

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-echo "Building $(git log -1)"
-echo "---"
-
 COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD))
 
+echo -e "\e[0Ksection_start:`date +%s`:commit_$COMMIT\r\e[0KBuilding commit $COMMIT"
+
 set -Eeuxo pipefail
 
 # Building with -Wno-array-bounds because MinGW headers currently emit
@@ -25,3 +24,5 @@ rsync -Rr config.log tests/*.txt tests/*.exe ../artifacts/$COMMIT || true
 cp tests/driver.cross64.exe ../artifacts
 
 git reset --hard
+
+echo -e "\e[0Ksection_end:`date +%s`:commit_$COMMIT\r\e[0K"

gitlab/build-linux

@@ -1,18 +1,17 @@
 #!/bin/bash
 
-echo "Building $(git log -1)"
-echo "---"
-
 COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD))
 
+echo -e "\e[0Ksection_start:`date +%s`:commit_$COMMIT\r\e[0KBuilding commit $COMMIT"
+
 set -Eeuxo pipefail
 
 ./autogen.sh
 rm -fr build
 mkdir build
 cd build
-export LD_LIBRARY_PATH=/usr/local/lib
-if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \
+export LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH-}"
+if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL -DVKD3D_SHADER_UNSUPPORTED_GLSL" && \
         make -j$(nproc) ; then
     make -j$(nproc) AM_COLOR_TESTS=always check || \
         touch ../tests_failed
@@ -26,3 +25,5 @@ mkdir -p ../artifacts/$COMMIT
 rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true
 
 git reset --hard
+
+echo -e "\e[0Ksection_end:`date +%s`:commit_$COMMIT\r\e[0K"

gitlab/build-mac

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-echo "Building $(git log -1)"
-echo "---"
-
 COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD))
 
+echo -e "\033[0Ksection_start:`date +%s`:commit_$COMMIT\r\033[0KBuilding commit $COMMIT"
+
 set -Eeuxo pipefail
 
 ./autogen.sh
@@ -25,3 +24,5 @@ mkdir -p ../artifacts/$COMMIT
 rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true
 
 git reset --hard
+
+echo -e "\033[0Ksection_end:`date +%s`:commit_$COMMIT\r\033[0K"

gitlab/build-mingw

@@ -1,10 +1,9 @@
 #!/bin/bash
 
-echo "Building $(git log -1)"
-echo "---"
-
 COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD))
 
+echo -e "\e[0Ksection_start:`date +%s`:commit_$COMMIT\r\e[0KBuilding commit $COMMIT"
+
 set -Eeuxo pipefail
 
 ./autogen.sh
@@ -23,3 +22,5 @@ cp config.log ../artifacts/$COMMIT || true
 cp destdir/usr/local/bin/* ../artifacts/$COMMIT || true
 
 git reset --hard
+
+echo -e "\e[0Ksection_end:`date +%s`:commit_$COMMIT\r\e[0K"

gitlab/build.yml

@@ -61,6 +61,17 @@ build-llvmpipe-32:
     CC: 'i686-linux-gnu-gcc'
     VKD3D_SHADER_CONFIG: 'force_validation'
 
+build-llvmpipe-64-mesa24:
+  extends: .build-linux
+  allow_failure:
+    exit_codes:
+      - 2
+  variables:
+    VK_DRIVER_FILES: '/opt/mesa24/share/vulkan/icd.d/lvp_icd.x86_64.json'
+    LD_LIBRARY_PATH: '/opt/mesa24/lib/x86_64-linux-gnu'
+    __EGL_VENDOR_LIBRARY_FILENAMES: '/opt/mesa24/share/glvnd/egl_vendor.d/50_mesa.json'
+    VKD3D_SHADER_CONFIG: 'force_validation'
+
 build-crosstest:
   stage: build
   rules:

gitlab/image.docker

@@ -23,6 +23,8 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     apt-get install -y build-essential pkg-config gcc-mingw-w64 crossbuild-essential-i386 \
                        autoconf automake libtool flex bison curl \
                        git ca-certificates rsync \
+                       llvm-15-dev meson ninja-build python3-mako \
+                       zlib1g-dev libexpat-dev libdrm-dev libglvnd-dev \
                        doxygen doxygen-latex graphviz \
                        mesa-vulkan-drivers mesa-vulkan-drivers:i386 \
                        vulkan-tools spirv-headers \
@@ -36,6 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
                        libxcb-keysyms1-dev libxcb-keysyms1-dev:i386 && \
     apt-get build-dep -y spirv-tools && \
     apt-get build-dep -y -ai386 spirv-tools && \
+
     git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git && \
     cd wine && \
     mkdir build && \
@@ -45,6 +48,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     cp tools/widl/widl /usr/local/bin && \
     cd ../.. && \
     rm -rf wine && \
+
     apt-get source spirv-tools && \
     cd spirv-tools-* && \
     sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \
@@ -55,6 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     rm -f spirv-tools-dbgsym_*.deb && \
     dpkg -i spirv-tools_*.deb && \
     rm -fr * && \
+
     apt-get source spirv-tools && \
     cd spirv-tools-* && \
     sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \
@@ -65,6 +70,16 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
     rm -f spirv-tools-dbgsym_*.deb && \
     dpkg -i spirv-tools_*.deb && \
     rm -fr * && \
+
+    git clone --depth 1 --branch mesa-24.0.3 https://gitlab.freedesktop.org/mesa/mesa.git && \
+    cd mesa && \
+    mkdir build && \
+    cd build && \
+    meson setup --buildtype release -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \
+    meson install && \
+    cd ../.. && \
+    rm -fr mesa && \
+
     apt-get clean && \
     curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2308/linux_dxc_2023_08_14.x86_64.tar.gz | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \
     groupadd host-render -g 800 && \

gitlab/image.yml

@@ -19,6 +19,10 @@ image-linux:
     - sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE"
     - /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL"
 
+# Job `image-mac' must be run each time the pipeline is run on a push,
+# otherwise macOS artifacts are not regenerated and macOS jobs cannot find them.
+# So we add a dependency on image.docker too, even if that file is not really
+# used for macOS.
 image-mac:
   stage: image
   rules:
@@ -26,6 +30,7 @@ image-mac:
       changes:
         - .gitlab-ci.yml
         - gitlab/image.yml
+        - gitlab/image.docker
   interruptible: true
   tags:
     - mac

gitlab/test.yml

@@ -19,8 +19,31 @@ test-win-64:
   extends: .test-win
   variables:
     TEST_ARCH: "64"
+    VKD3D_TEST_SKIP_DXC: "1"
 
 test-win-32:
   extends: .test-win
   variables:
     TEST_ARCH: "32"
+    VKD3D_TEST_SKIP_DXC: "1"
+
+test-win-64-dxc:
+  stage: test
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  interruptible: true
+  allow_failure: true
+  needs:
+    - job: build-crosstest
+  tags:
+    - win10-21h2
+  script:
+    - 'Invoke-WebRequest -Uri "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2308/dxc_2023_08_14.zip" -OutFile ".\dxc.zip"'
+    - 'Expand-Archive -Path "dxc.zip" -DestinationPath ".\dxc"'
+    - '$Env:PATH += ";" + (Convert-Path ".\dxc\bin\x64")'
+    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec './artifacts/driver.cross64.exe $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)'
+    - if (Test-Path "pipeline_failed") { exit 1 }
+  artifacts:
+    when: always
+    paths:
+      - artifacts

include/private/vkd3d_common.h

@@ -30,6 +30,9 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef _WIN32
+#include <pthread.h>
+#endif
 
 #ifdef _MSC_VER
 #include <intrin.h>
@@ -72,6 +75,8 @@
 #define TAG_XNAP VKD3D_MAKE_TAG('X', 'N', 'A', 'P')
 #define TAG_XNAS VKD3D_MAKE_TAG('X', 'N', 'A', 'S')
 
+#define TAG_RD11_REVERSE 0x25441313
+
 static inline uint64_t align(uint64_t addr, size_t alignment)
 {
     return (addr + (alignment - 1)) & ~(alignment - 1);
@@ -105,6 +110,125 @@ VKD3D_NORETURN static inline void vkd3d_unreachable_(const char *filename, unsig
 #define vkd3d_unreachable() vkd3d_unreachable_(__FILE__, __LINE__)
 #endif
 
+#ifdef VKD3D_NO_TRACE_MESSAGES
+#define TRACE(args...) do { } while (0)
+#define TRACE_ON() (false)
+#endif
+
+#ifdef VKD3D_NO_DEBUG_MESSAGES
+#define WARN(args...) do { } while (0)
+#define FIXME(args...) do { } while (0)
+#endif
+
+enum vkd3d_dbg_level
+{
+    VKD3D_DBG_LEVEL_NONE,
+    VKD3D_DBG_LEVEL_ERR,
+    VKD3D_DBG_LEVEL_FIXME,
+    VKD3D_DBG_LEVEL_WARN,
+    VKD3D_DBG_LEVEL_TRACE,
+};
+
+enum vkd3d_dbg_level vkd3d_dbg_get_level(void);
+
+void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4);
+void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback);
+
+const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2);
+const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args);
+const char *debugstr_a(const char *str);
+const char *debugstr_an(const char *str, size_t n);
+const char *debugstr_w(const WCHAR *wstr, size_t wchar_size);
+
+#define VKD3D_DBG_LOG(level) \
+        do { \
+        const enum vkd3d_dbg_level vkd3d_dbg_level = VKD3D_DBG_LEVEL_##level; \
+        VKD3D_DBG_PRINTF
+
+#define VKD3D_DBG_LOG_ONCE(first_time_level, level) \
+        do { \
+        static bool vkd3d_dbg_next_time; \
+        const enum vkd3d_dbg_level vkd3d_dbg_level = vkd3d_dbg_next_time \
+        ? VKD3D_DBG_LEVEL_##level : VKD3D_DBG_LEVEL_##first_time_level; \
+        vkd3d_dbg_next_time = true; \
+        VKD3D_DBG_PRINTF
+
+#define VKD3D_DBG_PRINTF(...) \
+        vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0)
+
+#ifndef TRACE
+#define TRACE VKD3D_DBG_LOG(TRACE)
+#endif
+
+#ifndef WARN
+#define WARN  VKD3D_DBG_LOG(WARN)
+#endif
+
+#ifndef FIXME
+#define FIXME VKD3D_DBG_LOG(FIXME)
+#endif
+
+#define ERR   VKD3D_DBG_LOG(ERR)
+
+#ifndef TRACE_ON
+#define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE)
+#endif
+
+#ifndef WARN_ON
+#define WARN_ON() (vkd3d_dbg_get_level() >= VKD3D_DBG_LEVEL_WARN)
+#endif
+
+#define FIXME_ONCE VKD3D_DBG_LOG_ONCE(FIXME, WARN)
+
+#define VKD3D_DEBUG_ENV_NAME(name) const char *const vkd3d_dbg_env_name = name
+
+static inline const char *debugstr_guid(const GUID *guid)
+{
+    if (!guid)
+        return "(null)";
+
+    return vkd3d_dbg_sprintf("{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+            (unsigned long)guid->Data1, guid->Data2, guid->Data3, guid->Data4[0],
+            guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4],
+            guid->Data4[5], guid->Data4[6], guid->Data4[7]);
+}
+
+static inline const char *debugstr_hresult(HRESULT hr)
+{
+    switch (hr)
+    {
+#define TO_STR(u) case u: return #u;
+        TO_STR(S_OK)
+        TO_STR(S_FALSE)
+        TO_STR(E_NOTIMPL)
+        TO_STR(E_NOINTERFACE)
+        TO_STR(E_POINTER)
+        TO_STR(E_ABORT)
+        TO_STR(E_FAIL)
+        TO_STR(E_OUTOFMEMORY)
+        TO_STR(E_INVALIDARG)
+        TO_STR(DXGI_ERROR_NOT_FOUND)
+        TO_STR(DXGI_ERROR_MORE_DATA)
+        TO_STR(DXGI_ERROR_UNSUPPORTED)
+#undef TO_STR
+        default:
+            return vkd3d_dbg_sprintf("%#x", (int)hr);
+    }
+}
+
+unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value);
+
+struct vkd3d_debug_option
+{
+    const char *name;
+    uint64_t flag;
+};
+
+bool vkd3d_debug_list_has_member(const char *string, const char *member);
+uint64_t vkd3d_parse_debug_options(const char *string,
+        const struct vkd3d_debug_option *options, unsigned int option_count);
+void vkd3d_set_thread_name(const char *name);
+
 static inline unsigned int vkd3d_popcount(unsigned int v)
 {
 #ifdef _MSC_VER
@@ -216,6 +340,13 @@ static inline int vkd3d_u32_compare(uint32_t x, uint32_t y)
     return (x > y) - (x < y);
 }
 
+static inline int vkd3d_u64_compare(uint64_t x, uint64_t y)
+{
+    return (x > y) - (x < y);
+}
+
+#define VKD3D_BITMAP_SIZE(x) (((x) + 0x1f) >> 5)
+
 static inline bool bitmap_clear(uint32_t *map, unsigned int idx)
 {
     return map[idx >> 5] &= ~(1u << (idx & 0x1f));
@@ -305,6 +436,197 @@ static inline uint32_t vkd3d_atomic_increment_u32(uint32_t volatile *x)
     return vkd3d_atomic_add_fetch_u32(x, 1);
 }
 
+static inline bool vkd3d_atomic_compare_exchange_u32(uint32_t volatile *x, uint32_t expected, uint32_t val)
+{
+#if HAVE_SYNC_BOOL_COMPARE_AND_SWAP
+    return __sync_bool_compare_and_swap(x, expected, val);
+#elif defined(_WIN32)
+    return InterlockedCompareExchange((LONG *)x, val, expected) == expected;
+#else
+# error "vkd3d_atomic_compare_exchange_u32() not implemented for this platform"
+#endif
+}
+
+static inline bool vkd3d_atomic_compare_exchange_ptr(void * volatile *x, void *expected, void *val)
+{
+#if HAVE_SYNC_BOOL_COMPARE_AND_SWAP
+    return __sync_bool_compare_and_swap(x, expected, val);
+#elif defined(_WIN32)
+    return InterlockedCompareExchangePointer(x, val, expected) == expected;
+#else
+# error "vkd3d_atomic_compare_exchange_ptr() not implemented for this platform"
+#endif
+}
+
+static inline uint32_t vkd3d_atomic_exchange_u32(uint32_t volatile *x, uint32_t val)
+{
+#if HAVE_ATOMIC_EXCHANGE_N
+    return __atomic_exchange_n(x, val, __ATOMIC_SEQ_CST);
+#elif defined(_WIN32)
+    return InterlockedExchange((LONG *)x, val);
+#else
+    uint32_t expected;
+
+    do
+    {
+        expected = *x;
+    } while (!vkd3d_atomic_compare_exchange_u32(x, expected, val));
+
+    return expected;
+#endif
+}
+
+static inline void *vkd3d_atomic_exchange_ptr(void * volatile *x, void *val)
+{
+#if HAVE_ATOMIC_EXCHANGE_N
+    return __atomic_exchange_n(x, val, __ATOMIC_SEQ_CST);
+#elif defined(_WIN32)
+    return InterlockedExchangePointer(x, val);
+#else
+    void *expected;
+
+    do
+    {
+        expected = *x;
+    } while (!vkd3d_atomic_compare_exchange_ptr(x, expected, val));
+
+    return expected;
+#endif
+}
+
+struct vkd3d_mutex
+{
+#ifdef _WIN32
+    CRITICAL_SECTION lock;
+#else
+    pthread_mutex_t lock;
+#endif
+};
+
+#ifdef _WIN32
+#define VKD3D_MUTEX_INITIALIZER {{NULL, -1, 0, 0, 0, 0}}
+#else
+#define VKD3D_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
+#endif
+
+static inline void vkd3d_mutex_init(struct vkd3d_mutex *lock)
+{
+#ifdef _WIN32
+    InitializeCriticalSection(&lock->lock);
+#else
+    int ret;
+
+    if ((ret = pthread_mutex_init(&lock->lock, NULL)))
+        ERR("Failed to initialise the mutex, ret %d.\n", ret);
+#endif
+}
+
+static inline void vkd3d_mutex_lock(struct vkd3d_mutex *lock)
+{
+#ifdef _WIN32
+    EnterCriticalSection(&lock->lock);
+#else
+    int ret;
+
+    if ((ret = pthread_mutex_lock(&lock->lock)))
+        ERR("Failed to lock the mutex, ret %d.\n", ret);
+#endif
+}
+
+static inline void vkd3d_mutex_unlock(struct vkd3d_mutex *lock)
+{
+#ifdef _WIN32
+    LeaveCriticalSection(&lock->lock);
+#else
+    int ret;
+
+    if ((ret = pthread_mutex_unlock(&lock->lock)))
+        ERR("Failed to unlock the mutex, ret %d.\n", ret);
+#endif
+}
+
+static inline void vkd3d_mutex_destroy(struct vkd3d_mutex *lock)
+{
+#ifdef _WIN32
+    DeleteCriticalSection(&lock->lock);
+#else
+    int ret;
+
+    if ((ret = pthread_mutex_destroy(&lock->lock)))
+        ERR("Failed to destroy the mutex, ret %d.\n", ret);
+#endif
+}
+
+struct vkd3d_cond
+{
+#ifdef _WIN32
+    CONDITION_VARIABLE cond;
+#else
+    pthread_cond_t cond;
+#endif
+};
+
+static inline void vkd3d_cond_init(struct vkd3d_cond *cond)
+{
+#ifdef _WIN32
+    InitializeConditionVariable(&cond->cond);
+#else
+    int ret;
+
+    if ((ret = pthread_cond_init(&cond->cond, NULL)))
+        ERR("Failed to initialise the condition variable, ret %d.\n", ret);
+#endif
+}
+
+static inline void vkd3d_cond_signal(struct vkd3d_cond *cond)
+{
+#ifdef _WIN32
+    WakeConditionVariable(&cond->cond);
+#else
+    int ret;
+
+    if ((ret = pthread_cond_signal(&cond->cond)))
+        ERR("Failed to signal the condition variable, ret %d.\n", ret);
+#endif
+}
+
+static inline void vkd3d_cond_broadcast(struct vkd3d_cond *cond)
+{
+#ifdef _WIN32
+    WakeAllConditionVariable(&cond->cond);
+#else
+    int ret;
+
+    if ((ret = pthread_cond_broadcast(&cond->cond)))
+        ERR("Failed to broadcast the condition variable, ret %d.\n", ret);
+#endif
+}
+
+static inline void vkd3d_cond_wait(struct vkd3d_cond *cond, struct vkd3d_mutex *lock)
+{
+#ifdef _WIN32
+    if (!SleepConditionVariableCS(&cond->cond, &lock->lock, INFINITE))
+        ERR("Failed to wait on the condition variable, error %lu.\n", GetLastError());
+#else
+    int ret;
+
+    if ((ret = pthread_cond_wait(&cond->cond, &lock->lock)))
+        ERR("Failed to wait on the condition variable, ret %d.\n", ret);
+#endif
+}
+
+static inline void vkd3d_cond_destroy(struct vkd3d_cond *cond)
+{
+#ifdef _WIN32
+    /* Nothing to do. */
+#else
+    int ret;
+
+    if ((ret = pthread_cond_destroy(&cond->cond)))
+        ERR("Failed to destroy the condition variable, ret %d.\n", ret);
+#endif
+}
+
 static inline void vkd3d_parse_version(const char *version, int *major, int *minor)
 {
     *major = atoi(version);

include/private/vkd3d_debug.h

@@ -1,147 +0,0 @@
-/*
- * Copyright 2016 Józef Kucia for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __VKD3D_DEBUG_H
-#define __VKD3D_DEBUG_H
-
-#include "vkd3d_common.h"
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdint.h>
-
-#ifdef VKD3D_NO_TRACE_MESSAGES
-#define TRACE(args...) do { } while (0)
-#define TRACE_ON() (false)
-#endif
-
-#ifdef VKD3D_NO_DEBUG_MESSAGES
-#define WARN(args...) do { } while (0)
-#define FIXME(args...) do { } while (0)
-#endif
-
-enum vkd3d_dbg_level
-{
-    VKD3D_DBG_LEVEL_NONE,
-    VKD3D_DBG_LEVEL_ERR,
-    VKD3D_DBG_LEVEL_FIXME,
-    VKD3D_DBG_LEVEL_WARN,
-    VKD3D_DBG_LEVEL_TRACE,
-};
-
-enum vkd3d_dbg_level vkd3d_dbg_get_level(void);
-
-void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4);
-void vkd3d_dbg_set_log_callback(PFN_vkd3d_log callback);
-
-const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2);
-const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args);
-const char *debugstr_a(const char *str);
-const char *debugstr_an(const char *str, size_t n);
-const char *debugstr_w(const WCHAR *wstr, size_t wchar_size);
-
-#define VKD3D_DBG_LOG(level) \
-        do { \
-        const enum vkd3d_dbg_level vkd3d_dbg_level = VKD3D_DBG_LEVEL_##level; \
-        VKD3D_DBG_PRINTF
-
-#define VKD3D_DBG_LOG_ONCE(first_time_level, level) \
-        do { \
-        static bool vkd3d_dbg_next_time; \
-        const enum vkd3d_dbg_level vkd3d_dbg_level = vkd3d_dbg_next_time \
-        ? VKD3D_DBG_LEVEL_##level : VKD3D_DBG_LEVEL_##first_time_level; \
-        vkd3d_dbg_next_time = true; \
-        VKD3D_DBG_PRINTF
-
-#define VKD3D_DBG_PRINTF(...) \
-        vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0)
-
-#ifndef TRACE
-#define TRACE VKD3D_DBG_LOG(TRACE)
-#endif
-
-#ifndef WARN
-#define WARN  VKD3D_DBG_LOG(WARN)
-#endif
-
-#ifndef FIXME
-#define FIXME VKD3D_DBG_LOG(FIXME)
-#endif
-
-#define ERR   VKD3D_DBG_LOG(ERR)
-
-#ifndef TRACE_ON
-#define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE)
-#endif
-
-#ifndef WARN_ON
-#define WARN_ON() (vkd3d_dbg_get_level() >= VKD3D_DBG_LEVEL_WARN)
-#endif
-
-#define FIXME_ONCE VKD3D_DBG_LOG_ONCE(FIXME, WARN)
-
-#define VKD3D_DEBUG_ENV_NAME(name) const char *const vkd3d_dbg_env_name = name
-
-static inline const char *debugstr_guid(const GUID *guid)
-{
-    if (!guid)
-        return "(null)";
-
-    return vkd3d_dbg_sprintf("{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-            (unsigned long)guid->Data1, guid->Data2, guid->Data3, guid->Data4[0],
-            guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4],
-            guid->Data4[5], guid->Data4[6], guid->Data4[7]);
-}
-
-static inline const char *debugstr_hresult(HRESULT hr)
-{
-    switch (hr)
-    {
-#define TO_STR(u) case u: return #u;
-        TO_STR(S_OK)
-        TO_STR(S_FALSE)
-        TO_STR(E_NOTIMPL)
-        TO_STR(E_NOINTERFACE)
-        TO_STR(E_POINTER)
-        TO_STR(E_ABORT)
-        TO_STR(E_FAIL)
-        TO_STR(E_OUTOFMEMORY)
-        TO_STR(E_INVALIDARG)
-        TO_STR(DXGI_ERROR_NOT_FOUND)
-        TO_STR(DXGI_ERROR_MORE_DATA)
-        TO_STR(DXGI_ERROR_UNSUPPORTED)
-#undef TO_STR
-        default:
-            return vkd3d_dbg_sprintf("%#x", (int)hr);
-    }
-}
-
-unsigned int vkd3d_env_var_as_uint(const char *name, unsigned int default_value);
-
-struct vkd3d_debug_option
-{
-    const char *name;
-    uint64_t flag;
-};
-
-bool vkd3d_debug_list_has_member(const char *string, const char *member);
-uint64_t vkd3d_parse_debug_options(const char *string,
-        const struct vkd3d_debug_option *options, unsigned int option_count);
-void vkd3d_set_thread_name(const char *name);
-
-#endif  /* __VKD3D_DEBUG_H */

include/private/vkd3d_memory.h

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "vkd3d_debug.h"
+#include "vkd3d_common.h"
 
 static inline void *vkd3d_malloc(size_t size)
 {
@@ -65,6 +65,15 @@ static inline char *vkd3d_strdup(const char *string)
     return ptr;
 }
 
+static inline void *vkd3d_memdup(const void *mem, size_t size)
+{
+    void *ptr;
+
+    if ((ptr = vkd3d_malloc(size)))
+        memcpy(ptr, mem, size);
+    return ptr;
+}
+
 bool vkd3d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size);
 
 #endif  /* __VKD3D_MEMORY_H */