Release 1.13.

This is a proposed API change in 946, which won't make it into this release.

The intent is to allow slightly larger constants to be specified in the updated
vkd3d_shader_parameter1 structure. In particular, this is large enough to pass
4-dimensional integer or float vectors inline, which the proposed clip plane
implementation will use, as well as other Direct3D FFP parameters.

We could also simply add vkd3d_shader_immediate_constant1 as a separate union
member in vkd3d_shader_parameter1, but this API is a bit cleaner and simpler.

.editorconfig

@@ -0,0 +1,16 @@
+# https://editorconfig.org/
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+tab_width = 8
+trim_trailing_whitespace = true
+max_line_length = 120
+insert_final_newline = true
+
+[Makefile*]
+indent_style = tab
+indent_size = 8

AUTHORS

@@ -3,6 +3,7 @@ Alexandre Julliard
 Alistair Leslie-Hughes
 Andrew Eikum
 Andrey Gusev
+Anna (navi) Figueiredo Gomes
 Atharva Nimbalkar
 Biswapriyo Nath
 Brendan Shanks
@@ -33,8 +34,10 @@ Petrichor Park
 Philip Rebohle
 Rémi Bernon
 Robin Kertels
+Shaun Ren
 Stefan Dösinger
 Sven Hesse
 Victor Chiletto
 Vinson Lee
+Yuxuan Shui
 Zhiyi Zhang

ChangeLog.md

@@ -1,3 +1,89 @@
+# What's new in vkd3d 1.13 (29 August 2024)
+
+### libvkd3d
+
+  - The ID3D12CommandList6 interface is supported.
+
+  - Block-compressed textures can be created with unaligned dimensions. This
+    corresponds to
+    D3D12_FEATURE_D3D12_OPTIONS8.UnalignedBlockTexturesSupported.
+
+  - Some minor issues pointed out by the Vulkan validation layers have been
+    addressed. These are not known to affect applications in practice, but
+    should make libvkd3d slightly more well-behaved.
+
+### libvkd3d-shader
+
+  - New features for the HLSL source type:
+    - Basic loop unrolling support. Some of the more complicated cases like
+      loops containing conditional jumps are still unsupported.
+    - Initialisation values for global variables, function parameters, and
+      annotation variables are parsed and stored in output formats supporting
+      them.
+    - Shader model 5.1 register spaces are supported when using the
+      corresponding target profiles, as well as shader model 5.1 reflection
+      data.
+    - Register reservations support expressions as offsets. For example:
+      ‘float f : register(c0[1 + 1 * 2]);’
+    - The tex1D(), tex2D(), tex3D(), and texCUBE() intrinsic function variants
+      with explicit derivatives are supported.
+    - The following intrinsic functions are supported:
+      - asint()
+      - f16tof32()
+      - faceforward()
+      - GetRenderTargetSampleCount()
+      - rcp()
+      - tex2Dbias()
+      - tex1Dgrad(), tex2Dgrad(), tex3Dgrad(), and texCUBEgrad()
+    - The sin() and cos() intrinsic functions are supported in shader model
+      1-3 profiles. These were already supported in shader model 4+ profiles.
+    - The following features specific to effects target profiles:
+      - Types supported in version 4.0+:
+        - BlendState
+        - ComputeShader, DomainShader, GeometryShader, and HullShader
+        - DepthStencilState
+        - RasterizerState
+      - State application functions implemented for version 4.0+ effects:
+        - OMSetRenderTargets()
+        - SetBlendState()
+        - SetComputeShader(), SetDomainShader(), SetGeometryShader(),
+          SetHullShader(), SetPixelShader(), and SetVertexShader()
+        - SetDepthStencilState()
+        - SetRasterizerState()
+      - String types. These are mainly used for annotations.
+      - Annotations on global variables.
+      - Support for the ‘Texture’ field of the ‘SamplerState’ type.
+      - Support for NULL values.
+    - Stores to swizzled matrix variables.
+    - The ‘unsigned’ type modifier is supported. (For example,
+      ‘unsigned int’.) Note that ‘uint’ and related types were already
+      supported.
+    - ‘ConstantBuffer<>’ types.
+    - The ‘SV_Coverage’ output semantic for fragment shaders.
+
+  - The experimental DXIL source type supports quad group operations.
+
+  - The Direct3D shader model 2-3 ‘texldb’ instruction is correctly disassembled
+    when outputting Direct3D shader assembly.
+
+  - New interfaces:
+    - The vkd3d_shader_parameter_info structure extends the
+      vkd3d_shader_compile_info structure, and can be used to specify shader
+      parameters. This is a more generic version of the shader parameter
+      interface for SPIR-V targets in struct vkd3d_shader_spirv_target_info.
+    - The VKD3D_SHADER_PARAMETER_DATA_TYPE_FLOAT32 enumeration value specifies
+      that a shader parameter contains 32-bit floating-point data.
+    - The VKD3D_SHADER_PARAMETER_NAME_ALPHA_TEST_FUNC shader parameter
+      specifies the alpha test function.
+    - The VKD3D_SHADER_PARAMETER_NAME_ALPHA_TEST_REF shader parameter
+      specifies the alpha test reference value.
+    - The VKD3D_SHADER_PARAMETER_NAME_FLAT_INTERPOLATION shader parameter
+      specifies the interpolation mode for colour inputs in Direct3D shader
+      model 1-3 fragment shaders.
+    - The VKD3D_SHADER_PARAMETER_TYPE_BUFFER enumeration value specifies that
+      the value of a shader parameter is provided at run-time through a buffer
+      resource.
+
 # What's new in vkd3d 1.12 (28 May 2024)
 
 ### libvkd3d

