Release 1.6.

build: Add the demo shaders to the distribution.
build: Remove $(vkd3d_demos_shaders) from the distribution.
2025-04-13 05:43:18 -07:00 · 2022-12-07 16:08:16 +01:00 · 2022-12-07 16:08:16 +01:00 · 2022-12-07 16:08:11 +01:00 · 2022-11-21 18:28:54 +01:00 · 2022-11-21 18:28:42 +01:00
136 changed files with 16491 additions and 5264 deletions
--- a/152
+++ b/152
@@ -1,156 +1,60 @@
-The Wine team is proud to announce that release 1.3 of vkd3d, the Direct3D to
+The Wine team is proud to announce that release 1.6 of vkd3d, the Direct3D to
 Vulkan translation library, is now available.

 This release contains improvements that are listed in the release notes below.
 The main highlights are:

-  - Initial HLSL compilation support.
-  - Shader model 5.1 descriptor array support.
-  - Support for disassembling Direct3D shaders.
+  - Initial support for HLSL compute shaders.
+  - More support for HLSL features and intrinsics.
+  - Miscellaneous bug fixes.

 The source is available from the following location:

-  https://dl.winehq.org/vkd3d/source/vkd3d-1.3.tar.xz
+  https://dl.winehq.org/vkd3d/source/vkd3d-1.6.tar.xz

 The current source can also be pulled directly from the git repository:

-  https://source.winehq.org/git/vkd3d.git/
+  https://gitlab.winehq.org/wine/vkd3d.git

 Vkd3d is available thanks to the work of multiple people. See the file AUTHORS
 for the complete list.

 ----------------------------------------------------------------

-What's new in vkd3d 1.3
+What's new in vkd3d 1.6
 =======================


-*** libvkd3d
-
- Newly implemented Direct3D 12 features:
-  - Root signature support for unbounded descriptor tables.
-  - Unordered-access view counters in pixel shaders. These were previously
-    only supported in compute shaders.
-  - Output merger logical operations.
-  - Retrieving CPU/GPU timestamp calibration values. This requires support for
-    the VK_EXT_calibrated_timestamps extension.
-  - The `mirror_once' texture addressing mode. This requires support for the
-    VK_KHR_sampler_mirror_clamp_to_edge extension.
-
- New interfaces:
-  - The vkd3d_host_time_domain_info structure extends the
-    vkd3d_instance_create_info structure, and can be used to specify how to
-    convert between timestamps and tick counts. If left unspecified, a tick
-    is assumed to take 100 nanoseconds.
-
- Various bug fixes.
-
-
 *** libvkd3d-shader

- New features:
-  - Initial support for HLSL compilation and preprocessing. This is an ongoing
-    effort; although support for many features is already implemented, support
-    for many more isn't yet.
-  - Support for disassembling Direct3D byte-code shaders to Direct3D assembly.
-  - Support for parsing the legacy Direct3D byte-code format used by Direct3D
-    shader model 1, 2, and 3 shaders. In the current vkd3d-shader release,
-    only Direct3D assembly is supported as a target for these; we intend to
-    support SPIR-V as a target in a future release.
+- New features for the HLSL source type:
+  - Initial support for compute shaders.
+  - Improved support for initialisation and assignment of compound objects
+    like structures and arrays, including casts and implicit conversions.
+  - Support for loads and stores of texture resource unordered-access views.
+  - Support for function attributes. In particular, the required "numthreads"
+    attribute for compute shader entry points is now supported.
+  - Support for the asuint() intrinsic function.
+  - Support for the length() intrinsic function.
+  - Support for the normalize() intrinsic function.
+  - Support for integer division and modulus.
+  - Support for taking the absolute value of integers.
+  - Support for floating-point modulus.

- New features for the SPIR-V target:
-  - Support for various aspects of Direct3D shader model 5.1 descriptor
-    arrays, including unbounded descriptor arrays, UAV counter arrays, dynamic
-    indexing of descriptor arrays, and non-uniform indexing of descriptor
-    arrays. With the exception of some special cases, this requires support
-    for the SPV_EXT_descriptor_indexing extension in the target environment.
-  - Support for double precision floating-point operations.
-  - Support for indirect addressing of tessellation control shader inputs.
-  - Stencil export. I.e., writing stencil values from shaders. This requires
-    support for the SPV_EXT_shader_stencil_export extension in the target
-    environment.
-  - Support for the Direct3D shader model 4+ `precise' modifier.
-  - Support for Direct3D shader model 4+ global resource memory barriers.
-
-New interfaces:
-  - vkd3d_shader_preprocess() provides support for preprocessing shaders.
-  - The vkd3d_shader_preprocess_info structure extends the
-    vkd3d_shader_compile_info structure, and can be used to specify
-    preprocessing parameters like preprocessor macro definitions.
-  - The vkd3d_shader_hlsl_source_info structure extends the
-    vkd3d_shader_compile_info structure, and can be used to specify HLSL
-    compilation parameters like the target profile and entry point.
-  - The vkd3d_shader_descriptor_offset_info structure extends the
-    vkd3d_shader_interface_info structure, and can be used to specify offsets
-    into descriptor arrays referenced by shader interface bindings. This
-    allows mapping multiple descriptor arrays in a shader to a single binding
-    point in the target environment, and helps with mapping between the
-    Direct3D 12 and Vulkan binding models.
-  - The VKD3D_SHADER_COMPILE_OPTION_API_VERSION compile option can
-    be used to specify the version of the libvkd3d-shader API the
-    application is targetting. If left unspecified,
-    VKD3D_SHADER_API_VERSION_1_2 will be used.
-
- Various shader translation fixes, for tessellation shaders in particular.
-
-
-*** vkd3d-compiler
-
- New source and target types:
-  - The `hlsl' source type specifies High Level Shader Language source code.
-  - The `d3d-asm' target type specifies Direct3D assembly shaders.
-  - The `d3dbc' format specifies legacy Direct3D byte-code, which is used for
-    Direct3D shader model 1, 2, and 3 shaders.
-  - The existing `dxbc-tpf' format can now also be used as a target format.
-
- New command line options:
-  - `-E' can be used to specify the input should only be preprocessed.
-  - `-e'/`--entry' can be used to specify the entry point for HLSL and/or
-    SPIR-V shaders.
-  - `-p'/`--profile' can be used to specify the target profile for HLSL
-    shaders.
-
- When no source type is explicitly specified, vkd3d-compiler will attempt to
-  determine the source type from the provided input. Note that this is
-  intended as a convenience for interactive usage only, and the heuristics
-  used are subject to future change. Non-interactive usage of vkd3d-compiler,
-  for example in build scripts, should always explicitly specify source and
-  target types.
-
- When no target type is explicitly specified, a default will be chosen based
-  on the source type. Like the earlier mentioned source type detection, this
-  is intended for interactive usage only.
-
- vkd3d-compiler will default to colour output if it can determine that the
-  output is a colour-capable teleprinter.
-
- New environment variables:
-  - NO_COLOUR/NO_COLOR can be used to disable default colour output.
-  See the README for more detailed descriptions and how to use these.
-
-
-*** libvkd3d-utils

 - New interfaces:
-  - D3DCreateBlob() provides support for creating ID3DBlob objects.
-  - D3DPreprocess() provides support for preprocessing HLSL source code.
-  - D3DCompile() and D3DCompile2() provide support for compiling HLSL source
-    code.
+  - The VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS descriptor info flag is
+    used to indicate that atomic operations are used on unordered-access view
+    descriptors.


-*** build
+*** libvkd3d-common

- The `gears' and `triangle' demo applications are installed as `vkd3d-gears'
-  and `vkd3d-triangle'. These were originally intended more as documentation
-  than as end-user executables, but there's some value in using them for
-  diagnostic purposes, much like e.g. `glxgears'.
+- vkd3d debug output is prefixed with "vkd3d:" in order to make it easier to
+  distinguish from output produced by applications or other libraries.

- The VULKAN_LIBS configure variable is used when detecting the Vulkan
-  library.

- Builds for the Microsoft Windows target platform no longer require support
-  for POSIX threads. Windows synchronisation primitives are used instead.
+*** demos

- If ncurses is available, it will be use by vkd3d-compiler to determine the
-  capabilities of the connected teleprinter, if any.
+- The demos now use libvkd3d-shader to compile HLSL shaders at run-time.

--- a/4
+++ b/4
@@ -3,10 +3,13 @@ Andrew Eikum
 Andrey Gusev
 Atharva Nimbalkar
 Biswapriyo Nath
+Brendan Shanks
 Chip Davis
 Conor McCarthy
+David Gow
 Derek Lesho
 Francisco Casas
+Francois Gouget
 Giovanni Mascellani
 Hans-Kristian Arntzen
 Henri Verbeet
@@ -14,6 +17,7 @@ Isabella Bosia
 Jactry Zeng
 Joshua Ashton
 Józef Kucia
