Release 1.8.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>

.gitignore

@@ -19,7 +19,10 @@ vkd3d-*.tar.xz
 *.log
 *.o
 *.pc
+*.tab.c
+*.tab.h
 *.trs
+*.yy.c
 *~
 
 .deps

ANNOUNCE

@@ -1,192 +1,93 @@
-The Wine team is proud to announce that release 1.2 of vkd3d, the Direct3D to
+The Wine team is proud to announce that release 1.8 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:
 
-  - Availability of libvkd3d-shader as a public library.
-  - Support for tessellation shaders.
-  - Version 1.1 root signatures.
-  - Stream output support.
+  - Support for still many more HLSL features and intrinsics.
+  - Performance improvements to vkd3d descriptor updates.
+  - Miscellaneous bug fixes.
 
 The source is available from the following location:
 
-  https://dl.winehq.org/vkd3d/source/vkd3d-1.2.tar.xz
+  https://dl.winehq.org/vkd3d/source/vkd3d-1.8.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.2
+What's new in vkd3d 1.8
 =======================
 
 
 *** libvkd3d
 
-- Newly implemented Direct3D 12 features:
-  - Multi-sampling.
-  - Reserved resources.
-  - Instance data step rates. This requires the
-    VK_EXT_vertex_attribute_divisor extension.
-  - `Private data' APIs for all interfaces.
-  - Shader-resource view component mappings.
-  - Indirect indexed draws.
-  - Indirect draws with a count buffer. This requires the
-    VK_KHR_draw_indirect_count extension.
-  - Stream output and stream output queries. This requires the
-    VK_EXT_transform_feedback extension.
-  - Predicated/conditional rendering.
-  - Primitive restart.
-  - Depth rendering without a pixel shader.
-  - Depth clipping. This requires the VK_EXT_depth_clip_enable extension.
-  - Rasteriser discard.
-  - Dual-source blending.
-  - Mapping placed resources.
-  - The ReadFromSubresource() and WriteToSubresource() ID3D12Resource methods.
-  - Simultaneous access to resources from multiple queues.
-  - Null-views. I.e., views without an underlying resource.
-  - Several more feature support queries.
+- Performance improvements have been made to the code that handles descriptor
+  updates. In some applications the improvement can be quite significant.
 
-- New interfaces:
-  - vkd3d_serialize_versioned_root_signature() and
-    vkd3d_create_versioned_root_signature_deserializer() provide support for
-    versioned root signatures.
-  - The vkd3d_application_info structure extends the
-    vkd3d_instance_create_info structure, and can be used to pass information
-    about the application to libvkd3d. It is analogous to the
-    VkApplicationInfo structure in Vulkan. Its `api_version' field should be
-    set to the version of the libvkd3d API that the application targets.
-  - The vkd3d_optional_device_extensions_info structure extends the
-    vkd3d_device_create_info structure, and can be used to pass a list of
-    device extensions to enable only when available to libvkd3d. It is
-    analogous to the vkd3d_optional_instance_extensions_info structure for
-    instance extensions.
+- Host-visible descriptor heaps are persistently mapped on creation. Some
+  applications access resource data from the CPU after calling Unmap(), and
+  that's supposed to work in practice.
 
-- New environment variables:
-  - VKD3D_CONFIG can be used to set options that change the behaviour of
-    libvkd3d.
-  - VKD3D_TEST_BUG can be used to disable bug_if() conditions in the test
-    suite.
-  - VKD3D_TEST_FILTER can be used to control which tests are run.
-  - VKD3D_VULKAN_DEVICE can be used to override the Vulkan physical device
-    used by vkd3d.
-  See the README for more detailed descriptions and how to use these.
+- 1-dimensional texture unordered-access views and shader resource views are
+  implemented.
 
-- When the VK_KHR_dedicated_allocation extension is available, dedicated
-  allocations may be used for committed resources.
+- Shader resource view, unordered access view, and constant buffer view root
+  descriptors with NULL GPU addresses are supported.
 