Makefile.am

@@ -48,6 +48,7 @@ vkd3d_cross_tests = \
 vkd3d_shader_tests = \
 	tests/hlsl/abs.shader_test \
 	tests/hlsl/all.shader_test \
+	tests/hlsl/alpha-test.shader_test \
 	tests/hlsl/angle-unit.shader_test \
 	tests/hlsl/annotations.shader_test \
 	tests/hlsl/any.shader_test \
@@ -60,8 +61,10 @@ vkd3d_shader_tests = \
 	tests/hlsl/array-parameters.shader_test \
 	tests/hlsl/array-size-expr.shader_test \
 	tests/hlsl/asfloat.shader_test \
+	tests/hlsl/asint.shader_test \
 	tests/hlsl/asuint.shader_test \
 	tests/hlsl/attributes.shader_test \
+	tests/hlsl/bitwise-assignment.shader_test \
 	tests/hlsl/bitwise.shader_test \
 	tests/hlsl/bool-cast.shader_test \
 	tests/hlsl/bool-semantics.shader_test \
@@ -97,15 +100,20 @@ vkd3d_shader_tests = \
 	tests/hlsl/dot.shader_test \
 	tests/hlsl/duplicate-modifiers.shader_test \
 	tests/hlsl/effect-compile.shader_test \
+	tests/hlsl/effect-pass-states-fx_5.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/effect-variables-fx_4.shader_test \
+	tests/hlsl/effect-variables-fx_5.shader_test \
 	tests/hlsl/entry-point-semantics.shader_test \
 	tests/hlsl/exp.shader_test \
 	tests/hlsl/expr-indexing.shader_test \
+	tests/hlsl/f16tof32.shader_test \
+	tests/hlsl/faceforward.shader_test \
 	tests/hlsl/float-comparison.shader_test \
 	tests/hlsl/floor.shader_test \
 	tests/hlsl/fmod.shader_test \
@@ -162,6 +170,7 @@ vkd3d_shader_tests = \
 	tests/hlsl/nointerpolation.shader_test \
 	tests/hlsl/non-const-indexing.shader_test \
 	tests/hlsl/normalize.shader_test \
+	tests/hlsl/null.shader_test \
 	tests/hlsl/numeric-constructor-truncation.shader_test \
 	tests/hlsl/numeric-types.shader_test \
 	tests/hlsl/numthreads.shader_test \
@@ -172,6 +181,7 @@ vkd3d_shader_tests = \
 	tests/hlsl/pow.shader_test \
 	tests/hlsl/precise-modifier.shader_test \
 	tests/hlsl/rasteriser-ordered-views.shader_test \
+	tests/hlsl/rcp.shader_test \
 	tests/hlsl/reflect.shader_test \
 	tests/hlsl/refract.shader_test \
 	tests/hlsl/register-reservations-numeric.shader_test \
@@ -189,6 +199,7 @@ vkd3d_shader_tests = \
 	tests/hlsl/sampler-offset.shader_test \
 	tests/hlsl/sampler.shader_test \
 	tests/hlsl/saturate.shader_test \