+Martin Storsjö
 Matteo Bruni
 Nikolay Sivov
 Philip Rebohle
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,15 +31,6 @@ vkd3d_public_headers = \
 	include/vkd3d_utils.h \
 	include/vkd3d_windows.h

-vkd3d_demos_shaders = \
-	demos/gears.hlsl \
-	demos/gears_ps_flat.h \
-	demos/gears_ps_smooth.h \
-	demos/gears_vs.h \
-	demos/triangle.hlsl \
-	demos/triangle_ps.h \
-	demos/triangle_vs.h
-
 vkd3d_tests = \
 	tests/vkd3d_api \
 	tests/vkd3d_common \
@@ -52,17 +43,30 @@ vkd3d_cross_tests = \

 vkd3d_shader_tests = \
 	tests/abs.shader_test \
+	tests/arithmetic-float.shader_test \
+	tests/arithmetic-float-uniform.shader_test \
+	tests/arithmetic-int.shader_test \
+	tests/arithmetic-int-uniform.shader_test \
+	tests/arithmetic-uint.shader_test \
+	tests/bitwise.shader_test \
+	tests/cast-broadcast.shader_test \
+	tests/cast-componentwise-equal.shader_test \
+	tests/cast-componentwise-compatible.shader_test \
 	tests/cast-to-float.shader_test \
 	tests/cast-to-half.shader_test \
 	tests/cast-to-int.shader_test \
 	tests/cast-to-uint.shader_test \
+	tests/cbuffer.shader_test \
+	tests/compute.shader_test \
 	tests/conditional.shader_test \
 	tests/floor.shader_test \
 	tests/hlsl-array-dimension.shader_test \
+	tests/hlsl-attributes.shader_test \
 	tests/hlsl-bool-cast.shader_test \
 	tests/hlsl-clamp.shader_test \
 	tests/hlsl-comma.shader_test \
 	tests/hlsl-cross.shader_test \
+	tests/hlsl-dot.shader_test \
 	tests/hlsl-duplicate-modifiers.shader_test \
 	tests/hlsl-for.shader_test \
 	tests/hlsl-function.shader_test \
@@ -72,20 +76,28 @@ vkd3d_shader_tests = \
 	tests/hlsl-gather.shader_test \
 	tests/hlsl-initializer-flatten.shader_test \
 	tests/hlsl-initializer-invalid-arg-count.shader_test \
+	tests/hlsl-initializer-implicit-array.shader_test \
 	tests/hlsl-initializer-local-array.shader_test \
+	tests/hlsl-initializer-objects.shader_test \
 	tests/hlsl-initializer-nested.shader_test \
 	tests/hlsl-initializer-numeric.shader_test \
+	tests/hlsl-initializer-matrix.shader_test \
 	tests/hlsl-initializer-static-array.shader_test \
 	tests/hlsl-initializer-struct.shader_test \
 	tests/hlsl-intrinsic-override.shader_test \
 	tests/hlsl-invalid.shader_test \
+	tests/hlsl-ldexp.shader_test \
+	tests/hlsl-length.shader_test \
+	tests/hlsl-lerp.shader_test \
 	tests/hlsl-majority-pragma.shader_test \
 	tests/hlsl-majority-typedef.shader_test \
+	tests/hlsl-matrix-indexing.shader_test \
 	tests/hlsl-mul.shader_test \
 	tests/hlsl-nested-arrays.shader_test \
+	tests/hlsl-normalize.shader_test \
 	tests/hlsl-numeric-constructor-truncation.shader_test \
 	tests/hlsl-numeric-types.shader_test \
-	tests/hlsl-operations.shader_test \
+	tests/hlsl-numthreads.shader_test \
 	tests/hlsl-return-implicit-conversion.shader_test \
 	tests/hlsl-return-void.shader_test \
 	tests/hlsl-shape.shader_test \
@@ -93,11 +105,18 @@ vkd3d_shader_tests = \
 	tests/hlsl-state-block-syntax.shader_test \
 	tests/hlsl-static-initializer.shader_test \
 	tests/hlsl-storage-qualifiers.shader_test \
+	tests/hlsl-struct-array.shader_test \
 	tests/hlsl-struct-assignment.shader_test \
 	tests/hlsl-struct-semantics.shader_test \
 	tests/hlsl-vector-indexing.shader_test \
 	tests/hlsl-vector-indexing-uniform.shader_test \
+	tests/logic-operations.shader_test \
 	tests/math.shader_test \
+	tests/matrix-semantics.shader_test \
+	tests/max.shader_test \
+	tests/multiple-rt.shader_test \
+	tests/nointerpolation.shader_test \
+	tests/object-references.shader_test \
 	tests/pow.shader_test \
 	tests/preproc-if.shader_test \
 	tests/preproc-ifdef.shader_test \
@@ -109,6 +128,7 @@ vkd3d_shader_tests = \
 	tests/sampler.shader_test \
 	tests/sampler-offset.shader_test \
 	tests/saturate.shader_test \
+	tests/shader-interstage-interface.shader_test \
 	tests/swizzle-0.shader_test \
 	tests/swizzle-1.shader_test \
 	tests/swizzle-2.shader_test \
@@ -120,6 +140,8 @@ vkd3d_shader_tests = \
 	tests/texture-load.shader_test \
 	tests/texture-load-typed.shader_test \
 	tests/trigonometry.shader_test \
+	tests/uav.shader_test \
+	tests/uav-load.shader_test \
 	tests/writemask-assignop-0.shader_test \
 	tests/writemask-assignop-1.shader_test \
 	tests/writemask-assignop-2.shader_test \
@@ -129,7 +151,8 @@ vkd3d_test_headers = \
 	tests/d3d12_crosstest.h \
 	tests/d3d12_test_utils.h \
 	tests/shader_runner.h \
-	tests/utils.h
+	tests/utils.h \
+	tests/vulkan_procs.h

 vkd3d_demos = \
 	demos/vkd3d-gears \
@@ -151,6 +174,7 @@ libvkd3d_common_la_SOURCES = \
 	libs/vkd3d-common/error.c \
 	libs/vkd3d-common/memory.c \
 	libs/vkd3d-common/utf8.c
+libvkd3d_common_la_LIBADD = @PTHREAD_LIBS@

 lib_LTLIBRARIES = libvkd3d-shader.la libvkd3d.la libvkd3d-utils.la

@@ -221,7 +245,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 2:0:1
+libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:4
 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
@@ -255,7 +279,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 4:0:3
+libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 7:0:6
 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
@@ -267,7 +291,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 3:0:2
+libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:2:3
 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
@@ -290,7 +314,7 @@ vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c
 vkd3d_compiler_CFLAGS = $(AM_CFLAGS) @NCURSES_CFLAGS@
 vkd3d_compiler_LDADD = libvkd3d-shader.la @NCURSES_LIBS@

-LDADD = libvkd3d.la libvkd3d-utils.la
+LDADD = libvkd3d.la libvkd3d-shader.la libvkd3d-utils.la
 AM_DEFAULT_SOURCE_EXT = .c

 TEST_EXTENSIONS = .shader_test
@@ -298,67 +322,31 @@ TEST_EXTENSIONS = .shader_test
 if BUILD_TESTS
 check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) tests/shader_runner
 TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests)
-tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@
-tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@
-tests_hlsl_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@
-tests_shader_runner_LDADD = $(LDADD) @VULKAN_LIBS@
+tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @DL_LIBS@
+tests_d3d12_invalid_usage_LDADD = $(LDADD) @DL_LIBS@
+tests_hlsl_d3d12_LDADD = $(LDADD) @DL_LIBS@
+tests_shader_runner_LDADD = $(LDADD) @DL_LIBS@
 tests_shader_runner_SOURCES = \
 	tests/shader_runner.c \
-	tests/shader_runner_d3d12.c
-tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@
+	tests/shader_runner_d3d12.c \
+	tests/shader_runner_vulkan.c
+tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@
 tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la
 SHADER_TEST_LOG_COMPILER = tests/shader_runner