-- When the VK_KHR_image_format_list extension is available, it will be used to
-  inform the driver about the view formats that a particular mutable Vulkan
-  image can be used with. This improves performance on some Vulkan
-  implementations.
-
-- When the VK_EXT_debug_marker extension is available, object names set with
-  the ID3D12Object SetName() method will be propagated to the underlying
-  Vulkan objects.
-
-- Unordered-access view clears are supported on more formats. Previously these
-  were limited to integer formats for texture resources, and single component
-  integer formats for buffer resources.
-
-- When the D24_UNORM_S8_UINT format is not supported by the Vulkan
-  implementation, the D32_SFLOAT_S8_UINT format will be used instead to
-  implement the D24_UNORM_S8_UINT and related DXGI formats. This is required
-  because the DXGI D24_UNORM_S8_UINT format is mandatory, while the Vulkan
-  D24_UNORM_S8_UINT format is optional.
-
-- Various bug fixes.
+- Direct3D 12 descriptor heap destruction is delayed until all contained
+  resources are destroyed.
 
 
 *** libvkd3d-shader
 
-- libvkd3d-shader is now available as a public instead of an internal library.
+- New features for the HLSL source type:
+  - Support for the ternary conditional operator "?:".
+  - Support for "discard" statements.
+  - Support for the "packoffset" keyword.
+  - Support for semantics on array types.
+  - Support for RWBuffer loads and stores.
+  - Register allocation for arrays and structures of resources and samplers
+    is implemented.
+  - Support for the SV_IsFrontFace pixel shader system-value semantics.
+  - Support for using constant expressions as array sizes and indices.
+  - Support for dynamic selection of vector components.
+  - Support for the following intrinsic functions:
+    - D3DCOLORtoUBYTE4()
+    - any()
+    - asfloat()
+    - ddx() and ddy()
+    - fmod()
+    - log(), log2(), and log10()
+    - sign()
+    - trunc()
+  - The SampleBias(), SampleCmp(), SampleCmpLevelZero(), and SampleGrad()
+    texture object methods are implemented.
+  - Support for the case-insensitive variants of the "vector" and "matrix"
+    data types.
+  - Parser support for the "unroll" loop attribute. A warning is output for
+    "unroll" without iteration count, and an error is output when an iteration
+    count is specified. Actual unrolling is not implemented yet.
+  - Parser support for RWStructuredBuffer resources.
+  - Parser support for SamplerComparisonState objects. Note that outputting
+    compiled effects is not supported yet, but parsing these allows shaders
+    containing SamplerComparisonState state objects to be compiled.
 
-- New features:
-  - Tessellation shaders.
-  - Root signature version 1.1 serialisation, deserialisation, and conversion.
-  - Multi-sample masks.
-  - Per-sample shading.
-  - Early depth/stencil test.
-  - Conservative depth output.
-  - Dual-source blending.
-  - Stream output.
-  - Viewport arrays.
+- More improvements to HLSL support for the Direct3D shader model 1/2/3
+  profiles.
 
-- Support for OpenGL SPIR-V target environments. This allows SPIR-V produced
-  by libvkd3d-shader to be used with GL_ARB_gl_spirv. This includes support
-  for OpenGL atomic counters and combined samplers.
+- The section alignment of DXBC blobs produced by
+  vkd3d_shader_serialize_dxbc() matches those produced by d3dcompiler more
+  closely.
 