+	tests/hlsl/shade-mode.shader_test \
 	tests/hlsl/shader-interstage-interface.shader_test \
 	tests/hlsl/shape.shader_test \
 	tests/hlsl/side-effects.shader_test \
@@ -236,6 +247,8 @@ vkd3d_shader_tests = \
 	tests/hlsl/unbounded-array-5.1.shader_test \
 	tests/hlsl/uniform-parameters.shader_test \
 	tests/hlsl/uniform-semantics.shader_test \
+	tests/hlsl/unroll.shader_test \
+	tests/hlsl/unsigned.shader_test \
 	tests/hlsl/vector-indexing-uniform.shader_test \
 	tests/hlsl/vector-indexing.shader_test \
 	tests/hlsl/vertex-shader-ops.shader_test \
@@ -352,7 +365,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 11:0:10
+libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 12:0:11
 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
@@ -387,7 +400,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 13:0:12
+libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 14:0:13
 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
@@ -400,7 +413,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:1:5
+libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 6:2: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
@@ -450,7 +463,8 @@ tests_shader_runner_SOURCES = \
 	tests/shader_runner_gl.c \
 	tests/shader_runner_vulkan.c
 tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@
-tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la
+tests_vkd3d_shader_api_CFLAGS = $(AM_CFLAGS) @OPENGL_CFLAGS@
+tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la @OPENGL_LIBS@
 SHADER_TEST_LOG_COMPILER = tests/shader_runner
 SHADER_TEST_LOG_DRIVER = $(srcdir)/tests/test-driver.sh
 endif

README

@@ -78,6 +78,10 @@ commas or semicolons.
  * VKD3D_TEST_DEBUG - enables additional debug messages in tests. Set to 0, 1
    or 2.
 
+ * VKD3D_TEST_DETAILED - enables printing detailed output when running the test
+   suite, reporting specific shader_test lines that trigger XFAIL and SKIP even
+   on tests that overall PASS. Set to 0, or 1.
+
  * VKD3D_TEST_FILTER - a filter string. Only the tests whose names matches the
    filter string will be run, e.g. VKD3D_TEST_FILTER=clear_render_target.
    Useful for debugging or developing new tests.
@@ -111,3 +115,50 @@ to submit their patches using the merge request tool.
 
 Each merge request is automatically tested with the GitLab CI
 system. See gitlab/README in the Git tree for more details.
+
+============================
+Testing with the Agility SDK
+============================
+
+Traditionally Microsoft have released the Direct3D 12 development files,
+including the debug layer runtime, as part of the larger Windows SDK.
+In 2021 the DirectX 12 Agility SDK was introduced, which may be updated
+independently of the Windows SDK. If you plan to run the vkd3d
+crosstests with Microsoft's debug layer you might want to get it from
+the Agility SDK, both because it's probably going to be more up-to-date
+and because the Agility SDK is a couple dozens of megabytes versus the
+gigabytes of the Windows SDK.
+
+In order to build the vkd3d crosstests with Agility SDK support, follow
+these steps:
+
+ * The Agility SDK is distributed at [1]: select your preferred
+   version (likely the most recent one) and note the number in column
+   D3D12SDKVersion, which you're going to need later.
+
+ [1] https://devblogs.microsoft.com/directx/directx12agility/
+
+ * You also need to enable the "Graphics Tools" optional feature in Windows.
+   Open the "Settings" applications, then look for "Apps", "Optional features",
+   "View features" and install "Graphics Tools".
+
+ * Configure vkd3d with something like:
+   'CROSSCC64="x86_64-w64-mingw32-gcc -DVKD3D_AGILITY_SDK_VERSION=<version>"',
+   as well as the equivalent CROSSCC32 variable for the 32-bit
+   crosstests. You'll have to replace '<version>' with the
+   D3D12SDKVersion number you noted above. Then build the crosstests
+   with 'make crosstest' as usual.
+
+ * Download the Agility SDK NuGet package, which is essentially a ZIP
+   file with a .nupkg extension. Extract d3d12core.dll and
+   d3d12sdklayers.dll for your architecture, and put them in the
+   directory containing the crosstest executables.
+
+ * Now you can run the crosstests, possibly with arguments
+   '--validate' and '--gbv' to enable the debug layers. They will use
+   the runtime from the Agility SDK.
+
+ * It's also possible to use '-DVKD3D_AGILITY_SDK_PATH=/path/to/sdk/' to
+   specify the directory to load the Agility SDK DLLs from at runtime.
+   If relative, the path is intended to be relative to the executable
+   path. If unspecified the path defaults to './'.

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([vkd3d],[1.12])
+AC_INIT([vkd3d],[1.13])
 
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])

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_12
+#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_13
 #include "config.h"
 #include <vkd3d.h>
 #include <vkd3d_utils.h>