-XFAIL_TESTS = \
-	tests/cast-to-float.shader_test \
-	tests/cast-to-half.shader_test \
-	tests/cast-to-int.shader_test \
-	tests/cast-to-uint.shader_test \
-	tests/hlsl-array-dimension.shader_test \
-	tests/hlsl-initializer-flatten.shader_test \
-	tests/hlsl-initializer-invalid-arg-count.shader_test \
-	tests/hlsl-initializer-local-array.shader_test \
-	tests/hlsl-initializer-nested.shader_test \
-	tests/hlsl-initializer-numeric.shader_test \
-	tests/hlsl-initializer-static-array.shader_test \
-	tests/hlsl-initializer-struct.shader_test \
-	tests/hlsl-duplicate-modifiers.shader_test \
-	tests/hlsl-for.shader_test \
-	tests/hlsl-function.shader_test \
-	tests/hlsl-function-cast.shader_test \
-	tests/hlsl-function-overload.shader_test \
-	tests/hlsl-gather.shader_test \
-	tests/hlsl-intrinsic-override.shader_test \
-	tests/hlsl-majority-pragma.shader_test \
-	tests/hlsl-majority-typedef.shader_test \
-	tests/hlsl-mul.shader_test \
-	tests/hlsl-nested-arrays.shader_test \
-	tests/hlsl-numeric-constructor-truncation.shader_test \
-	tests/hlsl-numeric-types.shader_test \
-	tests/hlsl-operations.shader_test \
-	tests/hlsl-return-implicit-conversion.shader_test \
-	tests/hlsl-return-void.shader_test \
-	tests/hlsl-shape.shader_test \
-	tests/hlsl-static-initializer.shader_test \
-	tests/hlsl-storage-qualifiers.shader_test \
-	tests/hlsl-vector-indexing.shader_test \
-	tests/hlsl-vector-indexing-uniform.shader_test \
-	tests/max.shader_test \
-	tests/sampler-offset.shader_test \
-	tests/trigonometry.shader_test
 endif

 EXTRA_DIST += $(vkd3d_shader_tests)

 if BUILD_DEMOS
-DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DEMO_LIBS@ @VULKAN_LIBS@
+DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DL_LIBS@ @DEMO_LIBS@
 DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@
 bin_PROGRAMS += $(vkd3d_demos)

-demos_vkd3d_gears_SOURCES = demos/gears.c
+demos_vkd3d_gears_SOURCES = demos/gears.c demos/gears_hlsl.h
 demos_vkd3d_gears_CFLAGS = $(DEMOS_CFLAGS)
 demos_vkd3d_gears_LDADD = $(DEMOS_LDADD) -lm

-demos_vkd3d_triangle_SOURCES = demos/triangle.c
+demos_vkd3d_triangle_SOURCES = demos/triangle.c demos/triangle_hlsl.h
 demos_vkd3d_triangle_CFLAGS = $(DEMOS_CFLAGS)
 demos_vkd3d_triangle_LDADD = $(DEMOS_LDADD)
 endif
@@ -381,8 +369,6 @@ else
 	@echo "widl is required to generate $@"
 endif

-EXTRA_DIST += $(vkd3d_demos_shaders)
-
 libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in Makefile
 	$(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \
 		-e 's![@]exec_prefix[@]!$(exec_prefix)!g' \
@@ -425,9 +411,11 @@ cross_implibs = crosslibs/d3d12
 CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include
 CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0
 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def)
+EXTRA_DIST += tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c

 shader_runner_cross_sources = \
 	$(srcdir)/tests/shader_runner.c \
+	$(srcdir)/tests/shader_runner_d3d9.c \
 	$(srcdir)/tests/shader_runner_d3d11.c \
 	$(srcdir)/tests/shader_runner_d3d12.c

@@ -435,11 +423,20 @@ if HAVE_CROSSTARGET32
 CROSS32_CC = @CROSSCC32@
 CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool
 CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a)
-CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) \
-	$(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe)
-CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe
+CROSS32_EXEFILES =
+if BUILD_TESTS
+CROSS32_EXEFILES += $(vkd3d_cross_tests:=.cross32.exe)
+endif
+if BUILD_DEMOS
+CROSS32_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe)
+endif

-CLEANFILES += $(CROSS32_FILES)
+CROSS32_FILES = $(CROSS32_EXEFILES)
+if BUILD_TESTS
+CROSS32_FILES += tests/shader_runner.cross32.exe
+endif
+
+CLEANFILES += $(CROSS32_IMPLIBS) $(CROSS32_FILES)
 crosstest32: $(CROSS32_FILES)

 -include tests/$(DEPDIR)/*.cross32.Po
@@ -467,11 +464,20 @@ if HAVE_CROSSTARGET64
 CROSS64_CC = @CROSSCC64@
 CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool
 CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a)
-CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) \
-	$(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe)
-CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe
+CROSS64_EXEFILES =
+if BUILD_TESTS
+CROSS64_EXEFILES += $(vkd3d_cross_tests:=.cross64.exe)
+endif
+if BUILD_DEMOS
+CROSS64_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe)
+endif

-CLEANFILES += $(CROSS64_FILES)
+CROSS64_FILES = $(CROSS64_EXEFILES)
+if BUILD_TESTS
+CROSS64_FILES += tests/shader_runner.cross64.exe
+endif
+
+CLEANFILES += $(CROSS64_IMPLIBS) $(CROSS64_FILES)
 crosstest64: $(CROSS64_FILES)

 -include tests/$(DEPDIR)/*.cross64.Po
--- a/5
+++ b/5
@@ -9,7 +9,7 @@ similar, but not identical, to Direct3D 12.
 Building vkd3d
 ==============

-Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.1.113).
+Vkd3d depends on SPIRV-Headers and Vulkan-Headers (>= 1.2.139).

 Vkd3d generates some of its headers from IDL files. If you are using the
 release tarballs, then these headers are pre-generated and are included. If
@@ -51,6 +51,9 @@ commas or semicolons.
   even when the output supports colour.

 * VKD3D_CONFIG - a list of options that change the behavior of libvkd3d.
+    * virtual_heaps - Create descriptors for each D3D12 root signature
+      descriptor range instead of entire descriptor heaps. Useful when push
+      constant or bound descriptor limits are exceeded.
    * vk_debug - enables Vulkan debug extensions.

 * VKD3D_DEBUG - controls the debug level for log messages produced by
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([vkd3d],[1.3])
+AC_INIT([vkd3d],[1.6])

 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])
@@ -81,7 +81,7 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \
       -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"],
      [AC_MSG_ERROR([GLSL.std.450.h not found.])])

-VKD3D_CHECK_VULKAN_HEADER_VERSION([113], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.113 is required.])])
+VKD3D_CHECK_VULKAN_HEADER_VERSION([139], [AC_MSG_ERROR([Vulkan headers are too old, 1.2.139 is required.])])

 AC_CHECK_DECL([SpvCapabilityDemoteToHelperInvocationEXT],, [AC_MSG_ERROR([SPIR-V headers are too old.])], [
 #ifdef HAVE_SPIRV_UNIFIED1_SPIRV_H
@@ -112,8 +112,11 @@ case $host_os in
     ;;
 esac

+AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library])
 AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
-VKD3D_CHECK_VULKAN
+AS_IF([test "x$SONAME_LIBVULKAN" = "x"],
+      [VKD3D_CHECK_VULKAN],
+      [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])])

 AS_IF([test "x$with_ncurses" != "xno"],
      [PKG_CHECK_MODULES([NCURSES], [ncurses],
@@ -126,7 +129,7 @@ AS_IF([test "x$with_spirv_tools" = "xyes"],

 HAVE_XCB=no
 AS_IF([test "x$with_xcb" != "xno"],
-      [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms],
+      [PKG_CHECK_MODULES([XCB], [xcb xcb-event xcb-icccm xcb-keysyms],
                                [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.])
                                HAVE_XCB=yes],
                                [HAVE_XCB=no])])
@@ -162,9 +165,11 @@ AC_OUTPUT

 dnl Output configuration summary
 AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"],
-      [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no])
+      [HAVE_CROSSTARGET=yes], [HAVE_CROSSTARGET=no])
 AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no])

+AS_IF([test "x$enable_demos" != "xyes" -a "x$enable_tests" = "xno"], [CROSSTARGET64=no CROSSTARGET32=no])
+
 AS_ECHO(["
  Configuration summary for $PACKAGE $VERSION

@@ -177,8 +182,10 @@ AS_ECHO(["
  Building demos: ${enable_demos}
  Building tests: ${enable_tests}
  Building documentation: ${HAVE_DOCS}
+"])

-  Building crosstests: ${HAVE_CROSSTEST}"])
+AS_IF([test "x$enable_demos" = "xyes"], [AS_ECHO(["  Cross-compiling demos: ${HAVE_CROSSTARGET}"])])
+AS_IF([test "x$enable_tests" != "xno"], [AS_ECHO(["  Cross-compiling tests: ${HAVE_CROSSTARGET}"])])
 AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO(["    Using 32-bit cross compiler: $CROSSCC32"])])
 AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO(["    Using 64-bit cross compiler: $CROSSCC64"])])
 AS_ECHO([])
--- a/demos/demo_win32.h
+++ b/demos/demo_win32.h
@@ -18,6 +18,7 @@
 */

 #include <vkd3d_dxgi1_4.h>
+#include <vkd3d_d3dcompiler.h>
 #include <stdbool.h>
 #include <stdio.h>

--- a/demos/demo_xcb.h
+++ b/demos/demo_xcb.h
@@ -17,18 +17,65 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

+#define VK_NO_PROTOTYPES
 #define VK_USE_PLATFORM_XCB_KHR
