Release 1.9.

It was originally intended that this structure could hold other information
about the next stage which compilation might depend on. For example, compilation
to GLSL needs to know the type of the next shader in some circumstances.

That was never actualized, and since the API is fixed at this point for 1.9, it
makes the most sense to rename the structure to match its actual scope.

The documentation was written and arranged to imply that the structure would
hold other information about the next shader than the varying map; this is
changed accordingly as well.

.gitignore

@@ -10,6 +10,7 @@ Makefile
 Makefile.in
 test-suite.log
 /vkd3d-compiler
+/vkd3d-dxbc
 
 vkd3d-*.tar.xz
 

.gitlab-ci.yml

@@ -0,0 +1,7 @@
+stages:
+  - image
+  - build
+
+include:
+  - local: "/gitlab/image.yml"
+  - local: "/gitlab/build.yml"

ANNOUNCE

@@ -1,16 +1,16 @@
-The Wine team is proud to announce that release 1.5 of vkd3d, the Direct3D to
+The Wine team is proud to announce that release 1.9 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:
 
-  - Support for various HLSL features and intrinsics.
-  - Typed unordered access view loads of multicomponent formats.
+  - Yet more improvements to the HLSL compiler.
+  - A new utility to inspect the contents of DXBC blobs.
   - Miscellaneous bug fixes.
 
 The source is available from the following location:
 
-  https://dl.winehq.org/vkd3d/source/vkd3d-1.5.tar.xz
+  https://dl.winehq.org/vkd3d/source/vkd3d-1.9.tar.xz
 
 The current source can also be pulled directly from the git repository:
 
@@ -21,30 +21,83 @@ for the complete list.
 
 ----------------------------------------------------------------
 
-What's new in vkd3d 1.5
+What's new in vkd3d 1.9
 =======================
 
 
+*** libvkd3d
+
+- Copying between depth/stencil and colour formats in
+  ID3D12GraphicsCommandList::CopyResource() is supported.
+- The ID3D12Fence1 interface is supported.
+
+
 *** libvkd3d-shader
 
+- vkd3d_shader_scan() supports retrieving descriptor information for `d3dbc'
+  shaders. This is one of the requirements for eventual SPIR-V generation from
+  `d3dbc' sources.
+
 - New features for the HLSL source type:
-  - Improved support for HLSL object types (like e.g. `Texture2D') inside
-    structures and arrays.
-  - Implicitly sized array initialisers.
-  - Support for the dot() intrinsic function.
-  - Support for the ldexp() intrinsic function.
-  - Support for the lerp() intrinsic function.
-  - Support for the logical `and', `or', and `not' operators in shader model 4
-    and 5 targets.
-  - Support for casts from `bool' types in shader model 4 and 5 targets.
-  - Constant folding for integer bitwise operations.
-  - Constant folding for integer min() and max().
+  - Support for the following intrinsic functions:
+    - clip()
+    - ddx_coarse() and ddy_coarse()
+    - ddx_fine() and ddy_fine()
+    - tex1D(), tex2D(), texCUBE(), and tex3D()
+  - Constant folding support for more expression types. In particular:
+    - comparison operators
+    - floating-point min() and max()
+    - logical `and' and `or'
+    - dot products
+    - square roots
+    - logarithms
+  - Support for multi-sample texture object declarations without explicit
+    sample counts in shader model 4.1 and later shaders.
+  - Support for using constant expressions as sample counts in multi-sample
+    texture object declarations.
+  - Support for variable initialisers using variables declared earlier in the
+    same declaration list. E.g., `float a = 1, b = a, c = b + 1;'.
+  - The GetDimensions() texture object method is implemented.
+  - Matrix swizzles are implemented.
+  - Parser support for if-statement attributes like `[branch]' and
+    `[flatten]'.
+  - Support for the `inline' function modifier.
+
+- Previously, vkd3d_shader_compile() would in some cases return VKD3D_OK
+  despite compilation failing when targeting legacy Direct3D bytecode. These
+  cases have been fixed.
+
+- Various HLSL preprocessor fixes for edge cases related to stringification.
+
+- SPIR-V target support for the `linear noperspective centroid' input
+  interpolation mode.
 
 - New interfaces:
-  - The VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV compile option can be used to
-    specify the SPIR-V format to use for typed unordered access view loads.
-    When set to `Unknown', and the `shaderStorageImageReadWithoutFormat'
-    feature is enabled in the target environment, this allows typed loads from
-    multicomponent format unordered access views. If left unspecified, a R32
-    format will be used, like in previous versions of libvkd3d-shader.
+  - The vkd3d_shader_scan_signature_info structure extends the
+    vkd3d_shader_compile_info structure, and can be used to retrieve
+    descriptions of `dxbc-tpf' and `d3dbc' shader inputs and outputs.
+  - vkd3d_shader_free_scan_signature_info() is used to free
+    vkd3d_shader_scan_signature_info structures.
+  - The VKD3D_SHADER_COMPILE_OPTION_PACK_MATRIX_ORDER compile option can be
+    used to specify the default matrix packing order for HLSL sources.
+  - The vkd3d_shader_varying_map_info structure extends the
+    vkd3d_shader_compile_info structure, and can be used to specify a mapping
+    between the outputs of a shader stage and the inputs of the next shader
+    stage.
+  - vkd3d_shader_build_varying_map() is used to build a mapping between the
+    outputs of a shader stage and the inputs of the next shader stage.
+  - The VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_RAW_BUFFER flag returned as part of
+    the vkd3d_shader_descriptor_info structure indicates the descriptor refers
+    to a byte-addressed (`raw') buffer resource.
 
+
+*** vkd3d-compiler
+
+- The `--matrix-storage-order' option can used to specify the default matrix
+  storage order for HLSL sources.
+
+
+*** vkd3d-dxbc
+
+- vkd3d-dxbc is a new utility that can be used to inspect the contents of DXBC
+  blobs.

AUTHORS

@@ -1,12 +1,17 @@
 Alexandre Julliard
+Alistair Leslie-Hughes
 Andrew Eikum
 Andrey Gusev
 Atharva Nimbalkar
 Biswapriyo Nath
+Brendan Shanks
 Chip Davis
 Conor McCarthy
 David Gow
 Derek Lesho
+Ethan Lee
+Evan Tang
+Fabian Maurer
 Francisco Casas
 Francois Gouget
 Giovanni Mascellani
@@ -14,6 +19,7 @@ Hans-Kristian Arntzen
 Henri Verbeet
 Isabella Bosia
 Jactry Zeng
+Jan Sikorski
 Joshua Ashton
 Józef Kucia
 Martin Storsjö

COPYING

@@ -1,4 +1,4 @@
-Copyright 2016-2022 the Vkd3d project authors (see the file AUTHORS for a
+Copyright 2016-2023 the Vkd3d project authors (see the file AUTHORS for a
 complete list)
 
 Vkd3d is free software; you can redistribute it and/or modify it under

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 \
@@ -51,99 +42,157 @@ vkd3d_cross_tests = \
 	tests/hlsl_d3d12
 
 vkd3d_shader_tests = \
-	tests/abs.shader_test \
-	tests/arithmetic-float.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-to-float.shader_test \
-	tests/cast-to-half.shader_test \
-	tests/cast-to-int.shader_test \
-	tests/cast-to-uint.shader_test \
-	tests/conditional.shader_test \
-	tests/floor.shader_test \
-	tests/hlsl-array-dimension.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 \
-	tests/hlsl-function-cast.shader_test \
-	tests/hlsl-function-overload.shader_test \
-	tests/hlsl-gather-offset.shader_test \
-	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-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-numeric-constructor-truncation.shader_test \
-	tests/hlsl-numeric-types.shader_test \
-	tests/hlsl-return-implicit-conversion.shader_test \
-	tests/hlsl-return-void.shader_test \
-	tests/hlsl-shape.shader_test \
-	tests/hlsl-single-numeric-initializer.shader_test \
-	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/multiple-rt.shader_test \
-	tests/nointerpolation.shader_test \
-	tests/object-references.shader_test
-	tests/pow.shader_test \
+	tests/hlsl/abs.shader_test \
+	tests/hlsl/all.shader_test \
+	tests/hlsl/any.shader_test \
+	tests/hlsl/arithmetic-float-uniform.shader_test \
+	tests/hlsl/arithmetic-float.shader_test \
+	tests/hlsl/arithmetic-int-uniform.shader_test \
+	tests/hlsl/arithmetic-int.shader_test \
+	tests/hlsl/arithmetic-uint.shader_test \
+	tests/hlsl/array-dimension.shader_test \
+	tests/hlsl/array-index-expr.shader_test \
+	tests/hlsl/array-parameters.shader_test \
+	tests/hlsl/array-size-expr.shader_test \
+	tests/hlsl/asfloat.shader_test \
+	tests/hlsl/asuint.shader_test \
+	tests/hlsl/attributes.shader_test \
+	tests/hlsl/bitwise.shader_test \
+	tests/hlsl/bool-cast.shader_test \
+	tests/hlsl/bool-semantics.shader_test \
+	tests/hlsl/cast-broadcast.shader_test \
+	tests/hlsl/cast-componentwise-compatible.shader_test \
+	tests/hlsl/cast-componentwise-equal.shader_test \
+	tests/hlsl/cast-to-float.shader_test \
+	tests/hlsl/cast-to-half.shader_test \
+	tests/hlsl/cast-to-int.shader_test \
+	tests/hlsl/cast-to-uint.shader_test \
+	tests/hlsl/cbuffer.shader_test \
+	tests/hlsl/clamp.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/cross.shader_test \
+	tests/hlsl/d3dcolor-to-ubyte4.shader_test \
+	tests/hlsl/ddxddy.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/entry-point-semantics.shader_test \
+	tests/hlsl/exp.shader_test \
+	tests/hlsl/expr-indexing.shader_test \
+	tests/hlsl/floor.shader_test \
+	tests/hlsl/fmod.shader_test \
+	tests/hlsl/for.shader_test \
+	tests/hlsl/frac.shader_test \
+	tests/hlsl/function-cast.shader_test \
+	tests/hlsl/function-overload.shader_test \
+	tests/hlsl/function-return.shader_test \
+	tests/hlsl/function.shader_test \
+	tests/hlsl/gather-offset.shader_test \
+	tests/hlsl/gather.shader_test \
+	tests/hlsl/getdimensions.shader_test \
+	tests/hlsl/initializer-flatten.shader_test \
+	tests/hlsl/initializer-implicit-array.shader_test \
+	tests/hlsl/initializer-invalid-arg-count.shader_test \
+	tests/hlsl/initializer-local-array.shader_test \
+	tests/hlsl/initializer-matrix.shader_test \
+	tests/hlsl/initializer-multi.shader_test \
+	tests/hlsl/initializer-nested.shader_test \
+	tests/hlsl/initializer-numeric.shader_test \
+	tests/hlsl/initializer-objects.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/is-front-face.shader_test \
+	tests/hlsl/ldexp.shader_test \
+	tests/hlsl/length.shader_test \
+	tests/hlsl/lerp.shader_test \
+	tests/hlsl/lit.shader_test \
+	tests/hlsl/load-level.shader_test \
+	tests/hlsl/log.shader_test \
+	tests/hlsl/logic-operations.shader_test \
+	tests/hlsl/loop.shader_test \
+	tests/hlsl/majority-pragma.shader_test \
+	tests/hlsl/majority-syntax.shader_test \
+	tests/hlsl/majority-typedef.shader_test \
+	tests/hlsl/math.shader_test \
+	tests/hlsl/matrix-indexing.shader_test \
+	tests/hlsl/matrix-semantics.shader_test \
+	tests/hlsl/max.shader_test \
+	tests/hlsl/minimum-precision.shader_test \
+	tests/hlsl/mul.shader_test \
+	tests/hlsl/multiple-rt.shader_test \
+	tests/hlsl/nested-arrays.shader_test \
+	tests/hlsl/nointerpolation.shader_test \
+	tests/hlsl/normalize.shader_test \
+	tests/hlsl/numeric-constructor-truncation.shader_test \
+	tests/hlsl/numeric-types.shader_test \
+	tests/hlsl/numthreads.shader_test \
+	tests/hlsl/object-field-offsets.shader_test \
+	tests/hlsl/object-parameters.shader_test \
+	tests/hlsl/object-references.shader_test \
+	tests/hlsl/pow.shader_test \
+	tests/hlsl/reflect.shader_test \
+	tests/hlsl/register-reservations.shader_test \
+	tests/hlsl/return-implicit-conversion.shader_test \
+	tests/hlsl/return.shader_test \
+	tests/hlsl/round.shader_test \
+	tests/hlsl/sample-bias.shader_test \
+	tests/hlsl/sample-grad.shader_test \
+	tests/hlsl/sample-level.shader_test \
+	tests/hlsl/sampler-offset.shader_test \
+	tests/hlsl/sampler.shader_test \
+	tests/hlsl/saturate.shader_test \
+	tests/hlsl/shader-interstage-interface.shader_test \
+	tests/hlsl/shape.shader_test \
+	tests/hlsl/side-effects.shader_test \
+	tests/hlsl/sign.shader_test \
+	tests/hlsl/single-numeric-initializer.shader_test \
+	tests/hlsl/smoothstep.shader_test \
+	tests/hlsl/sqrt.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/struct-array.shader_test \
+	tests/hlsl/struct-assignment.shader_test \
+	tests/hlsl/struct-semantics.shader_test \
+	tests/hlsl/swizzle-constant-prop.shader_test \
+	tests/hlsl/swizzle-matrix.shader_test \
+	tests/hlsl/swizzles.shader_test \
+	tests/hlsl/ternary.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/transpose.shader_test \
+	tests/hlsl/trigonometry.shader_test \
+	tests/hlsl/trunc.shader_test \
+	tests/hlsl/type-names.shader_test \
+	tests/hlsl/uav-load.shader_test \
+	tests/hlsl/uav-out-param.shader_test \
+	tests/hlsl/uav-rwbuffer.shader_test \
+	tests/hlsl/uav-rwstructuredbuffer.shader_test \
+	tests/hlsl/uav-rwtexture.shader_test \
+	tests/hlsl/uniform-semantics.shader_test \
+	tests/hlsl/vector-indexing-uniform.shader_test \
+	tests/hlsl/vector-indexing.shader_test \
+	tests/hlsl/writemask-assignop-0.shader_test \
+	tests/hlsl/writemask-assignop-1.shader_test \
+	tests/hlsl/writemask-assignop-2.shader_test \
+	tests/hlsl/writemask-assignop-3.shader_test \
+	tests/preproc-if-expr.shader_test \
 	tests/preproc-if.shader_test \
 	tests/preproc-ifdef.shader_test \
-	tests/preproc-if-expr.shader_test \
 	tests/preproc-invalid.shader_test \
 	tests/preproc-macro.shader_test \
-	tests/preproc-misc.shader_test \
-	tests/round.shader_test \
-	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 \
-	tests/swizzle-3.shader_test \
-	tests/swizzle-4.shader_test \
-	tests/swizzle-5.shader_test \
-	tests/swizzle-6.shader_test \
-	tests/swizzle-7.shader_test \
-	tests/texture-load.shader_test \
-	tests/texture-load-typed.shader_test \
-	tests/trigonometry.shader_test \
-	tests/uav.shader_test \
-	tests/writemask-assignop-0.shader_test \
-	tests/writemask-assignop-1.shader_test \
-	tests/writemask-assignop-2.shader_test \
-	tests/writemask-assignop-3.shader_test
+	tests/preproc-misc.shader_test
 
 vkd3d_test_headers = \
 	tests/d3d12_crosstest.h \
@@ -172,6 +221,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
 
@@ -225,24 +275,24 @@ libvkd3d_shader_la_SOURCES = \
 	include/private/vkd3d_memory.h \
 	include/vkd3d_shader.h \
 	libs/vkd3d-shader/checksum.c \
+	libs/vkd3d-shader/d3d_asm.c \
 	libs/vkd3d-shader/d3dbc.c \
 	libs/vkd3d-shader/dxbc.c \
+	libs/vkd3d-shader/dxil.c \
 	libs/vkd3d-shader/glsl.c \
 	libs/vkd3d-shader/hlsl.c \
 	libs/vkd3d-shader/hlsl.h \
 	libs/vkd3d-shader/hlsl_codegen.c \
 	libs/vkd3d-shader/hlsl_constant_ops.c \
-	libs/vkd3d-shader/hlsl_sm1.c \
-	libs/vkd3d-shader/hlsl_sm4.c \
+	libs/vkd3d-shader/ir.c \
 	libs/vkd3d-shader/preproc.h \
-	libs/vkd3d-shader/sm4.h \
 	libs/vkd3d-shader/spirv.c \
-	libs/vkd3d-shader/trace.c \
+	libs/vkd3d-shader/tpf.c \
 	libs/vkd3d-shader/vkd3d_shader.map \
 	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 4:0:3
+libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 8:0:7
 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
@@ -260,8 +310,9 @@ libvkd3d_la_SOURCES = \
 	include/private/vkd3d_common.h \
 	include/private/vkd3d_debug.h \
 	include/private/vkd3d_memory.h \
-	include/private/vkd3d_utf8.h \
+	include/private/vkd3d_shader_utils.h \
 	include/private/vkd3d_test.h \
+	include/private/vkd3d_utf8.h \
 	include/vkd3d_d3d12.idl \
 	include/vkd3d_d3dcommon.idl \
 	include/vkd3d_unknown.idl \
@@ -276,7 +327,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 6:0:5
+libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 10:0:9
 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
@@ -288,7 +339,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 4:1:3
+libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:5: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
@@ -306,11 +357,16 @@ EXTRA_DIST += \
 	libs/vkd3d-shader/libvkd3d-shader.pc.in \
 	libs/vkd3d-utils/libvkd3d-utils.pc.in
 
-bin_PROGRAMS = vkd3d-compiler
+bin_PROGRAMS = vkd3d-compiler vkd3d-dxbc
+
 vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c
 vkd3d_compiler_CFLAGS = $(AM_CFLAGS) @NCURSES_CFLAGS@
 vkd3d_compiler_LDADD = libvkd3d-shader.la @NCURSES_LIBS@
 
+vkd3d_dxbc_SOURCES = programs/vkd3d-dxbc/main.c
+vkd3d_dxbc_CFLAGS = $(AM_CFLAGS) @NCURSES_CFLAGS@
+vkd3d_dxbc_LDADD = libvkd3d-shader.la @NCURSES_LIBS@
+
 LDADD = libvkd3d.la libvkd3d-shader.la libvkd3d-utils.la
 AM_DEFAULT_SOURCE_EXT = .c
 
@@ -325,6 +381,8 @@ 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_d3d9.c \
+	tests/shader_runner_d3d11.c \
 	tests/shader_runner_d3d12.c \
 	tests/shader_runner_vulkan.c
 tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@
@@ -339,11 +397,11 @@ 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
@@ -366,8 +424,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' \
@@ -408,7 +464,7 @@ dummy-vkd3d-version:
 ## Cross-compile tests
 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
+CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 -DVKD3D_CROSSTEST=1
 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def)
 EXTRA_DIST += tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c
 

README

@@ -15,8 +15,8 @@ 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
 you are building from git, then they will be generated at build-time using
 widl. By default, vkd3d will use the widl found in `PATH'. If widl is not
-available or is not recent (>= 3.20), then you can build Wine with `make
-tools/widl' to avoid building all of Wine. You can then point vkd3d's
+available or is not recent (>= 3.21), then you can build Wine with `make
+tools/widl/widl' to avoid building all of Wine. You can then point vkd3d's
 configure at that widl binary with `WIDL="/path/to/widl"'.
 
 For release builds, you may want to define NDEBUG. If you do not need debug log
@@ -47,8 +47,8 @@ commas or semicolons.
 
  * NO_COLOR - this is an alias of NO_COLOUR.
 
- * NO_COLOUR - when set, vkd3d-compiler will default to monochrome output,
-   even when the output supports colour.
+ * NO_COLOUR - when set, vkd3d-compiler and vkd3d-dxbc will default to
+   monochrome output, 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
@@ -82,3 +82,14 @@ commas or semicolons.
    conditions in tests.
 
  * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests.
+
+================
+Developing vkd3d
+================
+
+Development of vkd3d happens on the Wine GitLab instance
+(https://gitlab.winehq.org/wine/vkd3d/). Contributors are encouraged
+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.

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([vkd3d],[1.5])
+AC_INIT([vkd3d],[1.9])
 
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])
@@ -27,14 +27,16 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_SED
 AC_PROG_MKDIR_P
-VKD3D_PROG_WIDL(3, 20)
+VKD3D_PROG_WIDL(3, 21)
 AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])])
 
 AC_CHECK_PROGS([FLEX], [flex], [none])
 AS_IF([test "$FLEX" = "none"], [AC_MSG_ERROR([no suitable flex found. Please install the 'flex' package.])])