gitlab/build-linux

@@ -11,7 +11,8 @@ rm -fr build
 mkdir build
 cd build
 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" && \
+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 -DVKD3D_ABORT_ON_ERR" && \
         make -j$(nproc) ; then
     make -j$(nproc) AM_COLOR_TESTS=always check || \
         touch ../tests_failed

gitlab/build-mac

@@ -10,7 +10,9 @@ set -Eeuxo pipefail
 rm -fr build
 mkdir build
 cd build
-if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Werror" && \
+if ../configure CFLAGS="-I/opt/homebrew/opt/vulkan-headers/include -I/opt/homebrew/opt/spirv-headers/include -g -O2 -Wno-implicit-fallthrough -Wno-ignored-attributes -Wno-unknown-attributes -Wno-unused-but-set-variable -Werror" \
+        CPPFLAGS="-DVKD3D_ABORT_ON_ERR" \
+        VULKAN_LIBS=-L/opt/homebrew/opt/vulkan-loader/lib --with-spirv-tools && \
         make -j$(sysctl -n hw.ncpu) ; then
     make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \
         touch ../tests_failed

gitlab/build-mingw

@@ -12,7 +12,9 @@ mkdir build
 cd build
 mkdir vulkan-headers
 cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers
-../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \
+../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST \
+        SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers -DVKD3D_ABORT_ON_ERR" \
+        CFLAGS="-g -O2 -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \
     make -j$(nproc) && \
     make -j$(nproc) install DESTDIR="$PWD/destdir" || \
         touch ../pipeline_failed

gitlab/build.yml

@@ -137,9 +137,11 @@ build-mac:
   stage: build
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  allow_failure:
+  image: winehq-sonoma-pristine
-    exit_codes:
+  variables:
-      - 2
+    TART_EXECUTOR_SSH_USERNAME: "gitlab"
+    TART_EXECUTOR_SSH_PASSWORD: "gitlab"
+  allow_failure: true
   interruptible: true
   needs:
     - job: image-mac
@@ -148,28 +150,26 @@ build-mac:
   tags:
     - mac
   script:
+    - brew install vulkan-tools libtool spirv-headers vulkan-loader
     - git config --global --add safe.directory $CI_PROJECT_DIR
     - git clean -fdx
     - git reset --hard
     - rm -fr .git/rebase-merge
-    # We use a custom ICD which is not marked as a portability driver,
+    - curl -o image.zip https://gitlab.winehq.org/api/v4/projects/giomasce%2Fvkd3d/jobs/artifacts/ci-image/download?job=image-mac
-    # so that test programs are not confused.
+    - unzip image.zip
-    - ./gitlab/patch_moltenvk_icd.sh
-    - export VK_DRIVER_FILES="$PWD/gitlab/MoltenVK_icd.json"
     - mkdir artifacts
+    - export PATH="/opt/homebrew/opt/bison/bin:/opt/homebrew/opt/flex/bin:$PWD/image/bin:$PATH"
+    - export VK_DRIVER_FILES="$PWD/image/moltenvk/MoltenVK_icd.json"
     - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt
     - vulkaninfo > artifacts/vulkaninfo.txt
-    - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
-    - curl -o image.zip https://gitlab.winehq.org/api/v4/projects/wine%2Fvkd3d/jobs/artifacts/master/download?job=image-mac
-    - unzip image.zip
-    - export PATH="$PWD/image/bin:$PATH"
     - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac
     - if [ -f build_failed ] ; then exit 1 ; fi
     - if [ -f tests_failed ] ; then exit 2 ; fi
   variables:
     VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing"
     VKD3D_SHADER_CONFIG: 'force_validation'
-    MVK_CONFIG_LOG_LEVEL: 1
+    MVK_CONFIG_LOG_LEVEL: 2
+    SONAME_LIBVULKAN: "/opt/homebrew/opt/vulkan-loader/lib/libvulkan.1.dylib"
   artifacts:
     when: always
     paths:

gitlab/image.yml

@@ -31,24 +31,38 @@ image-mac:
         - .gitlab-ci.yml
         - gitlab/image.yml
         - gitlab/image.docker
