Release 1.6.

These were removed in commits 3d85d77ced
and 763f7dfa61.

.gitignore

@@ -3,11 +3,13 @@ autom4te.cache
 config.log
 config.status
 configure
+doc
+Doxyfile
 libtool
 Makefile
 Makefile.in
 test-suite.log
-vkd3d-compiler
+/vkd3d-compiler
 
 vkd3d-*.tar.xz
 
@@ -17,7 +19,10 @@ vkd3d-*.tar.xz
 *.log
 *.o
 *.pc
+*.tab.c
+*.tab.h
 *.trs
+*.yy.c
 *~
 
 .deps

ANNOUNCE

@@ -1,90 +1,60 @@
-The Wine team is proud to announce that release 1.0 of vkd3d, the
+The Wine team is proud to announce that release 1.6 of vkd3d, the Direct3D to
-Direct3D 12 to Vulkan translation library, is now available.
+Vulkan translation library, is now available.
 
-This is the first release of vkd3d. A lot of Direct3D 12 features are still
+This release contains improvements that are listed in the release notes below.
-missing and bugs are expected. The current version was tested mainly with demo
+The main highlights are:
-applications. A number of features that are being worked on have been deferred
+
-to the next development cycle. This includes in particular geometry and
+  - Initial support for HLSL compute shaders.
-tessellation shaders support, various shader translation improvements, as well
+  - More support for HLSL features and intrinsics.
-as various improvements for core Direct3D 12 methods.
+  - Miscellaneous bug fixes.
 
 The source is available from the following location:
 
-  https://dl.winehq.org/vkd3d/source/vkd3d-1.0.tar.xz
+  https://dl.winehq.org/vkd3d/source/vkd3d-1.6.tar.xz
 
 The current source can also be pulled directly from the git repository:
 
-  https://source.winehq.org/git/vkd3d.git/
+  https://gitlab.winehq.org/wine/vkd3d.git
 
 Vkd3d is available thanks to the work of multiple people. See the file AUTHORS
 for the complete list.
 
 ----------------------------------------------------------------
 
-What's included in vkd3d 1.0
+What's new in vkd3d 1.6
-============================
+=======================
-
-
-*** libvkd3d
-
-- libvkd3d is the main component of the vkd3d project. It's a 3D graphics
-  library built on top of Vulkan with an API very similar to Direct3D 12.
-
-- A significant number of Direct3D 12 features are implemented, including:
-  - Graphics and compute pipelines.
-  - Command lists, command allocators and command queues.
-  - Descriptors and descriptor heaps.
-  - Root signatures.
-  - Constant buffer, shader resource, unordered access, render target and depth
-    stencil views.
-  - Samplers.
-  - Static samplers.
-  - Descriptors copying.
-  - Committed resources.
-  - Fences.
-  - Queries and query heaps.
-  - Resource barriers.
-  - Root constants.
-  - Basic support for indirect draws and dispatches.
-  - Basic support for command signatures.
-  - Various Clear*() methods.
-  - Various Copy*() methods.
 
 
 *** libvkd3d-shader
 
-- libvkd3d-shader is a library which translates shader model 4 and 5 bytecode
+- New features for the HLSL source type:
-  to SPIR-V. In this release, libvkd3d-shader is an internal library. Its API
+  - Initial support for compute shaders.
-  isn't set in stone yet.
+  - Improved support for initialisation and assignment of compound objects
-
+    like structures and arrays, including casts and implicit conversions.
-- Vertex, pixel and compute shaders are supported. Also, very simple geometry
+  - Support for loads and stores of texture resource unordered-access views.
-  shaders should be translated correctly. Issues are expected when trying to
+  - Support for function attributes. In particular, the required "numthreads"
-  translate tessellation shaders or more complex geometry shaders.
+    attribute for compute shader entry points is now supported.
-
+  - Support for the asuint() intrinsic function.
-- A significant number of shader instructions are supported in this release,
+  - Support for the length() intrinsic function.
-  including:
+  - Support for the normalize() intrinsic function.
-  - Arithmetic instructions.
+  - Support for integer division and modulus.
-  - Bit instructions.
+  - Support for taking the absolute value of integers.
-  - Comparison instructions.
+  - Support for floating-point modulus.
-  - Control flow instructions.
-  - Sample, gather and load instructions.
-  - Atomic instructions.
-  - UAV instructions.
-
-- Root signature serialization and deserialization is implemented.
-
-- Shader model 4 and 5 bytecode parser is imported from wined3d.
-
-- Shader model 5.1 is not supported yet.
 
 
-*** libvkd3d-utils
+- New interfaces:
+  - The VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS descriptor info flag is
+    used to indicate that atomic operations are used on unordered-access view
+    descriptors.
 