+AC_ARG_VAR([LFLAGS], [extra flags for flex])
 
 AC_CHECK_PROGS([BISON], [bison], [none])
 AS_IF([test "$BISON" = "none"], [AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.])])
+AC_ARG_VAR([YFLAGS], [extra flags for bison])
 
 DX_PS_FEATURE([OFF])
 DX_INIT_DOXYGEN([vkd3d], [Doxyfile], [doc])
@@ -140,6 +142,9 @@ VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popco
 VKD3D_CHECK_FUNC([HAVE_BUILTIN_ADD_OVERFLOW], [__builtin_add_overflow], [__builtin_add_overflow(0, 0, (int *)0)])
 VKD3D_CHECK_FUNC([HAVE_SYNC_ADD_AND_FETCH], [__sync_add_and_fetch], [__sync_add_and_fetch((int *)0, 0)])
 VKD3D_CHECK_FUNC([HAVE_SYNC_SUB_AND_FETCH], [__sync_sub_and_fetch], [__sync_sub_and_fetch((int *)0, 0)])
+VKD3D_CHECK_FUNC([HAVE_SYNC_BOOL_COMPARE_AND_SWAP], [__sync_bool_compare_and_swap], [__sync_bool_compare_and_swap((int *)0, 0, 0)])
+VKD3D_CHECK_FUNC([HAVE_ATOMIC_EXCHANGE_N], [__atomic_exchange_n], [__atomic_exchange_n((int *)0, 0, 0)])
+VKD3D_CHECK_FUNC([HAVE_GETTID], [gettid], [gettid()])
 
 dnl Makefiles
 case $host_os in