-#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_3
+#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_6
+#include "config.h"
 #include <vkd3d.h>
 #include <vkd3d_utils.h>
 #include <xcb/xcb_event.h>
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_keysyms.h>
 #include <sys/stat.h>
+#include <dlfcn.h>
 #include <limits.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdbool.h>
+#include <stdio.h>
+
+#define DECLARE_VK_PFN(name) PFN_##name name;
+DECLARE_VK_PFN(vkAcquireNextImageKHR)
+DECLARE_VK_PFN(vkCreateFence)
+DECLARE_VK_PFN(vkCreateSwapchainKHR)
+DECLARE_VK_PFN(vkCreateXcbSurfaceKHR)
+DECLARE_VK_PFN(vkDestroyFence)
+DECLARE_VK_PFN(vkDestroySurfaceKHR)
+DECLARE_VK_PFN(vkDestroySwapchainKHR)
+DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR)
+DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR)
+DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR)
+DECLARE_VK_PFN(vkGetSwapchainImagesKHR)
+DECLARE_VK_PFN(vkQueuePresentKHR)
+DECLARE_VK_PFN(vkResetFences)
+DECLARE_VK_PFN(vkWaitForFences)
+
+static void load_vulkan_procs(void)
+{
+    void *libvulkan;
+
+    if (!(libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW)))
+    {
+        fprintf(stderr, "Failed to load %s: %s.\n", SONAME_LIBVULKAN, dlerror());
+        exit(1);
+    }
+
+#define LOAD_VK_PFN(name) name = (void *)dlsym(libvulkan, #name);
+    LOAD_VK_PFN(vkAcquireNextImageKHR)
+    LOAD_VK_PFN(vkCreateFence)
+    LOAD_VK_PFN(vkCreateSwapchainKHR)
+    LOAD_VK_PFN(vkCreateXcbSurfaceKHR)
+    LOAD_VK_PFN(vkDestroyFence)
+    LOAD_VK_PFN(vkDestroySurfaceKHR)
+    LOAD_VK_PFN(vkDestroySwapchainKHR)
+    LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR)
+    LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR)
+    LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR)
+    LOAD_VK_PFN(vkGetSwapchainImagesKHR)
+    LOAD_VK_PFN(vkQueuePresentKHR)
+    LOAD_VK_PFN(vkResetFences)
+    LOAD_VK_PFN(vkWaitForFences)
+}

 struct demo
 {
@@ -330,6 +377,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c
    VkImage *vk_images;
    VkFormat format;

+    load_vulkan_procs();
+
    if ((format = vkd3d_get_vk_format(desc->format)) == VK_FORMAT_UNDEFINED)
        return NULL;

--- a/demos/gears.c
+++ b/demos/gears.c
@@ -48,9 +48,7 @@
 #include <math.h>
 #include "demo.h"

-#include "gears_vs.h"
-#include "gears_ps_flat.h"
-#include "gears_ps_smooth.h"
+#include "gears_hlsl.h"

 struct cxg_fence
 {
@@ -659,6 +657,7 @@ static void cxg_load_assets(struct cx_gears *cxg)
    D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc;
    D3D12_CPU_DESCRIPTOR_HANDLE dsv_handle;
    D3D12_ROOT_PARAMETER root_parameter;
+    ID3DBlob *vs, *ps_flat, *ps_smooth;
    D3D12_RESOURCE_DESC resource_desc;
    D3D12_HEAP_PROPERTIES heap_desc;
    D3D12_RANGE read_range = {0, 0};
@@ -682,14 +681,21 @@ static void cxg_load_assets(struct cx_gears *cxg)
    hr = demo_create_root_signature(cxg->device, &root_signature_desc, &cxg->root_signature);
    assert(SUCCEEDED(hr));

+    hr = D3DCompile(gears_hlsl, strlen(gears_hlsl), NULL, NULL, NULL, "vs_main", "vs_5_0", 0, 0, &vs, NULL);
+    assert(SUCCEEDED(hr));
+    hr = D3DCompile(gears_hlsl, strlen(gears_hlsl), NULL, NULL, NULL, "ps_main_flat", "ps_5_0", 0, 0, &ps_flat, NULL);
+    assert(SUCCEEDED(hr));
+    hr = D3DCompile(gears_hlsl, strlen(gears_hlsl), NULL, NULL, NULL, "ps_main_smooth", "ps_5_0", 0, 0, &ps_smooth, NULL);
+    assert(SUCCEEDED(hr));
+
    memset(&pso_desc, 0, sizeof(pso_desc));
    pso_desc.InputLayout.pInputElementDescs = il_desc;
    pso_desc.InputLayout.NumElements = ARRAY_SIZE(il_desc);
    pso_desc.pRootSignature = cxg->root_signature;
-    pso_desc.VS.pShaderBytecode = g_vs_main;
-    pso_desc.VS.BytecodeLength = sizeof(g_vs_main);
-    pso_desc.PS.pShaderBytecode = g_ps_main_flat;
-    pso_desc.PS.BytecodeLength = sizeof(g_ps_main_flat);
+    pso_desc.VS.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs);
+    pso_desc.VS.BytecodeLength = ID3D10Blob_GetBufferSize(vs);
+    pso_desc.PS.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_flat);
+    pso_desc.PS.BytecodeLength = ID3D10Blob_GetBufferSize(ps_flat);

    demo_rasterizer_desc_init_default(&pso_desc.RasterizerState);
    pso_desc.RasterizerState.FrontCounterClockwise = TRUE;
@@ -708,12 +714,16 @@ static void cxg_load_assets(struct cx_gears *cxg)
            &IID_ID3D12PipelineState, (void **)&cxg->pipeline_state_flat);
    assert(SUCCEEDED(hr));

-    pso_desc.PS.pShaderBytecode = g_ps_main_smooth;
-    pso_desc.PS.BytecodeLength = sizeof(g_ps_main_smooth);
+    pso_desc.PS.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_smooth);
+    pso_desc.PS.BytecodeLength = ID3D10Blob_GetBufferSize(ps_smooth);
    hr = ID3D12Device_CreateGraphicsPipelineState(cxg->device, &pso_desc,
            &IID_ID3D12PipelineState, (void **)&cxg->pipeline_state_smooth);
    assert(SUCCEEDED(hr));