-- libvkd3d-utils contains simple implementations of various functions which
+
-  might be useful for source ports of Direct3D 12 applications.
+*** libvkd3d-common
+
+- vkd3d debug output is prefixed with "vkd3d:" in order to make it easier to
+  distinguish from output produced by applications or other libraries.
 
 
 *** demos
 
-- A simple hello triangle Direct3D 12 demo.
+- The demos now use libvkd3d-shader to compile HLSL shaders at run-time.
-- A Direct3D 12 port of glxgears.
+

AUTHORS

@@ -1,2 +1,30 @@
+Alexandre Julliard
+Andrew Eikum
+Andrey Gusev
+Atharva Nimbalkar
+Biswapriyo Nath
+Brendan Shanks
+Chip Davis
+Conor McCarthy
+David Gow
+Derek Lesho
+Francisco Casas
+Francois Gouget
+Giovanni Mascellani
+Hans-Kristian Arntzen
 Henri Verbeet
+Isabella Bosia
+Jactry Zeng
+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-2018 the Vkd3d project authors (see the file AUTHORS for a
+Copyright 2016-2022 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

Doxyfile.in

@@ -0,0 +1,17 @@
+# Doxyfile 1.8.18
+
+DOXYFILE_ENCODING      = UTF-8
+PROJECT_NAME           = @PACKAGE_NAME@
+PROJECT_NUMBER         = @PACKAGE_VERSION@
+PROJECT_BRIEF          = "The vkd3d 3D Graphics Library"
+OUTPUT_DIRECTORY       = doc
+JAVADOC_AUTOBRIEF      = YES
+OPTIMIZE_OUTPUT_FOR_C  = YES
+EXTRACT_STATIC         = YES
+
+INPUT                  = @srcdir@/include/vkd3d.h \
+                         @srcdir@/include/vkd3d_shader.h \
+                         @srcdir@/include/vkd3d_types.h \
+                         @srcdir@/include/vkd3d_utils.h
+
+EXCLUDE_SYMBOLS        = VKD3D_FORCE_32_BIT_ENUM

README

@@ -4,3 +4,81 @@ The vkd3d 3D Graphics Library
 
 Vkd3d is a 3D graphics library built on top of Vulkan. It has an API very
 similar, but not identical, to Direct3D 12.
+
+==============
+Building vkd3d
+==============
+
+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
+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
+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
+messages, you may also consider VKD3D_NO_TRACE_MESSAGES and
+VKD3D_NO_DEBUG_MESSAGES. For example, you can pass `CPPFLAGS="-DNDEBUG
+-DVKD3D_NO_TRACE_MESSAGES"' to configure.
+
+===========
+Using vkd3d
+===========
+
+Vkd3d can be used by projects that target Direct3D 12 as a drop-in replacement
+at build-time with some modest source modifications.
+
+If vkd3d is available when building Wine, then Wine will use it to support
+Direct3D 12 applications.
+
+=====================
+Environment variables
+=====================
+
+Most of the environment variables used by vkd3d are for debugging purposes. The
+environment variables are not considered a part of API and might be changed or
+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
+   libvkd3d. Accepts the following values: none, err, fixme, warn, trace.
+
+ * VKD3D_VULKAN_DEVICE - a zero-based device index. Use to force the selected
+   Vulkan device.
+
+ * VKD3D_DISABLE_EXTENSIONS - a list of Vulkan extensions that libvkd3d should
+   not use even if available.
+
+ * VKD3D_SHADER_DEBUG - controls the debug level for log messages produced by
+   libvkd3d-shader. See VKD3D_DEBUG for accepted values.
+
+ * VKD3D_SHADER_DUMP_PATH - path where shader bytecode is dumped.
+
+ * VKD3D_TEST_DEBUG - enables additional debug messages in tests. Set to 0, 1
+   or 2.
+
+ * VKD3D_TEST_FILTER - a filter string. Only the tests whose names matches the
+   filter string will be run, e.g. VKD3D_TEST_FILTER=clear_render_target.
+   Useful for debugging or developing new tests.
+
+ * VKD3D_TEST_PLATFORM - can be set to "wine", "windows" or "other". The test
+   platform controls the behavior of todo(), todo_if(), bug_if() and broken()
+   conditions in tests.
+
+ * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests.

configure.ac

@@ -1,16 +1,23 @@
 AC_PREREQ([2.69])
-AC_INIT([vkd3d],[1.0])
+AC_INIT([vkd3d],[1.6])
 
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_LIBOBJ_DIR([portable])
 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([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])
+AC_ARG_ENABLE([tests],
+              AS_HELP_STRING([--enable-tests], [Build tests (default: enabled)]),,
+              [enable_tests=yes])
 
 AC_USE_SYSTEM_EXTENSIONS
 
@@ -20,15 +27,25 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_SED
 AC_PROG_MKDIR_P
-AC_CHECK_PROG([WIDL], [widl], [widl], [no])
+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_CHECK_PROGS([BISON], [bison], [none])
+AS_IF([test "$BISON" = "none"], [AC_MSG_ERROR([no suitable bison found. Please install the 'bison' package.])])
+
+DX_PS_FEATURE([OFF])
+DX_INIT_DOXYGEN([vkd3d], [Doxyfile], [doc])
+AC_CONFIG_FILES([Doxyfile])
+
 AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror])
 AM_MAINTAINER_MODE([enable])
 AM_SILENT_RULES([yes])
 
 LT_PREREQ([2.4.2])
-LT_INIT
+LT_INIT([win32-dll])
 
 gl_LD_VERSION_SCRIPT
 
@@ -37,10 +54,14 @@ 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])
+      VKD3D_CHECK_CFLAGS([-Wpointer-arith])
       VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])])
 
 dnl Check for cross compilers
@@ -48,10 +69,10 @@ VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no])
 VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no])
 
 dnl Check for headers
-AC_CHECK_HEADERS([pthread.h vulkan/vulkan.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"],
@@ -60,40 +81,81 @@ 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([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
+# include "spirv/unified1/spirv.h"
+#else
+# include "vulkan/spirv.h"
+#endif])
+
+AC_CHECK_DECLS([program_invocation_name],,,[#include <errno.h>])
+
 dnl Check for libraries
 m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])])
 
 AC_CHECK_LIB([m], [ceilf])
 
-AC_ARG_VAR([DL_LIBS], [linker flags for dl])
+AC_SUBST([DL_LIBS])
 AC_CHECK_LIB([dl], [dlopen],
-             [AC_SUBST([DL_LIBS], ["-ldl"])],
+             [DL_LIBS="-ldl"],
-             [AC_MSG_ERROR([libdl not found.])])
+             [AS_IF([test "$ac_cv_header_dlfnc_h" = "xyes"], [AC_MSG_ERROR([libdl not found.])])])
 
-AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
+case $host_os in
-AC_CHECK_LIB([pthread], [pthread_create],
+  mingw32*) ;;
-             [AC_SUBST([PTHREAD_LIBS], ["-lpthread"])],
+  *) AC_CHECK_HEADERS([pthread.h])
-             [AC_MSG_ERROR([libpthread not found.])])
+     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])
+AC_ARG_VAR([SONAME_LIBVULKAN], [shared object name for the Vulkan library])
-AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr],
+AC_ARG_VAR([VULKAN_LIBS], [linker flags for the Vulkan library])
-             [VULKAN_LIBS="-lvulkan"],
+AS_IF([test "x$SONAME_LIBVULKAN" = "x"],
-             [AC_MSG_ERROR([libvulkan not found.])])
+      [VKD3D_CHECK_VULKAN],
+      [AC_DEFINE_UNQUOTED([SONAME_LIBVULKAN],["$SONAME_LIBVULKAN"],[Define to the shared object name of the Vulkan library.])])
 
-HAVE_SPIRV_TOOLS=no
+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.])
+      [AC_DEFINE([HAVE_SPIRV_TOOLS], [1], [Define to 1 if you have SPIRV-Tools.])])],
-      HAVE_SPIRV_TOOLS=yes])])
+      [with_spirv_tools=no])
 
-PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms])
+HAVE_XCB=no
+AS_IF([test "x$with_xcb" != "xno"],
+      [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])])
 
 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)])
 
+dnl Makefiles
+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"])
 AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"])
 AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"])
 AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])
@@ -103,14 +165,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
 
-  Have SPIRV-Tools: ${HAVE_SPIRV_TOOLS}
+  widl: ${WIDL}
 
-  Building crosstests: ${HAVE_CROSSTEST}"])
+  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}
+"])
+
+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.h

@@ -141,7 +141,6 @@ static inline HRESULT demo_create_root_signature(ID3D12Device *device,
 #ifdef _WIN32
 #include "demo_win32.h"
 #else
-#include <vkd3d_utils.h>
 #define INFINITE VKD3D_INFINITE
 #include "demo_xcb.h"
 #endif

demos/demo_win32.h

@@ -18,6 +18,7 @@
  */
 
 #include <vkd3d_dxgi1_4.h>
+#include <vkd3d_d3dcompiler.h>
 #include <stdbool.h>
 #include <stdio.h>
 
@@ -25,10 +26,6 @@
 
 struct demo
 {
-    HMODULE d3dcompiler;
-    HRESULT (WINAPI *compile_from_file)(const WCHAR *filename, const void *defines, void *include,
-            const char *entry_point, const char *profile, UINT flags1, UINT flags2,
-            ID3DBlob **code, ID3DBlob **errors);
     size_t window_count;
     bool quit;
 
@@ -198,11 +195,6 @@ static inline bool demo_init(struct demo *demo, void *user_data)
 {
     WNDCLASSEXW wc;
 
-    if (!(demo->d3dcompiler = LoadLibraryW(L"d3dcompiler_47")))
-        return false;
-    if (!(demo->compile_from_file = (void *)GetProcAddress(demo->d3dcompiler, "D3DCompileFromFile")))
-        goto fail;
-
     wc.cbSize = sizeof(wc);
     wc.style = CS_HREDRAW | CS_VREDRAW;
     wc.lpfnWndProc = demo_window_proc;
@@ -216,7 +208,7 @@ static inline bool demo_init(struct demo *demo, void *user_data)
     wc.lpszClassName = DEMO_WINDOW_CLASS_NAME;
     wc.hIconSm = LoadIconW(NULL, IDI_WINLOGO);
     if (!RegisterClassExW(&wc))
-        goto fail;
+        return false;
 
     demo->window_count = 0;
     demo->quit = false;
@@ -224,16 +216,11 @@ static inline bool demo_init(struct demo *demo, void *user_data)
     demo->idle_func = NULL;
 
     return true;
-
-fail:
-    FreeLibrary(demo->d3dcompiler);
-    return false;
 }
 
 static inline void demo_cleanup(struct demo *demo)
 {
     UnregisterClassW(DEMO_WINDOW_CLASS_NAME, GetModuleHandle(NULL));
-    FreeLibrary(demo->d3dcompiler);
 }
 
 static inline void demo_set_idle_func(struct demo *demo,

demos/demo_xcb.h

@@ -17,16 +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_6
+#include "config.h"
 #include <vkd3d.h>
+#include <vkd3d_utils.h>
 #include <xcb/xcb_event.h>
 #include <xcb/xcb_icccm.h>
 #include <xcb/xcb_keysyms.h>
 #include <sys/stat.h>
+#include <dlfcn.h>
 #include <limits.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdbool.h>
+#include <stdio.h>
+
+#define DECLARE_VK_PFN(name) PFN_##name name;
+DECLARE_VK_PFN(vkAcquireNextImageKHR)
+DECLARE_VK_PFN(vkCreateFence)
+DECLARE_VK_PFN(vkCreateSwapchainKHR)
+DECLARE_VK_PFN(vkCreateXcbSurfaceKHR)
+DECLARE_VK_PFN(vkDestroyFence)
+DECLARE_VK_PFN(vkDestroySurfaceKHR)
+DECLARE_VK_PFN(vkDestroySwapchainKHR)
+DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR)
+DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR)
+DECLARE_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR)
+DECLARE_VK_PFN(vkGetSwapchainImagesKHR)
+DECLARE_VK_PFN(vkQueuePresentKHR)
+DECLARE_VK_PFN(vkResetFences)
+DECLARE_VK_PFN(vkWaitForFences)
+
+static void load_vulkan_procs(void)
+{
+    void *libvulkan;
+
+    if (!(libvulkan = dlopen(SONAME_LIBVULKAN, RTLD_NOW)))
+    {
+        fprintf(stderr, "Failed to load %s: %s.\n", SONAME_LIBVULKAN, dlerror());
+        exit(1);
+    }
+
+#define LOAD_VK_PFN(name) name = (void *)dlsym(libvulkan, #name);
+    LOAD_VK_PFN(vkAcquireNextImageKHR)
+    LOAD_VK_PFN(vkCreateFence)
+    LOAD_VK_PFN(vkCreateSwapchainKHR)
+    LOAD_VK_PFN(vkCreateXcbSurfaceKHR)
+    LOAD_VK_PFN(vkDestroyFence)
+    LOAD_VK_PFN(vkDestroySurfaceKHR)
+    LOAD_VK_PFN(vkDestroySwapchainKHR)
+    LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR)
+    LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR)
+    LOAD_VK_PFN(vkGetPhysicalDeviceSurfaceSupportKHR)
+    LOAD_VK_PFN(vkGetSwapchainImagesKHR)
+    LOAD_VK_PFN(vkQueuePresentKHR)
+    LOAD_VK_PFN(vkResetFences)
+    LOAD_VK_PFN(vkWaitForFences)
+}
 
 struct demo
 {
@@ -328,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_hlsl.h"
-#include "gears_ps_flat.h"
-#include "gears_ps_smooth.h"
 
 struct cxg_fence
 {
@@ -124,12 +122,12 @@ struct cx_gears
     struct demo_swapchain *swapchain;
     ID3D12DescriptorHeap *rtv_heap, *dsv_heap;
     unsigned int rtv_descriptor_size;
-    ID3D12Resource *render_targets[2];
+    ID3D12Resource *render_targets[3];
-    ID3D12CommandAllocator *command_allocator[2];
+    ID3D12CommandAllocator *command_allocator[3];
 
     ID3D12RootSignature *root_signature;
     ID3D12PipelineState *pipeline_state_smooth, *pipeline_state_flat;
-    ID3D12GraphicsCommandList *command_list[2];
+    ID3D12GraphicsCommandList *command_list[3];
     ID3D12Resource *ds, *cb, *vb[2], *ib;
     D3D12_VERTEX_BUFFER_VIEW vbv[2];
     D3D12_INDEX_BUFFER_VIEW ibv;
@@ -218,7 +216,8 @@ static void cxg_wait_for_previous_frame(struct cx_gears *cxg)
 
     if (ID3D12Fence_GetCompletedValue(fence->fence) < v)
     {
-        ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event);
+        hr = ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event);
+        assert(SUCCEEDED(hr));
         demo_wait_event(fence->event, INFINITE);
     }
 
@@ -305,8 +304,10 @@ static void cxg_destroy_pipeline(struct cx_gears *cxg)
 {
     unsigned int i;
 
-    ID3D12CommandAllocator_Release(cxg->command_allocator[1]);
+    for (i = 0; i < ARRAY_SIZE(cxg->command_allocator); ++i)
-    ID3D12CommandAllocator_Release(cxg->command_allocator[0]);
+    {
+        ID3D12CommandAllocator_Release(cxg->command_allocator[i]);
+    }
     for (i = 0; i < ARRAY_SIZE(cxg->render_targets); ++i)
     {
         ID3D12Resource_Release(cxg->render_targets[i]);
@@ -370,12 +371,12 @@ static void cxg_load_pipeline(struct cx_gears *cxg)
             &IID_ID3D12DescriptorHeap, (void **)&cxg->dsv_heap);
     assert(SUCCEEDED(hr));
 
+    for (i = 0; i < ARRAY_SIZE(cxg->command_allocator); ++i)
+    {
         hr = ID3D12Device_CreateCommandAllocator(cxg->device, D3D12_COMMAND_LIST_TYPE_DIRECT,
-            &IID_ID3D12CommandAllocator, (void **)&cxg->command_allocator[0]);
+                &IID_ID3D12CommandAllocator, (void **)&cxg->command_allocator[i]);
-    assert(SUCCEEDED(hr));
-    hr = ID3D12Device_CreateCommandAllocator(cxg->device, D3D12_COMMAND_LIST_TYPE_DIRECT,
-            &IID_ID3D12CommandAllocator, (void **)&cxg->command_allocator[1]);
         assert(SUCCEEDED(hr));
+    }
 }
 
 static void cxg_fence_destroy(struct cxg_fence *cxg_fence)
@@ -386,6 +387,8 @@ static void cxg_fence_destroy(struct cxg_fence *cxg_fence)
 
 static void cxg_destroy_assets(struct cx_gears *cxg)
 {
+    unsigned int i;
+
     cxg_fence_destroy(&cxg->fence);
     ID3D12Resource_Release(cxg->ib);
     ID3D12Resource_Unmap(cxg->vb[1], 0, NULL);
@@ -394,8 +397,8 @@ static void cxg_destroy_assets(struct cx_gears *cxg)
     ID3D12Resource_Unmap(cxg->cb, 0, NULL);
     ID3D12Resource_Release(cxg->cb);
     ID3D12Resource_Release(cxg->ds);
-    ID3D12GraphicsCommandList_Release(cxg->command_list[1]);
+    for (i = 0; i < ARRAY_SIZE(cxg->command_list); ++i)
-    ID3D12GraphicsCommandList_Release(cxg->command_list[0]);
+        ID3D12GraphicsCommandList_Release(cxg->command_list[i]);
     ID3D12PipelineState_Release(cxg->pipeline_state_smooth);
     ID3D12PipelineState_Release(cxg->pipeline_state_flat);
     ID3D12RootSignature_Release(cxg->root_signature);
@@ -654,10 +657,12 @@ 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};
     D3D12_CLEAR_VALUE clear_value;
+    unsigned int i;
     HRESULT hr;
 
     root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
@@ -676,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.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs);
-    pso_desc.VS.BytecodeLength = sizeof(g_vs_main);
+    pso_desc.VS.BytecodeLength = ID3D10Blob_GetBufferSize(vs);
-    pso_desc.PS.pShaderBytecode = g_ps_main_flat;
+    pso_desc.PS.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_flat);
-    pso_desc.PS.BytecodeLength = sizeof(g_ps_main_flat);
+    pso_desc.PS.BytecodeLength = ID3D10Blob_GetBufferSize(ps_flat);
 
     demo_rasterizer_desc_init_default(&pso_desc.RasterizerState);
     pso_desc.RasterizerState.FrontCounterClockwise = TRUE;
@@ -702,22 +714,25 @@ 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.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps_smooth);
-    pso_desc.PS.BytecodeLength = sizeof(g_ps_main_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));
 
-    hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxg->command_allocator[0],
+    ID3D10Blob_Release(vs);
-            cxg->pipeline_state_flat, &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[0]);
+    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,
+                cxg->command_allocator[i], cxg->pipeline_state_flat,
+                &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[i]);
         assert(SUCCEEDED(hr));
-    hr = ID3D12GraphicsCommandList_Close(cxg->command_list[0]);
+        hr = ID3D12GraphicsCommandList_Close(cxg->command_list[i]);
-    assert(SUCCEEDED(hr));
-    hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxg->command_allocator[1],
-            cxg->pipeline_state_flat, &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[1]);
-    assert(SUCCEEDED(hr));
-    hr = ID3D12GraphicsCommandList_Close(cxg->command_list[1]);
         assert(SUCCEEDED(hr));
+    }
 
     heap_desc.Type = D3D12_HEAP_TYPE_DEFAULT;
     heap_desc.CPUPageProperty = D3D12_CPU_PAGE_PROPERTY_UNKNOWN;
@@ -860,6 +875,7 @@ static int cxg_main(void)
     cxg_load_assets(&cxg);
     cxg_populate_command_list(&cxg, 0);
     cxg_populate_command_list(&cxg, 1);
+    cxg_populate_command_list(&cxg, 2);
 
     demo_process_events(&cxg.demo);
 

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_hlsl.h"
-#include "triangle_ps.h"
 
 struct cxt_fence
 {
@@ -73,7 +72,7 @@ struct cx_triangle
     struct demo_swapchain *swapchain;
     ID3D12DescriptorHeap *rtv_heap;
     unsigned int rtv_descriptor_size;
-    ID3D12Resource *render_targets[2];
+    ID3D12Resource *render_targets[3];
     ID3D12CommandAllocator *command_allocator;
 
     ID3D12RootSignature *root_signature;
@@ -142,7 +141,8 @@ static void cxt_wait_for_previous_frame(struct cx_triangle *cxt)
 
     if (ID3D12Fence_GetCompletedValue(fence->fence) < v)
     {
-        ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event);
+        hr = ID3D12Fence_SetEventOnCompletion(fence->fence, v, fence->event);
+        assert(SUCCEEDED(hr));
         demo_wait_event(fence->event, INFINITE);
     }
 
@@ -276,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;
 
@@ -284,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.pShaderBytecode = ID3D10Blob_GetBufferPointer(vs);
-    pso_desc.VS.BytecodeLength = sizeof(g_vs_main);
+    pso_desc.VS.BytecodeLength = ID3D10Blob_GetBufferSize(vs);
-    pso_desc.PS.pShaderBytecode = g_ps_main;
+    pso_desc.PS.pShaderBytecode = ID3D10Blob_GetBufferPointer(ps);
-    pso_desc.PS.BytecodeLength = sizeof(g_ps_main);
+    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;
@@ -305,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";