demos/demo_win32.h

@@ -18,6 +18,7 @@
  */
 
 #include <vkd3d_dxgi1_4.h>
+#include <vkd3d_d3dcompiler.h>
 #include <stdbool.h>
 #include <stdio.h>
 

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_5
+#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_9
 #include "config.h"
 #include <vkd3d.h>
 #include <vkd3d_utils.h>
@@ -113,6 +113,9 @@ struct demo_swapchain
     VkDevice vk_device;
     ID3D12CommandQueue *command_queue;
 
+    ID3D12Fence *present_fence;
+    unsigned long long present_count;
+
     uint32_t current_buffer;
     unsigned int buffer_count;
     ID3D12Resource *buffers[1];
@@ -529,6 +532,17 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c
     }
     swapchain->buffer_count = image_count;
     free(vk_images);
+
+    if (FAILED(ID3D12Device_CreateFence(d3d12_device, 0, 0, &IID_ID3D12Fence, (void **)&swapchain->present_fence)))
+    {
+        for (i = 0; i < image_count; ++i)
+        {
+            ID3D12Resource_Release(swapchain->buffers[i]);
+        }
+        free(swapchain);
+        goto fail;
+    }
+    swapchain->present_count = 0;
     ID3D12Device_Release(d3d12_device);
 
     ID3D12CommandQueue_AddRef(swapchain->command_queue = command_queue);