+    ID3D10Blob_Release(vs);
+    ID3D10Blob_Release(ps_flat);
+    ID3D10Blob_Release(ps_smooth);
+
    for (i = 0; i < ARRAY_SIZE(cxg->command_list); ++i)
    {
        hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT,
--- a/demos/gears.hlsl
+++ b/demos/gears.hlsl
@@ -1,55 +0,0 @@
-cbuffer gear_block : register(b0)
-{
-    float4x4 mvp_matrix;
-    float3x3 normal_matrix;
-};
-
-struct vs_in
-{
-    float4 position : POSITION;
-    float3 normal : NORMAL;
-    float3 diffuse : DIFFUSE;
-    float4 transform : TRANSFORM;
-};
-
-struct vs_out
-{
-    float4 position : SV_POSITION;
-    float4 colour : COLOR;
-};
-
-struct vs_out vs_main(struct vs_in i)
-{
-    const float3 l_pos = float3(5.0, 5.0, 10.0);
-    float3 dir, normal;
-    float4 position;
-    struct vs_out o;
-    float att;
-
-    position.x = i.transform.x * i.position.x - i.transform.y * i.position.y + i.transform.z;
-    position.y = i.transform.x * i.position.y + i.transform.y * i.position.x + i.transform.w;
-    position.zw = i.position.zw;
-
-    o.position = mul(mvp_matrix, position);
-    dir = normalize(l_pos - o.position.xyz / o.position.w);
-
-    normal.x = i.transform.x * i.normal.x - i.transform.y * i.normal.y;
-    normal.y = i.transform.x * i.normal.y + i.transform.y * i.normal.x;
-    normal.z = i.normal.z;
-    att = 0.2 + dot(dir, normalize(mul(normal_matrix, normal)));
-
-    o.colour.xyz = i.diffuse.xyz * att;
-    o.colour.w = 1.0;
-
-    return o;
-}
-
-float4 ps_main_smooth(float4 position : SV_POSITION, float4 colour : COLOR) : SV_TARGET
-{
-    return colour;
-}
-
-float4 ps_main_flat(float4 position : SV_POSITION, nointerpolation float4 colour : COLOR) : SV_TARGET
-{
-    return colour;
-}
--- a/demos/gears_hlsl.h
+++ b/demos/gears_hlsl.h
@@ -0,0 +1,56 @@
+static const char gears_hlsl[] =
+"cbuffer gear_block : register(b0)\n"
+"{\n"
+"    float4x4 mvp_matrix;\n"
+"    float3x3 normal_matrix;\n"
+"};\n"
+"\n"
+"struct vs_in\n"
+"{\n"
+"    float4 position : POSITION;\n"
+"    float3 normal : NORMAL;\n"
+"    float3 diffuse : DIFFUSE;\n"
+"    float4 transform : TRANSFORM;\n"
+"};\n"
+"\n"
+"struct vs_out\n"
+"{\n"
+"    float4 position : SV_POSITION;\n"
+"    float4 colour : COLOR;\n"
+"};\n"
+"\n"
+"struct vs_out vs_main(struct vs_in i)\n"
+"{\n"
+"    const float3 l_pos = float3(5.0, 5.0, 10.0);\n"
+"    float3 dir, normal;\n"
+"    float4 position;\n"
+"    struct vs_out o;\n"
+"    float att;\n"
+"\n"
+"    position.x = i.transform.x * i.position.x - i.transform.y * i.position.y + i.transform.z;\n"
+"    position.y = i.transform.x * i.position.y + i.transform.y * i.position.x + i.transform.w;\n"
+"    position.zw = i.position.zw;\n"
+"\n"
+"    o.position = mul(mvp_matrix, position);\n"
+"    dir = normalize(l_pos - o.position.xyz / o.position.w);\n"
+"\n"
+"    normal.x = i.transform.x * i.normal.x - i.transform.y * i.normal.y;\n"
+"    normal.y = i.transform.x * i.normal.y + i.transform.y * i.normal.x;\n"
+"    normal.z = i.normal.z;\n"
+"    att = 0.2 + dot(dir, normalize(mul(normal_matrix, normal)));\n"
+"\n"
+"    o.colour.xyz = i.diffuse.xyz * att;\n"
+"    o.colour.w = 1.0;\n"
+"\n"
+"    return o;\n"
+"}\n"
+"\n"
+"float4 ps_main_smooth(float4 position : SV_POSITION, float4 colour : COLOR) : SV_TARGET\n"
+"{\n"
+"    return colour;\n"
+"}\n"
+"\n"
+"float4 ps_main_flat(float4 position : SV_POSITION, nointerpolation float4 colour : COLOR) : SV_TARGET\n"
+"{\n"
+"    return colour;\n"
+"}\n";
--- a/demos/gears_ps_flat.h
+++ b/demos/gears_ps_flat.h
@@ -1,73 +0,0 @@
-#if 0
-//
-// Generated by Microsoft (R) D3D Shader Disassembler
-//
-//
-// Input signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_POSITION              0   xyzw        0      POS   float
-// COLOR                    0   xyzw        1     NONE   float   xyzw
-//
-//
-// Output signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
-//
-ps_5_0
-dcl_globalFlags refactoringAllowed
-dcl_input_ps constant v1.xyzw
-dcl_output o0.xyzw
-mov o0.xyzw, v1.xyzw
-ret
-// Approximately 0 instruction slots used
-#endif
-
-const BYTE g_ps_main_flat[] =
-{
-     68,  88,  66,  67, 254, 211,
-     50,  72, 228, 208,  73,  13,
-    143, 221, 134, 105,   6, 165,
-     26, 140,   1,   0,   0,   0,
-    248,   0,   0,   0,   3,   0,
-      0,   0,  44,   0,   0,   0,
-    128,   0,   0,   0, 180,   0,
-      0,   0,  73,  83,  71,  78,
-     76,   0,   0,   0,   2,   0,
-      0,   0,   8,   0,   0,   0,
-     56,   0,   0,   0,   0,   0,
-      0,   0,   1,   0,   0,   0,
-      3,   0,   0,   0,   0,   0,
-      0,   0,  15,   0,   0,   0,
-     68,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   1,   0,
-      0,   0,  15,  15,   0,   0,
-     83,  86,  95,  80,  79,  83,
-     73,  84,  73,  79,  78,   0,
-     67,  79,  76,  79,  82,   0,
-    171, 171,  79,  83,  71,  78,
-     44,   0,   0,   0,   1,   0,
-      0,   0,   8,   0,   0,   0,
-     32,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   0,   0,
-      0,   0,  15,   0,   0,   0,
-     83,  86,  95,  84,  65,  82,
-     71,  69,  84,   0, 171, 171,
-     83,  72,  69,  88,  60,   0,
-      0,   0,  80,   0,   0,   0,
-     15,   0,   0,   0, 106,   8,
-      0,   1,  98,   8,   0,   3,
-    242,  16,  16,   0,   1,   0,
-      0,   0, 101,   0,   0,   3,
-    242,  32,  16,   0,   0,   0,
-      0,   0,  54,   0,   0,   5,
-    242,  32,  16,   0,   0,   0,
-      0,   0,  70,  30,  16,   0,
-      1,   0,   0,   0,  62,   0,
-      0,   1
-};
--- a/demos/gears_ps_smooth.h
+++ b/demos/gears_ps_smooth.h
@@ -1,73 +0,0 @@
-#if 0
-//
-// Generated by Microsoft (R) D3D Shader Disassembler
-//
-//
-// Input signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_POSITION              0   xyzw        0      POS   float
-// COLOR                    0   xyzw        1     NONE   float   xyzw
-//
-//
-// Output signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
-//
-ps_5_0
-dcl_globalFlags refactoringAllowed
-dcl_input_ps linear v1.xyzw
-dcl_output o0.xyzw
-mov o0.xyzw, v1.xyzw
-ret
-// Approximately 0 instruction slots used
-#endif
-
-const BYTE g_ps_main_smooth[] =
-{
-     68,  88,  66,  67,  80, 239,
-    109,  26,   0, 147,   6, 156,
-    240, 104, 206, 124, 185,  57,
-     18,  98,   1,   0,   0,   0,
-    248,   0,   0,   0,   3,   0,
-      0,   0,  44,   0,   0,   0,
-    128,   0,   0,   0, 180,   0,
-      0,   0,  73,  83,  71,  78,
-     76,   0,   0,   0,   2,   0,
-      0,   0,   8,   0,   0,   0,
-     56,   0,   0,   0,   0,   0,
-      0,   0,   1,   0,   0,   0,
-      3,   0,   0,   0,   0,   0,
-      0,   0,  15,   0,   0,   0,
-     68,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   1,   0,
-      0,   0,  15,  15,   0,   0,
-     83,  86,  95,  80,  79,  83,
-     73,  84,  73,  79,  78,   0,
-     67,  79,  76,  79,  82,   0,
-    171, 171,  79,  83,  71,  78,
-     44,   0,   0,   0,   1,   0,
-      0,   0,   8,   0,   0,   0,
-     32,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   0,   0,
-      0,   0,  15,   0,   0,   0,
-     83,  86,  95,  84,  65,  82,
-     71,  69,  84,   0, 171, 171,
-     83,  72,  69,  88,  60,   0,
-      0,   0,  80,   0,   0,   0,
-     15,   0,   0,   0, 106,   8,
-      0,   1,  98,  16,   0,   3,
-    242,  16,  16,   0,   1,   0,
-      0,   0, 101,   0,   0,   3,
-    242,  32,  16,   0,   0,   0,
-      0,   0,  54,   0,   0,   5,
-    242,  32,  16,   0,   0,   0,
-      0,   0,  70,  30,  16,   0,
-      1,   0,   0,   0,  62,   0,
-      0,   1
-};
--- a/demos/gears_vs.h
+++ b/demos/gears_vs.h
@@ -1,272 +0,0 @@
-#if 0
-//
-// Generated by Microsoft (R) D3D Shader Disassembler
-//
-//
-// Input signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// POSITION                 0   xyzw        0     NONE   float   xyzw
-// NORMAL                   0   xyz         1     NONE   float   xyz
-// DIFFUSE                  0   xyz         2     NONE   float   xyz
-// TRANSFORM                0   xyzw        3     NONE   float   xyzw
-//
-//
-// Output signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_POSITION              0   xyzw        0      POS   float   xyzw
-// COLOR                    0   xyzw        1     NONE   float   xyzw
-//
-vs_5_0
-dcl_globalFlags refactoringAllowed
-dcl_constantbuffer CB0[7], immediateIndexed
-dcl_input v0.xyzw
-dcl_input v1.xyz
-dcl_input v2.xyz
-dcl_input v3.xyzw
-dcl_output_siv o0.xyzw, position
-dcl_output o1.xyzw
-dcl_temps 2
-mul r0.x, v0.y, v3.y
-mad r0.x, v3.x, v0.x, -r0.x
-dp2 r0.y, v3.yxyy, v0.xyxx
-add r0.xy, r0.xyxx, v3.zwzz
-mul r1.xyzw, r0.yyyy, cb0[1].xyzw
-mad r0.xyzw, cb0[0].xyzw, r0.xxxx, r1.xyzw
-mad r0.xyzw, cb0[2].xyzw, v0.zzzz, r0.xyzw
-mad r0.xyzw, cb0[3].xyzw, v0.wwww, r0.xyzw
-mov o0.xyzw, r0.xyzw
-div r0.xyz, r0.xyzx, r0.wwww
-add r0.xyz, -r0.xyzx, l(5.000000, 5.000000, 10.000000, 0.000000)
-dp3 r0.w, r0.xyzx, r0.xyzx
-rsq r0.w, r0.w
-mul r0.xyz, r0.wwww, r0.xyzx
-mul r0.w, v1.y, v3.y
-mad r0.w, v3.x, v1.x, -r0.w
-dp2 r1.x, v3.yxyy, v1.xyxx
-mul r1.xyz, r1.xxxx, cb0[5].xyzx
-mad r1.xyz, cb0[4].xyzx, r0.wwww, r1.xyzx
-mad r1.xyz, cb0[6].xyzx, v1.zzzz, r1.xyzx
-dp3 r0.w, r1.xyzx, r1.xyzx
-rsq r0.w, r0.w
-mul r1.xyz, r0.wwww, r1.xyzx
-dp3 r0.x, r0.xyzx, r1.xyzx
-add r0.x, r0.x, l(0.200000)
-mul o1.xyz, r0.xxxx, v2.xyzx
-mov o1.w, l(1.000000)
-ret
-// Approximately 0 instruction slots used
-#endif
-
-const BYTE g_vs_main[] =
-{
-     68,  88,  66,  67,  82,  90,
-     22, 185,  41,  66, 113, 173,
-     43,  53, 199,  35,  30,  50,
-     78,   7,   1,   0,   0,   0,
-    208,   4,   0,   0,   3,   0,
-      0,   0,  44,   0,   0,   0,
-    192,   0,   0,   0,  20,   1,
-      0,   0,  73,  83,  71,  78,
-    140,   0,   0,   0,   4,   0,
-      0,   0,   8,   0,   0,   0,
-    104,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   0,   0,
-      0,   0,  15,  15,   0,   0,
-    113,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   1,   0,
-      0,   0,   7,   7,   0,   0,
-    120,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   2,   0,
-      0,   0,   7,   7,   0,   0,
-    128,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   3,   0,
-      0,   0,  15,  15,   0,   0,
-     80,  79,  83,  73,  84,  73,
-     79,  78,   0,  78,  79,  82,
-     77,  65,  76,   0,  68,  73,
-     70,  70,  85,  83,  69,   0,
-     84,  82,  65,  78,  83,  70,
-     79,  82,  77,   0, 171, 171,
-     79,  83,  71,  78,  76,   0,
-      0,   0,   2,   0,   0,   0,
-      8,   0,   0,   0,  56,   0,
-      0,   0,   0,   0,   0,   0,
-      1,   0,   0,   0,   3,   0,
-      0,   0,   0,   0,   0,   0,
-     15,   0,   0,   0,  68,   0,
-      0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   3,   0,
-      0,   0,   1,   0,   0,   0,
-     15,   0,   0,   0,  83,  86,
-     95,  80,  79,  83,  73,  84,
-     73,  79,  78,   0,  67,  79,
-     76,  79,  82,   0, 171, 171,
-     83,  72,  69,  88, 180,   3,
-      0,   0,  80,   0,   1,   0,
-    237,   0,   0,   0, 106,   8,
-      0,   1,  89,   0,   0,   4,
-     70, 142,  32,   0,   0,   0,
-      0,   0,   7,   0,   0,   0,
-     95,   0,   0,   3, 242,  16,
-     16,   0,   0,   0,   0,   0,
-     95,   0,   0,   3, 114,  16,
-     16,   0,   1,   0,   0,   0,
-     95,   0,   0,   3, 114,  16,
-     16,   0,   2,   0,   0,   0,
-     95,   0,   0,   3, 242,  16,
-     16,   0,   3,   0,   0,   0,
-    103,   0,   0,   4, 242,  32,
-     16,   0,   0,   0,   0,   0,
-      1,   0,   0,   0, 101,   0,
-      0,   3, 242,  32,  16,   0,
-      1,   0,   0,   0, 104,   0,
-      0,   2,   2,   0,   0,   0,
-     56,   0,   0,   7,  18,   0,
-     16,   0,   0,   0,   0,   0,
-     26,  16,  16,   0,   0,   0,
-      0,   0,  26,  16,  16,   0,
-      3,   0,   0,   0,  50,   0,
-      0,  10,  18,   0,  16,   0,
-      0,   0,   0,   0,  10,  16,
-     16,   0,   3,   0,   0,   0,
-     10,  16,  16,   0,   0,   0,
-      0,   0,  10,   0,  16, 128,
-     65,   0,   0,   0,   0,   0,
-      0,   0,  15,   0,   0,   7,
-     34,   0,  16,   0,   0,   0,
-      0,   0,  22,  21,  16,   0,
-      3,   0,   0,   0,  70,  16,
-     16,   0,   0,   0,   0,   0,
-      0,   0,   0,   7,  50,   0,
-     16,   0,   0,   0,   0,   0,
-     70,   0,  16,   0,   0,   0,
-      0,   0, 230,  26,  16,   0,
-      3,   0,   0,   0,  56,   0,
-      0,   8, 242,   0,  16,   0,
-      1,   0,   0,   0,  86,   5,
-     16,   0,   0,   0,   0,   0,
-     70, 142,  32,   0,   0,   0,
-      0,   0,   1,   0,   0,   0,
-     50,   0,   0,  10, 242,   0,
-     16,   0,   0,   0,   0,   0,
-     70, 142,  32,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      6,   0,  16,   0,   0,   0,
-      0,   0,  70,  14,  16,   0,
-      1,   0,   0,   0,  50,   0,
-      0,  10, 242,   0,  16,   0,
-      0,   0,   0,   0,  70, 142,
-     32,   0,   0,   0,   0,   0,
-      2,   0,   0,   0, 166,  26,
-     16,   0,   0,   0,   0,   0,
-     70,  14,  16,   0,   0,   0,
-      0,   0,  50,   0,   0,  10,
-    242,   0,  16,   0,   0,   0,
-      0,   0,  70, 142,  32,   0,
-      0,   0,   0,   0,   3,   0,
-      0,   0, 246,  31,  16,   0,
-      0,   0,   0,   0,  70,  14,
-     16,   0,   0,   0,   0,   0,
-     54,   0,   0,   5, 242,  32,
-     16,   0,   0,   0,   0,   0,
-     70,  14,  16,   0,   0,   0,
-      0,   0,  14,   0,   0,   7,
-    114,   0,  16,   0,   0,   0,
-      0,   0,  70,   2,  16,   0,
-      0,   0,   0,   0, 246,  15,
-     16,   0,   0,   0,   0,   0,
-      0,   0,   0,  11, 114,   0,
-     16,   0,   0,   0,   0,   0,
-     70,   2,  16, 128,  65,   0,
-      0,   0,   0,   0,   0,   0,
-      2,  64,   0,   0,   0,   0,
-    160,  64,   0,   0, 160,  64,
-      0,   0,  32,  65,   0,   0,
-      0,   0,  16,   0,   0,   7,
-    130,   0,  16,   0,   0,   0,
-      0,   0,  70,   2,  16,   0,
-      0,   0,   0,   0,  70,   2,
-     16,   0,   0,   0,   0,   0,
-     68,   0,   0,   5, 130,   0,
-     16,   0,   0,   0,   0,   0,
-     58,   0,  16,   0,   0,   0,
-      0,   0,  56,   0,   0,   7,
-    114,   0,  16,   0,   0,   0,
-      0,   0, 246,  15,  16,   0,
-      0,   0,   0,   0,  70,   2,
-     16,   0,   0,   0,   0,   0,
-     56,   0,   0,   7, 130,   0,
-     16,   0,   0,   0,   0,   0,
-     26,  16,  16,   0,   1,   0,
-      0,   0,  26,  16,  16,   0,
-      3,   0,   0,   0,  50,   0,
-      0,  10, 130,   0,  16,   0,
-      0,   0,   0,   0,  10,  16,
-     16,   0,   3,   0,   0,   0,
-     10,  16,  16,   0,   1,   0,
-      0,   0,  58,   0,  16, 128,
-     65,   0,   0,   0,   0,   0,
-      0,   0,  15,   0,   0,   7,
-     18,   0,  16,   0,   1,   0,
-      0,   0,  22,  21,  16,   0,
-      3,   0,   0,   0,  70,  16,
-     16,   0,   1,   0,   0,   0,
-     56,   0,   0,   8, 114,   0,
-     16,   0,   1,   0,   0,   0,
-      6,   0,  16,   0,   1,   0,
-      0,   0,  70, 130,  32,   0,
-      0,   0,   0,   0,   5,   0,
-      0,   0,  50,   0,   0,  10,
-    114,   0,  16,   0,   1,   0,
-      0,   0,  70, 130,  32,   0,
-      0,   0,   0,   0,   4,   0,
-      0,   0, 246,  15,  16,   0,
-      0,   0,   0,   0,  70,   2,
-     16,   0,   1,   0,   0,   0,
-     50,   0,   0,  10, 114,   0,
-     16,   0,   1,   0,   0,   0,
-     70, 130,  32,   0,   0,   0,
-      0,   0,   6,   0,   0,   0,
-    166,  26,  16,   0,   1,   0,
-      0,   0,  70,   2,  16,   0,
-      1,   0,   0,   0,  16,   0,
-      0,   7, 130,   0,  16,   0,
-      0,   0,   0,   0,  70,   2,
-     16,   0,   1,   0,   0,   0,
-     70,   2,  16,   0,   1,   0,
-      0,   0,  68,   0,   0,   5,
-    130,   0,  16,   0,   0,   0,
-      0,   0,  58,   0,  16,   0,
-      0,   0,   0,   0,  56,   0,
-      0,   7, 114,   0,  16,   0,
-      1,   0,   0,   0, 246,  15,
-     16,   0,   0,   0,   0,   0,
-     70,   2,  16,   0,   1,   0,
-      0,   0,  16,   0,   0,   7,
-     18,   0,  16,   0,   0,   0,
-      0,   0,  70,   2,  16,   0,
-      0,   0,   0,   0,  70,   2,
-     16,   0,   1,   0,   0,   0,
-      0,   0,   0,   7,  18,   0,
-     16,   0,   0,   0,   0,   0,
-     10,   0,  16,   0,   0,   0,
-      0,   0,   1,  64,   0,   0,
-    205, 204,  76,  62,  56,   0,
-      0,   7, 114,  32,  16,   0,
-      1,   0,   0,   0,   6,   0,
-     16,   0,   0,   0,   0,   0,
-     70,  18,  16,   0,   2,   0,
-      0,   0,  54,   0,   0,   5,
-    130,  32,  16,   0,   1,   0,
-      0,   0,   1,  64,   0,   0,
-      0,   0, 128,  63,  62,   0,
-      0,   1
-};
--- a/demos/triangle.c
+++ b/demos/triangle.c
@@ -45,8 +45,7 @@
 #include <assert.h>
 #include "demo.h"

-#include "triangle_vs.h"
-#include "triangle_ps.h"
+#include "triangle_hlsl.h"

 struct cxt_fence
 {
@@ -277,6 +276,7 @@ static void cxt_load_assets(struct cx_triangle *cxt)
    D3D12_RESOURCE_DESC resource_desc;
    D3D12_HEAP_PROPERTIES heap_desc;
    D3D12_RANGE read_range = {0, 0};
+    ID3DBlob *vs, *ps;
    HRESULT hr;
    void *data;

@@ -285,14 +285,19 @@ static void cxt_load_assets(struct cx_triangle *cxt)
    hr = demo_create_root_signature(cxt->device, &root_signature_desc, &cxt->root_signature);
    assert(SUCCEEDED(hr));

+    hr = D3DCompile(triangle_hlsl, strlen(triangle_hlsl), NULL, NULL, NULL, "vs_main", "vs_5_0", 0, 0, &vs, NULL);
+    assert(SUCCEEDED(hr));
+    hr = D3DCompile(triangle_hlsl, strlen(triangle_hlsl), NULL, NULL, NULL, "ps_main", "ps_5_0", 0, 0, &ps, NULL);
+    assert(SUCCEEDED(hr));
+
    memset(&pso_desc, 0, sizeof(pso_desc));
    pso_desc.InputLayout.pInputElementDescs = il_desc;
    pso_desc.InputLayout.NumElements = ARRAY_SIZE(il_desc);
    pso_desc.pRootSignature = cxt->root_signature;
-    pso_desc.VS.pShaderBytecode = g_vs_main;
-    pso_desc.VS.BytecodeLength = sizeof(g_vs_main);
-    pso_desc.PS.pShaderBytecode = g_ps_main;
-    pso_desc.PS.BytecodeLength = sizeof(g_ps_main);
+    pso_desc.VS.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs);
+    pso_desc.VS.BytecodeLength = ID3D10Blob_GetBufferSize(vs);
+    pso_desc.PS.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps);
+    pso_desc.PS.BytecodeLength = ID3D10Blob_GetBufferSize(ps);
    demo_rasterizer_desc_init_default(&pso_desc.RasterizerState);
    demo_blend_desc_init_default(&pso_desc.BlendState);
    pso_desc.DepthStencilState.DepthEnable = FALSE;