+  image: winehq-sonoma-pristine
+  variables:
+    TART_EXECUTOR_SSH_USERNAME: "gitlab"
+    TART_EXECUTOR_SSH_PASSWORD: "gitlab"
   interruptible: true
   tags:
     - mac
   script:
     - mkdir image
-    - cd image
+    - mkdir image/bin
-    - mkdir bin
+    - mkdir image/moltenvk
     - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
+
+    - git clone --depth 1 --branch v1.2.9 https://github.com/KhronosGroup/MoltenVK.git
+    - cd MoltenVK
+    - ./fetchDependencies --macos
+    - make macos
+    # Do not mark MoltenVK as a portability driver, otherwise it will be harder for vkd3d to find
+    # it. Since editing JSON properly is hard, we just rename the key.
+    - 'sed -i -e "s|is_portability_driver|_is_portability_driver|g" Package/Release/MoltenVK/dylib/macOS/MoltenVK_icd.json'
+    - cd ..
+    - cp MoltenVK/Package/Release/MoltenVK/dylib/macOS/MoltenVK_icd.json image/moltenvk
+    - cp MoltenVK/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib image/moltenvk
+
     - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git
     - cd wine
     - mkdir build
     - cd build
-    - ../configure --enable-win64 --without-x --without-freetype
+    - arch -x86_64 ../configure --enable-win64 --without-x --without-freetype
-    - make tools/widl/widl
+    - arch -x86_64 make tools/widl/widl
     - cd ../..
-    - cp wine/build/tools/widl/widl bin
+    - cp wine/build/tools/widl/widl image/bin
-    - rm -fr wine
-    - cd ..
   artifacts:
     paths:
       - image

gitlab/patch_moltenvk_icd.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-BASE_PATH="/usr/local/opt/molten-vk/share/vulkan/icd.d"
-
-cp "$BASE_PATH/MoltenVK_icd.json" gitlab/MoltenVK_icd.json
-
-# The driver path is relative
-sed -i -e 's|"library_path" *: "|"library_path" : "'"$BASE_PATH/"'|g' gitlab/MoltenVK_icd.json
-
-# We pretend this is not a portability driver, otherwise vkd3d won't
-# find it
-sed -i -e 's|"is_portability_driver" *: *true|"is_portability_driver" : false|g' gitlab/MoltenVK_icd.json

include/private/rbtree.h

@@ -126,34 +126,17 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter)
     return rb_postorder_head(iter->parent->right);
 }
 
-/* iterate through the tree */
-#define RB_FOR_EACH(cursor, tree) \
-    for ((cursor) = rb_head((tree)->root); (cursor); (cursor) = rb_next(cursor))
-
-/* iterate through the tree using a tree entry */
-#define RB_FOR_EACH_ENTRY(elem, tree, type, field) \
-    for ((elem) = RB_ENTRY_VALUE(rb_head((tree)->root), type, field); \
-         (elem) != RB_ENTRY_VALUE(0, type, field); \
-         (elem) = RB_ENTRY_VALUE(rb_next(&elem->field), type, field))
-
-/* iterate through the tree using using postorder, making it safe to free the entry */
-#define RB_FOR_EACH_DESTRUCTOR(cursor, cursor2, tree) \
-    for ((cursor) = rb_postorder_head((tree)->root); \
-         (cursor) && (((cursor2) = rb_postorder_next(cursor)) || 1); \
-         (cursor) = (cursor2))
-
-/* iterate through the tree using a tree entry and postorder, making it safe to free the entry */
-#define RB_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \
-    for ((elem) = RB_ENTRY_VALUE(rb_postorder_head((tree)->root), type, field); \
-         (elem) != WINE_RB_ENTRY_VALUE(0, type, field) \
-             && (((elem2) = RB_ENTRY_VALUE(rb_postorder_next(&(elem)->field), type, field)) || 1); \
-         (elem) = (elem2))
-
-
 static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func *callback, void *context)
 {
-    struct rb_entry *iter, *next;
+    struct rb_entry *entry = rb_postorder_head(tree->root);
-    RB_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context);
+    struct rb_entry *next;
+
+    while (entry)
+    {
+        next = rb_postorder_next(entry);
+        callback(entry, context);
+        entry = next;
+    }
 }
 
 static inline void rb_init(struct rb_tree *tree, rb_compare_func compare)