-- Preliminary support for shader model 5.1 shaders. This is still a work in
-  progress. Notably, support for resource arrays is not yet implemented.
-
-- When the SPV_EXT_demote_to_helper_invocation is available, it will be used
-  to implement the `discard' shader instruction instead of using SpvOpKill. In
-  particular, this ensures the `deriv_rtx' and `deriv_rty' instruction return
-  accurate results after a (conditional) `discard' instruction.
-
-- Support for using SPIR-V specialisation constants for shader parameters.
-
-- Support for more shader instructions:
-  - bufinfo,
-  - eval_centroid,
-  - eval_sample_index,
-  - ld2ms,
-  - sample_b,
-  - sample_d,
-  - sample_info,
-  - samplepos.
-
-- When built against SPIRV-Tools, libvkd3d-shader can produce SPIR-V shaders
-  in text form.
-
-- libvkd3d-shader now has its own environment variable (VKD3D_SHADER_DEBUG) to
-  control debug output.
-
-- Various shader translation fixes.
-
-
-*** vkd3d-compiler
-
-- When supported by libvkd3d-shader, text form SPIR-V is available as a target
-  format, in addition to the existing binary form SPIR-V target format.
-
-- Input from standard input, and output to standard output is supported.
-
-
-*** libvkd3d-utils
-
-- To specify the libvkd3d API version to use when creating vkd3d instances,
-  define VKD3D_UTILS_API_VERSION to the desired version before including
-  vkd3d_utils.h. If VKD3D_UTILS_API_VERSION is not explicitly defined,
-  VKD3D_API_VERSION_1_0 will be used.
-
-- Support for versioned root signatures is provided by the
-  D3D12SerializeVersionedRootSignature() and
-  D3D12CreateVersionedRootSignatureDeserializer() entry points.
-
-
-*** build
-
-- The minimum required version of Vulkan-Headers and SPIRV-Headers for this
-  release is version 1.1.113.
-
-- The minimum required version of widl for this release is version 3.20.
-
-- If doxygen is available, it will be used to build API documentation. By
-  default, documentation will be generated in HTML and PDF formats.
-
-- If debug logs are not required or desired, defining VKD3D_NO_TRACE_MESSAGES
-  and VKD3D_NO_DEBUG_MESSAGES will prevent them from being included in the
-  build. For example, a release build may want to configure with
-  `CPPFLAGS="-DNDEBUG -DVKD3D_NO_TRACE_MESSAGES -DVKD3D_NO_DEBUG_MESSAGES"'.
-
-- Microsoft Windows is now a supported target platform. To create a build for
-  Windows, either cross-compile by configuring with an appropriate --host
-  option like for example `--host=x86_64-w64-mingw32', or build on Windows
-  itself using an environment like MSYS2 or Cygwin.
+- The "main" function for shaders produced by the SPIR-V target is always
+  terminated, even when the source was a TPF shader without explicit "ret"
+  instruction.
 
+- Relative addressing of shader input registers is supported by SPIR-V
+  targets.

AUTHORS

@@ -1,15 +1,33 @@
 Alexandre Julliard
 Andrew Eikum
+Andrey Gusev
+Atharva Nimbalkar
+Biswapriyo Nath
+Brendan Shanks
 Chip Davis
 Conor McCarthy
+David Gow
 Derek Lesho
+Ethan Lee
+Fabian Maurer
+Francisco Casas
+Francois Gouget
+Giovanni Mascellani
 Hans-Kristian Arntzen
 Henri Verbeet
 Isabella Bosia
 Jactry Zeng
+Jan Sikorski
+Joshua Ashton
 Józef Kucia
+Martin Storsjö
+Matteo Bruni
+Nikolay Sivov
 Philip Rebohle
 Rémi Bernon
+Robin Kertels
+Stefan Dösinger
 Sven Hesse
+Vinson Lee
 Zebediah Figura
 Zhiyi Zhang

COPYING

@@ -1,4 +1,4 @@
-Copyright 2016-2019 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

@@ -7,6 +7,7 @@ widl_headers = \
 	include/vkd3d_d3d12.h \
 	include/vkd3d_d3d12sdklayers.h \
 	include/vkd3d_d3dcommon.h \
+	include/vkd3d_d3dx9shader.h \
 	include/vkd3d_dxgi.h \
 	include/vkd3d_dxgi1_2.h \
 	include/vkd3d_dxgi1_3.h \
@@ -19,7 +20,10 @@ vkd3d_public_headers = \
 	include/vkd3d.h \
 	include/vkd3d_d3d12.h \
 	include/vkd3d_d3d12sdklayers.h \
+	include/vkd3d_d3d9types.h \
 	include/vkd3d_d3dcommon.h \
+	include/vkd3d_d3dcompiler.h \
+	include/vkd3d_d3dx9shader.h \
 	include/vkd3d_dxgibase.h \
 	include/vkd3d_dxgiformat.h \
 	include/vkd3d_shader.h \
@@ -27,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 \
@@ -43,15 +38,164 @@ vkd3d_tests = \
 
 vkd3d_cross_tests = \
 	tests/d3d12 \
-	tests/d3d12_invalid_usage
+	tests/d3d12_invalid_usage \
+	tests/hlsl_d3d12
+
+vkd3d_shader_tests = \
+	tests/abs.shader_test \
+	tests/all.shader_test \
+	tests/any.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/array-index-expr.shader_test \
+	tests/array-parameters.shader_test \
+	tests/asfloat.shader_test \
+	tests/asuint.shader_test \
+	tests/bitwise.shader_test \
+	tests/bool-semantics.shader_test \
+	tests/cast-broadcast.shader_test \
+	tests/cast-componentwise-compatible.shader_test \
+	tests/cast-componentwise-equal.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/ddxddy.shader_test \
+	tests/distance.shader_test \
+	tests/entry-point-semantics.shader_test \
+	tests/exp.shader_test \
+	tests/expr-indexing.shader_test \
+	tests/floor.shader_test \
+	tests/fmod.shader_test \
+	tests/frac.shader_test \
+	tests/function-return.shader_test \
+	tests/hlsl-array-dimension.shader_test \
+	tests/hlsl-array-size-expr.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-d3dcolor-to-ubyte4.shader_test \
+	tests/hlsl-discard.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-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-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-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-numthreads.shader_test \
+	tests/hlsl-return-implicit-conversion.shader_test \
+	tests/hlsl-shape.shader_test \
+	tests/hlsl-single-numeric-initializer.shader_test \
+	tests/hlsl-smoothstep.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-ternary.shader_test \
+	tests/hlsl-transpose.shader_test \
+	tests/hlsl-trunc.shader_test \
+	tests/hlsl-type-names.shader_test \
+	tests/hlsl-vector-indexing.shader_test \
+	tests/hlsl-vector-indexing-uniform.shader_test \
+	tests/lit.shader_test \
+	tests/load-level.shader_test \
+	tests/log.shader_test \
+	tests/logic-operations.shader_test \
+	tests/loop.shader_test \
+	tests/majority-syntax.shader_test \
+	tests/math.shader_test \
+	tests/matrix-semantics.shader_test \
+	tests/max.shader_test \
+	tests/minimum-precision.shader_test \
+	tests/multiple-rt.shader_test \
+	tests/nointerpolation.shader_test \
+	tests/object-field-offsets.shader_test \
+	tests/object-parameters.shader_test \
+	tests/object-references.shader_test \
+	tests/pow.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/reflect.shader_test \
+	tests/register-reservations.shader_test \
+	tests/return.shader_test \
+	tests/round.shader_test \
+	tests/sample-bias.shader_test \
+	tests/sample-grad.shader_test \
+	tests/sample-level.shader_test \
+	tests/sampler.shader_test \
+	tests/sampler-offset.shader_test \
+	tests/saturate.shader_test \
+	tests/shader-interstage-interface.shader_test \
+	tests/side-effects.shader_test \
+	tests/sign.shader_test \
+	tests/sqrt.shader_test \
+	tests/step.shader_test \
+	tests/swizzle-constant-prop.shader_test \
+	tests/swizzles.shader_test \
+	tests/texture-load.shader_test \
+	tests/texture-load-offset.shader_test \
+	tests/texture-load-typed.shader_test \
+	tests/trigonometry.shader_test \
+	tests/uav-load.shader_test \
+	tests/uav-out-param.shader_test \
+	tests/uav-rwbuffer.shader_test \
+	tests/uav-rwstructuredbuffer.shader_test \
+	tests/uav-rwtexture.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
 
 vkd3d_test_headers = \
 	tests/d3d12_crosstest.h \
-	tests/d3d12_test_utils.h
+	tests/d3d12_test_utils.h \
+	tests/shader_runner.h \
+	tests/utils.h \
+	tests/vulkan_procs.h
 
 vkd3d_demos = \
-	demos/gears \
-	demos/triangle
+	demos/vkd3d-gears \
+	demos/vkd3d-triangle
 
 vkd3d_demos_headers = \
 	demos/demo.h \
@@ -64,12 +208,57 @@ BUILT_SOURCES = $(widl_headers) \
 noinst_LTLIBRARIES = libvkd3d-common.la
 libvkd3d_common_la_SOURCES = \
 	include/private/vkd3d_debug.h \
+	libs/vkd3d-common/blob.c \
 	libs/vkd3d-common/debug.c \
+	libs/vkd3d-common/error.c \
 	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
 
+VKD3D_V_FLEX = $(vkd3d_v_flex_@AM_V@)
+vkd3d_v_flex_ = $(vkd3d_v_flex_@AM_DEFAULT_V@)
+vkd3d_v_flex_0 = @echo "  FLEX    " $@;
+vkd3d_v_flex_1 =
+
+VKD3D_V_BISON = $(vkd3d_v_bison_@AM_V@)
+vkd3d_v_bison_ = $(vkd3d_v_bison_@AM_DEFAULT_V@)
+vkd3d_v_bison_0 = @echo "  BISON   " $@;
+vkd3d_v_bison_1 =
+
+libs/vkd3d-shader/preproc.yy.c: libs/vkd3d-shader/preproc.l
+	@$(MKDIR_P) libs/vkd3d-shader
+	$(VKD3D_V_FLEX)$(FLEX) $(LFLAGS) -o $@ $<
+
+libs/vkd3d-shader/preproc.tab.c libs/vkd3d-shader/preproc.tab.h &: libs/vkd3d-shader/preproc.y
+	@$(MKDIR_P) libs/vkd3d-shader
+	$(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/preproc.tab.c $<
+
+libs/vkd3d-shader/hlsl.yy.c: $(srcdir)/libs/vkd3d-shader/hlsl.l
+	@$(MKDIR_P) libs/vkd3d-shader
+	$(VKD3D_V_FLEX)$(FLEX) $(LFLAGS) -o $@ $<
+
+libs/vkd3d-shader/hlsl.tab.c libs/vkd3d-shader/hlsl.tab.h &: libs/vkd3d-shader/hlsl.y
+	@$(MKDIR_P) libs/vkd3d-shader
+	$(VKD3D_V_BISON)$(BISON) $(YFLAGS) -d -o libs/vkd3d-shader/hlsl.tab.c $<
+
+BUILT_SOURCES += \
+	libs/vkd3d-shader/hlsl.tab.h \
+	libs/vkd3d-shader/preproc.tab.h
+
+vkd3d_shader_yyfiles = \
+	libs/vkd3d-shader/hlsl.tab.c \
+	libs/vkd3d-shader/hlsl.tab.h \
+	libs/vkd3d-shader/hlsl.yy.c \
+	libs/vkd3d-shader/preproc.tab.c \
+	libs/vkd3d-shader/preproc.tab.h \
+	libs/vkd3d-shader/preproc.yy.c
+
+CLEANFILES = $(vkd3d_shader_yyfiles)
+
+nodist_libvkd3d_shader_la_SOURCES = $(vkd3d_shader_yyfiles)
+
 libvkd3d_shader_la_SOURCES = \
 	include/private/list.h \
 	include/private/rbtree.h \
@@ -78,21 +267,37 @@ 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/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/ir.c \
+	libs/vkd3d-shader/preproc.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) @SPIRV_TOOLS_CFLAGS@
-libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
-libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@
+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 7:0:6
+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
 EXTRA_libvkd3d_shader_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-shader/vkd3d_shader.map
 endif
 
+EXTRA_DIST = \
+	libs/vkd3d-shader/hlsl.l \
+	libs/vkd3d-shader/hlsl.y \
+	libs/vkd3d-shader/preproc.l \
+	libs/vkd3d-shader/preproc.y
+
 libvkd3d_la_SOURCES = \
+	include/private/vkd3d_blob.h \
 	include/private/vkd3d_common.h \
 	include/private/vkd3d_debug.h \
 	include/private/vkd3d_memory.h \
@@ -111,7 +316,8 @@ libvkd3d_la_SOURCES = \
 	libs/vkd3d/vkd3d_private.h \
 	libs/vkd3d/vkd3d_shaders.h \
 	libs/vkd3d/vulkan_procs.h
-libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 3:0:2
+libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE
+libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 9:0:8
 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
@@ -122,19 +328,20 @@ libvkd3d_utils_la_SOURCES = \
 	libs/vkd3d-utils/vkd3d_utils.map \
 	libs/vkd3d-utils/vkd3d_utils_main.c \
 	libs/vkd3d-utils/vkd3d_utils_private.h
-libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1
-libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la @PTHREAD_LIBS@
+libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE
+libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:4: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
 EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map
 endif
 
-EXTRA_DIST = ANNOUNCE LICENSE
+EXTRA_DIST += ANNOUNCE LICENSE
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkginclude_HEADERS = $(vkd3d_public_headers)
 nodist_pkgconfig_DATA = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc
-CLEANFILES = libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc
+CLEANFILES += libvkd3d.pc libvkd3d-shader.pc libvkd3d-utils.pc
 EXTRA_DIST += \
 	libs/vkd3d/libvkd3d.pc.in \
 	libs/vkd3d-shader/libvkd3d-shader.pc.in \
@@ -142,32 +349,49 @@ EXTRA_DIST += \
 
 bin_PROGRAMS = vkd3d-compiler
 vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c
-vkd3d_compiler_LDADD = libvkd3d-shader.la
+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
+
 if BUILD_TESTS
-check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)
-TESTS = $(vkd3d_tests) $(vkd3d_cross_tests)
-tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@
-tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@
-tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@
+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@ @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_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@
 tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la
+SHADER_TEST_LOG_COMPILER = tests/shader_runner
 endif
 
+EXTRA_DIST += $(vkd3d_shader_tests)
+
 if BUILD_DEMOS
-DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@
-DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@
-noinst_PROGRAMS = $(vkd3d_demos)
+DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DL_LIBS@ @DEMO_LIBS@
+DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@
+bin_PROGRAMS += $(vkd3d_demos)
 
-demos_gears_CFLAGS = $(DEMOS_CFLAGS)
-demos_gears_LDADD = $(DEMOS_LDADD) -lm
+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_triangle_CFLAGS = $(DEMOS_CFLAGS)
-demos_triangle_LDADD = $(DEMOS_LDADD)
+demos_vkd3d_triangle_SOURCES = demos/triangle.c demos/triangle_hlsl.h
+demos_vkd3d_triangle_CFLAGS = $(DEMOS_CFLAGS)
+demos_vkd3d_triangle_LDADD = $(DEMOS_LDADD)
 endif
 
-EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers)
+noinst_HEADERS = $(vkd3d_test_headers) $(vkd3d_demos_headers)
 
 VKD3D_V_WIDL = $(vkd3d_v_widl_@AM_V@)
 vkd3d_v_widl_ = $(vkd3d_v_widl_@AM_DEFAULT_V@)
@@ -185,8 +409,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' \
@@ -227,17 +449,34 @@ 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}
+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
+
+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
 
 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:=.cross32.exe)
-CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES)
+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
@@ -249,8 +488,14 @@ $(CROSS32_IMPLIBS): %.cross32.a: %.cross32.def
 
 $(CROSS32_EXEFILES): %.cross32.exe: %.c $(CROSS32_IMPLIBS) $(widl_headers)
 	$(AM_V_CCLD)depbase=`echo $@ | $(SED) 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \
-	$(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS32_IMPLIBS) -ldxgi -lgdi32 && \
+	$(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS32_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \
 	$(am__mv) $$depbase.Tpo $$depbase.Po
+
+tests/shader_runner.cross32.exe: $(shader_runner_cross_sources) $(CROSS32_IMPLIBS) $(widl_headers)
+	$(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \
+	$(CROSS32_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $(shader_runner_cross_sources) $(CROSS32_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \
+	$(am__mv) $$depbase.Tpo $$depbase.Po
+
 else
 crosstest32:
 endif
@@ -259,10 +504,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:=.cross64.exe)
-CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES)
+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
@@ -274,8 +529,14 @@ $(CROSS64_IMPLIBS): %.cross64.a: %.cross64.def
 
 $(CROSS64_EXEFILES): %.cross64.exe: %.c $(CROSS64_IMPLIBS) $(widl_headers)
 	$(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \
-	$(CROSS64_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS64_IMPLIBS) -ldxgi -lgdi32 && \
+	$(CROSS64_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $< $(CROSS64_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \
 	$(am__mv) $$depbase.Tpo $$depbase.Po
+
+tests/shader_runner.cross64.exe: $(shader_runner_cross_sources) $(CROSS64_IMPLIBS) $(widl_headers)
+	$(AM_V_CCLD)depbase=`echo $@ | sed 's![^/]*$$!$(DEPDIR)/&!;s!\.exe$$!!'`; \
+	$(CROSS64_CC) $(CROSS_CFLAGS) -MT $@ -MD -MP -MF $$depbase.Tpo -o $@ $(shader_runner_cross_sources) $(CROSS64_IMPLIBS) -ldxgi -lgdi32 -ld3dcompiler_47 && \
+	$(am__mv) $$depbase.Tpo $$depbase.Po
+
 else
 crosstest64:
 endif

README

@@ -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
@@ -45,7 +45,15 @@ removed in the future versions of vkd3d.
 Some of debug variables are lists of elements. Elements must be separated by
 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.
+
  * 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

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([vkd3d],[1.2])
+AC_INIT([vkd3d],[1.8])
 
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])
@@ -8,9 +8,10 @@ AC_CONFIG_HEADERS(include/config.h)
 AC_ARG_VAR([WIDL], [widl IDL compiler])
 AC_ARG_VAR([CROSSCC32], [32-bit Windows cross compiler])
 AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler])
-AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)]))
+AC_ARG_WITH([ncurses], AS_HELP_STRING([--with-ncurses], [Build with the ncurses library (default: test)]))
 AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools],
                                           [Build with SPIRV-Tools library (default: disabled)]))