@@ -306,6 +311,9 @@ static void cxt_load_assets(struct cx_triangle *cxt)
            &IID_ID3D12PipelineState, (void **)&cxt->pipeline_state);
    assert(SUCCEEDED(hr));

+    ID3D10Blob_Release(vs);
+    ID3D10Blob_Release(ps);
+
    hr = ID3D12Device_CreateCommandList(cxt->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxt->command_allocator,
            cxt->pipeline_state, &IID_ID3D12GraphicsCommandList, (void **)&cxt->command_list);
    assert(SUCCEEDED(hr));
--- a/demos/triangle.hlsl
+++ b/demos/triangle.hlsl
@@ -1,20 +0,0 @@
-struct ps_in
-{
-    float4 position : SV_POSITION;
-    float4 colour : COLOR;
-};
-
-struct ps_in vs_main(float4 position : POSITION, float4 colour : COLOR)
-{
-    struct ps_in o;
-
-    o.position = position;
-    o.colour = colour;
-
-    return o;
-}
-
-float4 ps_main(struct ps_in i) : SV_TARGET
-{
-    return i.colour;
-}
--- a/demos/triangle_hlsl.h
+++ b/demos/triangle_hlsl.h
@@ -0,0 +1,21 @@
+static const char triangle_hlsl[] =
+"struct ps_in\n"
+"{\n"
+"    float4 position : SV_POSITION;\n"
+"    float4 colour : COLOR;\n"
+"};\n"
+"\n"
+"struct ps_in vs_main(float4 position : POSITION, float4 colour : COLOR)\n"
+"{\n"
+"    struct ps_in o;\n"
+"\n"
+"    o.position = position;\n"
+"    o.colour = colour;\n"
+"\n"
+"    return o;\n"
+"}\n"
+"\n"
+"float4 ps_main(struct ps_in i) : SV_TARGET\n"
+"{\n"
+"    return i.colour;\n"
+"}\n";
--- a/demos/triangle_ps.h
+++ b/demos/triangle_ps.h
@@ -1,73 +0,0 @@
-#if 0
-//
-// Generated by Microsoft (R) D3D Shader Disassembler
-//
-//
-// Input signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_POSITION              0   xyzw        0      POS   float
-// COLOR                    0   xyzw        1     NONE   float   xyzw
-//
-//
-// Output signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
-//
-ps_5_0
-dcl_globalFlags refactoringAllowed
-dcl_input_ps linear v1.xyzw
-dcl_output o0.xyzw
-mov o0.xyzw, v1.xyzw
-ret
-// Approximately 0 instruction slots used
-#endif
-
-const BYTE g_ps_main[] =
-{
-     68,  88,  66,  67,  80, 239,
-    109,  26,   0, 147,   6, 156,
-    240, 104, 206, 124, 185,  57,
-     18,  98,   1,   0,   0,   0,
-    248,   0,   0,   0,   3,   0,
-      0,   0,  44,   0,   0,   0,
-    128,   0,   0,   0, 180,   0,
-      0,   0,  73,  83,  71,  78,
-     76,   0,   0,   0,   2,   0,
-      0,   0,   8,   0,   0,   0,
-     56,   0,   0,   0,   0,   0,
-      0,   0,   1,   0,   0,   0,
-      3,   0,   0,   0,   0,   0,
-      0,   0,  15,   0,   0,   0,
-     68,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   1,   0,
-      0,   0,  15,  15,   0,   0,
-     83,  86,  95,  80,  79,  83,
-     73,  84,  73,  79,  78,   0,
-     67,  79,  76,  79,  82,   0,
-    171, 171,  79,  83,  71,  78,
-     44,   0,   0,   0,   1,   0,
-      0,   0,   8,   0,   0,   0,
-     32,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   0,   0,
-      0,   0,  15,   0,   0,   0,
-     83,  86,  95,  84,  65,  82,
-     71,  69,  84,   0, 171, 171,
-     83,  72,  69,  88,  60,   0,
-      0,   0,  80,   0,   0,   0,
-     15,   0,   0,   0, 106,   8,
-      0,   1,  98,  16,   0,   3,
-    242,  16,  16,   0,   1,   0,
-      0,   0, 101,   0,   0,   3,
-    242,  32,  16,   0,   0,   0,
-      0,   0,  54,   0,   0,   5,
-    242,  32,  16,   0,   0,   0,
-      0,   0,  70,  30,  16,   0,
-      1,   0,   0,   0,  62,   0,
-      0,   1
-};
--- a/demos/triangle_vs.h
+++ b/demos/triangle_vs.h
@@ -1,89 +0,0 @@
-#if 0
-//
-// Generated by Microsoft (R) D3D Shader Disassembler
-//
-//
-// Input signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// POSITION                 0   xyzw        0     NONE   float   xyzw
-// COLOR                    0   xyzw        1     NONE   float   xyzw
-//
-//
-// Output signature:
-//
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_POSITION              0   xyzw        0      POS   float   xyzw
-// COLOR                    0   xyzw        1     NONE   float   xyzw
-//
-vs_5_0
-dcl_globalFlags refactoringAllowed
-dcl_input v0.xyzw
-dcl_input v1.xyzw
-dcl_output_siv o0.xyzw, position
-dcl_output o1.xyzw
-mov o0.xyzw, v0.xyzw
-mov o1.xyzw, v1.xyzw
-ret
-// Approximately 0 instruction slots used
-#endif
-
-const BYTE g_vs_main[] =
-{
-     68,  88,  66,  67,  17, 201,
-    143, 165, 233,  56,   0,  40,
-     84, 255, 207,  20,  40, 195,
-     63, 228,   1,   0,   0,   0,
-     68,   1,   0,   0,   3,   0,
-      0,   0,  44,   0,   0,   0,
-    124,   0,   0,   0, 208,   0,
-      0,   0,  73,  83,  71,  78,
-     72,   0,   0,   0,   2,   0,
-      0,   0,   8,   0,   0,   0,
-     56,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   0,   0,
-      0,   0,  15,  15,   0,   0,
-     65,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      3,   0,   0,   0,   1,   0,
-      0,   0,  15,  15,   0,   0,
-     80,  79,  83,  73,  84,  73,
-     79,  78,   0,  67,  79,  76,
-     79,  82,   0, 171,  79,  83,
-     71,  78,  76,   0,   0,   0,
-      2,   0,   0,   0,   8,   0,
-      0,   0,  56,   0,   0,   0,
-      0,   0,   0,   0,   1,   0,
-      0,   0,   3,   0,   0,   0,
-      0,   0,   0,   0,  15,   0,
-      0,   0,  68,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,
-      0,   0,   3,   0,   0,   0,
-      1,   0,   0,   0,  15,   0,
-      0,   0,  83,  86,  95,  80,
-     79,  83,  73,  84,  73,  79,
-     78,   0,  67,  79,  76,  79,
-     82,   0, 171, 171,  83,  72,
-     69,  88, 108,   0,   0,   0,
-     80,   0,   1,   0,  27,   0,
-      0,   0, 106,   8,   0,   1,
-     95,   0,   0,   3, 242,  16,
-     16,   0,   0,   0,   0,   0,
-     95,   0,   0,   3, 242,  16,
-     16,   0,   1,   0,   0,   0,
-    103,   0,   0,   4, 242,  32,
-     16,   0,   0,   0,   0,   0,
-      1,   0,   0,   0, 101,   0,
-      0,   3, 242,  32,  16,   0,
-      1,   0,   0,   0,  54,   0,
-      0,   5, 242,  32,  16,   0,
-      0,   0,   0,   0,  70,  30,
-     16,   0,   0,   0,   0,   0,
-     54,   0,   0,   5, 242,  32,
-     16,   0,   1,   0,   0,   0,
-     70,  30,  16,   0,   1,   0,
-      0,   0,  62,   0,   0,   1
-};
--- a/include/private/list.h
+++ b/include/private/list.h
@@ -150,8 +150,8 @@ static inline unsigned int list_count( const struct list *list )
    return count;
 }