@@ -574,6 +588,12 @@ static inline void demo_swapchain_present(struct demo_swapchain *swapchain)
     present_desc.pImageIndices = &swapchain->current_buffer;
     present_desc.pResults = NULL;
 
+    /* Synchronize vkd3d_acquire_vk_queue() with the Direct3D 12 work
+     * already submitted to the command queue. */
+    ++swapchain->present_count;
+    ID3D12CommandQueue_Signal(swapchain->command_queue, swapchain->present_fence, swapchain->present_count);
+    ID3D12Fence_SetEventOnCompletion(swapchain->present_fence, swapchain->present_count, NULL);
+
     vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue);
     vkQueuePresentKHR(vk_queue, &present_desc);
     vkd3d_release_vk_queue(swapchain->command_queue);
@@ -589,6 +609,7 @@ static inline void demo_swapchain_destroy(struct demo_swapchain *swapchain)
     unsigned int i;
 
     ID3D12CommandQueue_Release(swapchain->command_queue);
+    ID3D12Fence_Release(swapchain->present_fence);
     for (i = 0; i < swapchain->buffer_count; ++i)
     {
         ID3D12Resource_Release(swapchain->buffers[i]);

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,

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;
-}

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";

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
-};

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
-};

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
-};

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));

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;
-}

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";

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
-};