+AC_ARG_WITH([xcb], AS_HELP_STRING([--with-xcb], [Build with XCB library (default: test)]))
 AC_ARG_ENABLE([demos],
               AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]),,
               [enable_demos=no])
@@ -29,6 +30,14 @@ AC_PROG_MKDIR_P
 VKD3D_PROG_WIDL(3, 20)
 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])
 AC_CONFIG_FILES([Doxyfile])
@@ -47,8 +56,10 @@ AC_SUBST([VKD3D_CFLAGS])
 AS_IF([test "x${GCC}" = "xyes"],
       [VKD3D_CFLAGS="-Wall -pipe"
       VKD3D_CHECK_CFLAGS([-std=c99])
+      VKD3D_CHECK_CFLAGS([-fvisibility=hidden])
       VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement])
       VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough])
+      VKD3D_CHECK_CFLAGS([-Winit-self])
       VKD3D_CHECK_CFLAGS([-Wmissing-prototypes])
       VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter])
       VKD3D_CHECK_CFLAGS([-Wvla])
@@ -60,11 +71,10 @@ VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no])
 VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no])
 
 dnl Check for headers
-AC_CHECK_HEADERS([dlfcn.h pthread.h \
+AC_CHECK_HEADERS([dlfcn.h \
                   vulkan/vulkan.h \
                   vulkan/spirv.h vulkan/GLSL.std.450.h \
                   spirv/unified1/spirv.h spirv/unified1/GLSL.std.450.h])
-AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])])
 AS_IF([test "x$ac_cv_header_vulkan_vulkan_h" != "xyes"], [AC_MSG_ERROR([vulkan.h not found.])])
 AS_IF([test "x$ac_cv_header_spirv_unified1_spirv_h" != "xyes" \
        -a "x$ac_cv_header_vulkan_spirv_h" != "xyes"],
@@ -73,7 +83,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
@@ -94,21 +104,26 @@ AC_CHECK_LIB([dl], [dlopen],
              [DL_LIBS="-ldl"],
              [AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])])
 
-AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
-VKD3D_CHECK_PTHREAD
+case $host_os in
+  mingw32*) ;;
+  *) AC_CHECK_HEADERS([pthread.h])
+     AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])])
+     AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
+     VKD3D_CHECK_PTHREAD
+     VKD3D_CHECK_PTHREAD_SETNAME_NP
+     ;;
+esac
 
-AC_SUBST([VULKAN_LIBS])
-VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],
-                   [VULKAN_LIBS="-lvulkan"],
-                   [VKD3D_CHECK_SONAME([vulkan-1], [vkGetInstanceProcAddr],
-                                       [VULKAN_LIBS="-lvulkan-1"
-                                        AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN], ["$ac_cv_lib_soname_vulkan_1"])],
-                                       [VKD3D_CHECK_SONAME([MoltenVK], [vkGetInstanceProcAddr],
-                                                           [VULKAN_LIBS="-lMoltenVK"
-                                                            AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],
-                                                                               ["$ac_cv_lib_soname_MoltenVK"])],
-                                                           [AC_MSG_ERROR([libvulkan and libMoltenVK not found.])])])])
+AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library])
+AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
+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],
+                         [AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if you have ncurses.]) with_ncurses=yes],
+                         [with_ncurses=no])])
 AS_IF([test "x$with_spirv_tools" = "xyes"],
       [PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools-shared],
       [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])],