-/* move all elements from src to the tail of dst */
-static inline void list_move_tail( struct list *dst, struct list *src )
+/* move all elements from src to before the specified element */
+static inline void list_move_before( struct list *dst, struct list *src )
 {
    if (list_empty(src)) return;

@@ -162,8 +162,8 @@ static inline void list_move_tail( struct list *dst, struct list *src )
    list_init(src);
 }

-/* move all elements from src to the head of dst */
-static inline void list_move_head( struct list *dst, struct list *src )
+/* move all elements from src to after the specified element */
+static inline void list_move_after( struct list *dst, struct list *src )
 {
    if (list_empty(src)) return;

@@ -174,6 +174,18 @@ static inline void list_move_head( struct list *dst, struct list *src )
    list_init(src);
 }

+/* move all elements from src to the head of dst */
+static inline void list_move_head( struct list *dst, struct list *src )
+{
+    list_move_after( dst, src );
+}
+
+/* move all elements from src to the tail of dst */
+static inline void list_move_tail( struct list *dst, struct list *src )
+{
+    list_move_before( dst, src );
+}
+
 /* iterate through the list */
 #define LIST_FOR_EACH(cursor,list) \
    for ((cursor) = (list)->next; (cursor) != (list); (cursor) = (cursor)->next)
--- a/include/private/vkd3d_common.h
+++ b/include/private/vkd3d_common.h
@@ -27,6 +27,7 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>

 #ifdef _MSC_VER
 #include <intrin.h>