@@ -164,8 +147,13 @@ static inline void rb_init(struct rb_tree *tree, rb_compare_func compare)
 
 static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func *callback, void *context)
 {
-    struct rb_entry *iter;
+    struct rb_entry *entry = rb_head(tree->root);
-    RB_FOR_EACH(iter, tree) callback(iter, context);
+
+    while (entry)
+    {
+        callback(entry, context);
+        entry = rb_next(entry);
+    }
 }
 
 static inline void rb_clear(struct rb_tree *tree, rb_traverse_func *callback, void *context)

include/private/vkd3d_common.h

@@ -46,12 +46,22 @@
 
 #define STATIC_ASSERT(e) extern void __VKD3D_STATIC_ASSERT__(int [(e) ? 1 : -1])
 
+#define VKD3D_ASSERT(cond) \
+        do { \
+            if (!(cond)) \
+                ERR("Failed assertion: %s\n", #cond); \
+        } while (0)
+
 #define MEMBER_SIZE(t, m) sizeof(((t *)0)->m)
 
 #define VKD3D_MAKE_TAG(ch0, ch1, ch2, ch3) \
         ((uint32_t)(ch0) | ((uint32_t)(ch1) << 8) \
         | ((uint32_t)(ch2) << 16) | ((uint32_t)(ch3) << 24))
 
+#define VKD3D_EXPAND(x) x
+#define VKD3D_STRINGIFY(x) #x
+#define VKD3D_EXPAND_AND_STRINGIFY(x) VKD3D_EXPAND(VKD3D_STRINGIFY(x))
+
 #define TAG_AON9 VKD3D_MAKE_TAG('A', 'o', 'n', '9')
 #define TAG_DXBC VKD3D_MAKE_TAG('D', 'X', 'B', 'C')
 #define TAG_DXIL VKD3D_MAKE_TAG('D', 'X', 'I', 'L')
@@ -98,17 +108,11 @@ static inline uint64_t align(uint64_t addr, size_t alignment)
 # define VKD3D_UNREACHABLE (void)0
 #endif  /* __GNUC__ */
 
-VKD3D_NORETURN static inline void vkd3d_unreachable_(const char *filename, unsigned int line)
+#define vkd3d_unreachable() \
-{
+        do { \
-    fprintf(stderr, "%s:%u: Aborting, reached unreachable code.\n", filename, line);
+            ERR("%s:%u: Unreachable code reached.\n", __FILE__, __LINE__); \
-    abort();
+            VKD3D_UNREACHABLE; \
-}
+        } while (0)
-
-#ifdef NDEBUG
-#define vkd3d_unreachable() VKD3D_UNREACHABLE
-#else
-#define vkd3d_unreachable() vkd3d_unreachable_(__FILE__, __LINE__)
-#endif
 
 #ifdef VKD3D_NO_TRACE_MESSAGES
 #define TRACE(args...) do { } while (0)
@@ -118,11 +122,19 @@ VKD3D_NORETURN static inline void vkd3d_unreachable_(const char *filename, unsig
 #ifdef VKD3D_NO_DEBUG_MESSAGES
 #define WARN(args...) do { } while (0)
 #define FIXME(args...) do { } while (0)
+#define WARN_ON() (false)
+#define FIXME_ONCE(args...) do { } while (0)
+#endif
+
+#ifdef VKD3D_NO_ERROR_MESSAGES
+#define ERR(args...) do { } while (0)
+#define MESSAGE(args...) do { } while (0)
 #endif
 
 enum vkd3d_dbg_level
 {
     VKD3D_DBG_LEVEL_NONE,
+    VKD3D_DBG_LEVEL_MESSAGE,
     VKD3D_DBG_LEVEL_ERR,
     VKD3D_DBG_LEVEL_FIXME,
     VKD3D_DBG_LEVEL_WARN,
@@ -143,7 +155,7 @@ 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
+        VKD3D_DBG_PRINTF_##level
 
 #define VKD3D_DBG_LOG_ONCE(first_time_level, level) \
         do { \
@@ -151,24 +163,50 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size);
         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
+        VKD3D_DBG_PRINTF_##level
 
 #define VKD3D_DBG_PRINTF(...) \
         vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); } while (0)
 
+#define VKD3D_DBG_PRINTF_TRACE(...) VKD3D_DBG_PRINTF(__VA_ARGS__)
+#define VKD3D_DBG_PRINTF_WARN(...) VKD3D_DBG_PRINTF(__VA_ARGS__)
+#define VKD3D_DBG_PRINTF_FIXME(...) VKD3D_DBG_PRINTF(__VA_ARGS__)
+#define VKD3D_DBG_PRINTF_MESSAGE(...) VKD3D_DBG_PRINTF(__VA_ARGS__)
+
+#ifdef VKD3D_ABORT_ON_ERR
+#define VKD3D_DBG_PRINTF_ERR(...) \
+        vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, __VA_ARGS__); \
+        abort(); \
+        } while (0)
+#else
+#define VKD3D_DBG_PRINTF_ERR(...) VKD3D_DBG_PRINTF(__VA_ARGS__)
+#endif
+
+/* Used by vkd3d_unreachable(). */
+#ifdef VKD3D_CROSSTEST
+#undef ERR
+#define ERR(...) do { fprintf(stderr, __VA_ARGS__); abort(); } while (0)
+#endif
+
 #ifndef TRACE