@@ -116,7 +131,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])])
@@ -124,14 +139,24 @@ AS_IF([test "x$with_xcb" != "xno"],
 dnl Check for functions
 VKD3D_CHECK_FUNC([HAVE_BUILTIN_CLZ], [__builtin_clz], [__builtin_clz(0)])
 VKD3D_CHECK_FUNC([HAVE_BUILTIN_POPCOUNT], [__builtin_popcount], [__builtin_popcount(0)])
+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_PTHREAD_SETNAME_NP
+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)])
 
 dnl Makefiles
-AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"],
+case $host_os in
+  mingw32*)
+      AC_SUBST([DEMO_LIBS],["-ld3d12 -ldxgi -lgdi32"])
+      AC_SUBST([DEMO_CFLAGS],["-municode"])
+      ;;
+  *) AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"],
       [AC_MSG_ERROR([libxcb is required for demos.])])
+      AC_SUBST([DEMO_LIBS],[$XCB_LIBS])
+      AC_SUBST([DEMO_CFLAGS],[$XCB_CFLAGS])
+      ;;
+esac
 AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"])
 AM_CONDITIONAL([BUILD_DOC], [test $DX_FLAG_doc = 1])
 AM_CONDITIONAL([BUILD_TESTS], [test "x$enable_tests" != "xno"])
@@ -144,22 +169,27 @@ 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
 
   widl: ${WIDL}
 
-  Have XCB: ${HAVE_XCB}
+  Have ncurses: ${with_ncurses}
   Have SPIRV-Tools: ${with_spirv_tools}
+  Have xcb: ${HAVE_XCB}
 
   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([])

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

@@ -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_2
+#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_8
+#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;
 

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

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