@@ -53,14 +54,32 @@ static inline size_t align(size_t addr, size_t alignment)

 #ifdef __GNUC__
 # define VKD3D_NORETURN __attribute__((noreturn))
-# define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args)))
+# ifdef __MINGW_PRINTF_FORMAT
+#  define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(__MINGW_PRINTF_FORMAT, fmt, args)))
+# else
+#  define VKD3D_PRINTF_FUNC(fmt, args) __attribute__((format(printf, fmt, args)))
+# endif
 # define VKD3D_UNUSED __attribute__((unused))
+# define VKD3D_UNREACHABLE __builtin_unreachable()
 #else
 # define VKD3D_NORETURN
 # define VKD3D_PRINTF_FUNC(fmt, args)
 # define VKD3D_UNUSED
+# define VKD3D_UNREACHABLE (void)0
 #endif  /* __GNUC__ */

+VKD3D_NORETURN static inline void vkd3d_unreachable_(const char *filename, unsigned int line)
+{
+    fprintf(stderr, "%s:%u: Aborting, reached unreachable code.\n", filename, line);
+    abort();
+}
+
+#ifdef NDEBUG
+#define vkd3d_unreachable() VKD3D_UNREACHABLE
+#else
+#define vkd3d_unreachable() vkd3d_unreachable_(__FILE__, __LINE__)
+#endif
+
 static inline unsigned int vkd3d_popcount(unsigned int v)
 {
 #ifdef _MSC_VER
@@ -210,6 +229,10 @@ static inline LONG InterlockedIncrement(LONG volatile *x)
 {
    return __sync_add_and_fetch(x, 1);
 }
+static inline LONG64 InterlockedIncrement64(LONG64 volatile *x)
+{
+    return __sync_add_and_fetch(x, 1);
+}
 static inline LONG InterlockedAdd(LONG volatile *x, LONG val)
 {
    return __sync_add_and_fetch(x, val);
@@ -242,4 +265,74 @@ static inline void vkd3d_parse_version(const char *version, int *major, int *min

 HRESULT hresult_from_vkd3d_result(int vkd3d_result);

+#ifdef _WIN32
+static inline void *vkd3d_dlopen(const char *name)
+{
+    return LoadLibraryA(name);
+}
+
+static inline void *vkd3d_dlsym(void *handle, const char *symbol)
+{
+    return GetProcAddress(handle, symbol);
+}
+
+static inline int vkd3d_dlclose(void *handle)
+{
+    return FreeLibrary(handle);
+}
+
+static inline const char *vkd3d_dlerror(void)
+{
+    unsigned int error = GetLastError();
+    static char message[256];
+
+    if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, message, sizeof(message), NULL))
+        return message;
+    sprintf(message, "Unknown error %u.\n", error);
+    return message;
+}
+#elif defined(HAVE_DLFCN_H)
+#include <dlfcn.h>
+
+static inline void *vkd3d_dlopen(const char *name)
+{
+    return dlopen(name, RTLD_NOW);
+}
+
+static inline void *vkd3d_dlsym(void *handle, const char *symbol)
+{
+    return dlsym(handle, symbol);
+}
+
+static inline int vkd3d_dlclose(void *handle)
+{
+    return dlclose(handle);
+}
+
+static inline const char *vkd3d_dlerror(void)
+{
+    return dlerror();
+}
+#else
+static inline void *vkd3d_dlopen(const char *name)
+{
+    return NULL;
+}
+
+static inline void *vkd3d_dlsym(void *handle, const char *symbol)
+{
+    return NULL;
+}
+
+static inline int vkd3d_dlclose(void *handle)
+{
+    return 0;
+}
+
+static inline const char *vkd3d_dlerror(void)
+{
+    return "Not implemented for this platform.\n";
+}
+#endif
+
 #endif  /* __VKD3D_COMMON_H */
--- a/Show More
+++ b/Show More