-#define TRACE VKD3D_DBG_LOG(TRACE)
+#define TRACE   VKD3D_DBG_LOG(TRACE)
 #endif
 
 #ifndef WARN
-#define WARN  VKD3D_DBG_LOG(WARN)
+#define WARN    VKD3D_DBG_LOG(WARN)
 #endif
 
 #ifndef FIXME
-#define FIXME VKD3D_DBG_LOG(FIXME)
+#define FIXME   VKD3D_DBG_LOG(FIXME)
 #endif
 
-#define ERR   VKD3D_DBG_LOG(ERR)
+#ifndef ERR
+#define ERR     VKD3D_DBG_LOG(ERR)
+#endif
+
+#ifndef MESSAGE
+#define MESSAGE VKD3D_DBG_LOG(MESSAGE)
+#endif
 
 #ifndef TRACE_ON
 #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE)
@@ -178,7 +216,9 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size);
 #define WARN_ON() (vkd3d_dbg_get_level() >= VKD3D_DBG_LEVEL_WARN)
 #endif
 
+#ifndef FIXME_ONCE
 #define FIXME_ONCE VKD3D_DBG_LOG_ONCE(FIXME, WARN)
+#endif
 
 #define VKD3D_DEBUG_ENV_NAME(name) const char *const vkd3d_dbg_env_name = name
 

include/private/vkd3d_memory.h

@@ -19,7 +19,6 @@
 #ifndef __VKD3D_MEMORY_H
 #define __VKD3D_MEMORY_H
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -44,7 +43,7 @@ static inline void *vkd3d_realloc(void *ptr, size_t size)
 static inline void *vkd3d_calloc(size_t count, size_t size)
 {
     void *ptr;
-    assert(count <= ~(size_t)0 / size);
+    VKD3D_ASSERT(!size || count <= ~(size_t)0 / size);
     if (!(ptr = calloc(count, size)))
         ERR("Out of memory.\n");
     return ptr;

include/private/vkd3d_test.h

@@ -412,7 +412,7 @@ static inline void vkd3d_test_push_context(const char *fmt, ...)
     {
         va_start(args, fmt);
         vsnprintf(vkd3d_test_state.context[vkd3d_test_state.context_count],
-                sizeof(vkd3d_test_state.context), fmt, args);
+                sizeof(*vkd3d_test_state.context), fmt, args);
         va_end(args);
         vkd3d_test_state.context[vkd3d_test_state.context_count][sizeof(vkd3d_test_state.context[0]) - 1] = '\0';
     }

include/vkd3d.h

@@ -97,6 +97,7 @@ enum vkd3d_api_version
     VKD3D_API_VERSION_1_10,
     VKD3D_API_VERSION_1_11,
     VKD3D_API_VERSION_1_12,
+    VKD3D_API_VERSION_1_13,
 
     VKD3D_FORCE_32_BIT_ENUM(VKD3D_API_VERSION),
 };

include/vkd3d_d3d12.idl

@@ -3260,7 +3260,7 @@ interface ID3D12Device : ID3D12Object
             D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type);
 
     D3D12_RESOURCE_ALLOCATION_INFO GetResourceAllocationInfo(UINT visible_mask,
-            UINT reource_desc_count, const D3D12_RESOURCE_DESC *resource_descs);
+            UINT resource_desc_count, const D3D12_RESOURCE_DESC *resource_descs);
 
     D3D12_HEAP_PROPERTIES GetCustomHeapProperties(UINT node_mask,
             D3D12_HEAP_TYPE heap_type);