Release 1.1.

Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
build: Bump libtool version numbers for shared libraries.
2025-04-13 05:43:18 -07:00 · 2018-10-05 13:48:18 -05:00 · 2018-10-02 19:36:37 -07:00 · 2018-10-02 19:36:32 -07:00 · 2018-10-01 18:36:43 -07:00 · 2018-10-01 18:36:40 -07:00
82 changed files with 44574 additions and 3303 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,9 @@ libtool
 Makefile
 Makefile.in
 test-suite.log
+vkd3d-compiler

-vkd3d-*.tar.gz
+vkd3d-*.tar.xz

 *.exe
 *.la
--- a/85
+++ b/85
@@ -0,0 +1,85 @@
+The Wine team is proud to announce that release 1.1 of vkd3d, the
+Direct3D 12 to Vulkan translation library, is now available.
+
+This release contains improvements that are listed in the release notes below.
+The main highlights are:
+
+  - Initial support for placed resources.
+  - MoltenVK support.
+  - Support for geometry shaders.
+
+The source is available from the following location:
+
+  https://dl.winehq.org/vkd3d/source/vkd3d-1.1.tar.xz
+
+The current source can also be pulled directly from the git repository:
+
+  https://source.winehq.org/git/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.1
+=======================
+
+
+*** libvkd3d
+
+- Initial support for memory heaps and placed resources.
+
+- Improved support for resource views.
+
+- ClearUnorderedAccessViewUint() is implemented for textures.
+
+- Blend factor is implemented.
+
+- Performance improvements.
+
+- A new interface is available for enabling additional Vulkan instance
+  extensions.
+
+- A new public function is available for mapping VkFormats to DXGI_FORMATs.
+
+- Support for more DXGI formats.
+
+- Various bug fixes.
+
+
+*** libvkd3d-shader
+
+- Support for geometry shaders.
+
+- Pretty printing is implemented for shader code extracted from DXBC.
+
+- Clip and cull distances are supported.
+
+- Support for more shader instructions:
+  - round_ne,
+  - sincos,
+  - ineg,
+  - continue,
+  - continuec,
+  - gather4_po,
+  - gather4_po_c,
+  - gather4_c.
+
+- Texel offsets are supported.
+
+- Various shader translation fixes.
+
+
+*** libvkd3d-utils
+
+- Vulkan WSI extensions are detected at runtime.
+
+
+*** build
+
+- Demos are not built by default.
+
+- libxcb is now an optional dependency required only for demos.
+
+- MoltenVK is supported.
+
--- a/2
+++ b/2
@@ -1,2 +1,4 @@
+Chip Davis
 Henri Verbeet
 Józef Kucia
+Sven Hesse
--- a/30
+++ b/30
@@ -1,20 +1,16 @@
-Copyright 2016 Józef Kucia for CodeWeavers
-Copyright 2016 Henri Verbeet for CodeWeavers
+Copyright 2016-2018 the Vkd3d project authors (see the file AUTHORS for a
+complete list)

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Vkd3d is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the
+Free Software Foundation; either version 2.1 of the License, or (at
+your option) any later version.

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+This library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA, 02110-1301 USA.
--- a/502
+++ b/502
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,41 +3,43 @@ AM_CFLAGS = @VKD3D_CFLAGS@
 AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/dummy -I$(srcdir)/include/private

 widl_headers = \
-	include/d3d12.h \
-	include/dxgi.h \
-	include/dxgi1_2.h \
-	include/dxgi1_3.h \
-	include/dxgi1_4.h \
-	include/dxgitype.h
+	include/vkd3d_d3d12.h \
+	include/vkd3d_d3dcommon.h \
+	include/vkd3d_dxgi.h \
+	include/vkd3d_dxgi1_2.h \
+	include/vkd3d_dxgi1_3.h \
+	include/vkd3d_dxgi1_4.h \
+	include/vkd3d_dxgibase.h \
+	include/vkd3d_dxgiformat.h \
+	include/vkd3d_dxgitype.h

 vkd3d_public_headers = \
-	include/d3d12.h \
-	include/dummy/rpc.h \
-	include/dummy/rpcndr.h \
-	include/dxgibase.h \
 	include/vkd3d.h \
+	include/vkd3d_d3d12.h \
+	include/vkd3d_d3dcommon.h \
+	include/vkd3d_dxgibase.h \
+	include/vkd3d_dxgiformat.h \
 	include/vkd3d_utils.h \
 	include/vkd3d_windows.h

-spv_gears_shaders = \
-	demos/gears.vert.spv \
-	demos/gears_flat.frag.spv \
-	demos/gears_smooth.frag.spv
-spv_triangle_shaders = \
-	demos/triangle.vert.spv \
-	demos/triangle.frag.spv
-
-spv_shaders = \
-	$(spv_gears_shaders) \
-	$(spv_triangle_shaders)
-
-hlsl_shaders = \
+vkd3d_demos_shaders = \
 	demos/gears.hlsl \
-	demos/triangle.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
+
+vkd3d_cross_tests = \
 	tests/d3d12

+vkd3d_test_headers = \
+	tests/vkd3d_d3d12_test.h
+
 vkd3d_demos = \
 	demos/gears \
 	demos/triangle
@@ -48,61 +50,100 @@ vkd3d_demos_headers = \
 	demos/demo_xcb.h

 BUILT_SOURCES = $(widl_headers)
-CLEANFILES = $(spv_shaders)

-noinst_LTLIBRARIES = libvkd3d-common.la
+noinst_LTLIBRARIES = libvkd3d-common.la libvkd3d-shader.la
 libvkd3d_common_la_SOURCES = \
 	include/private/vkd3d_debug.h \
-	libs/vkd3d-common/debug.c
+	libs/vkd3d-common/debug.c \
+	libs/vkd3d-common/memory.c

 lib_LTLIBRARIES = libvkd3d.la libvkd3d-utils.la

+libvkd3d_shader_la_SOURCES = \
+	include/private/list.h \
+	include/private/rbtree.h \
+	include/private/vkd3d_common.h \
+	include/private/vkd3d_debug.h \
+	include/private/vkd3d_memory.h \
+	include/private/vkd3d_shader.h \
+	libs/vkd3d-shader/dxbc.c \
+	libs/vkd3d-shader/spirv.c \
+	libs/vkd3d-shader/trace.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_LIBADD = @SPIRV_TOOLS_LIBS@
+if HAVE_LD_VERSION_SCRIPT
+libvkd3d_shader_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map
+endif
+
 libvkd3d_la_SOURCES = \
-	include/d3d12.idl \
 	include/private/vkd3d_common.h \
 	include/private/vkd3d_debug.h \
 	include/private/vkd3d_memory.h \
 	include/private/vkd3d_test.h \
-	include/unknown.idl \
+	include/vkd3d_d3d12.idl \
+	include/vkd3d_d3dcommon.idl \
+	include/vkd3d_unknown.idl \
 	libs/vkd3d/command.c \
 	libs/vkd3d/device.c \
 	libs/vkd3d/resource.c \
 	libs/vkd3d/state.c \
 	libs/vkd3d/utils.c \
+	libs/vkd3d/vkd3d.map \
 	libs/vkd3d/vkd3d_main.c \
 	libs/vkd3d/vkd3d_private.h \
-	libs/vkd3d/vulkan_procs.h
-libvkd3d_la_LIBADD = libvkd3d-common.la @PTHREAD_LIBS@
+	libs/vkd3d/vulkan_procs.h \
+	libs/vkd3d_version.c
+libvkd3d_la_LDFLAGS = -version-info 2:0:1
+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
+endif

 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 = -version-info 1:1:0
 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la
+if HAVE_LD_VERSION_SCRIPT
+libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map
+endif
+
+EXTRA_DIST = LICENSE

 pkgconfigdir = $(libdir)/pkgconfig
 pkginclude_HEADERS = $(vkd3d_public_headers)
-nodist_pkgconfig_DATA = libvkd3d.pc
-CLEANFILES += libvkd3d.pc
-EXTRA_DIST = libs/vkd3d/libvkd3d.pc.in
+nodist_pkgconfig_DATA = libvkd3d.pc libvkd3d-utils.pc
+CLEANFILES = libvkd3d.pc libvkd3d-utils.pc
+EXTRA_DIST += libs/vkd3d/libvkd3d.pc.in libs/vkd3d-utils/libvkd3d-utils.pc.in

-LDADD = libvkd3d-utils.la
-check_PROGRAMS = $(vkd3d_tests)
+noinst_PROGRAMS = vkd3d-compiler
+vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c
+vkd3d_compiler_LDADD = libvkd3d-shader.la libvkd3d-common.la
+
+LDADD = libvkd3d.la libvkd3d-utils.la
+check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests)
 AM_DEFAULT_SOURCE_EXT = .c
-TESTS = $(vkd3d_tests)
+TESTS = $(vkd3d_tests) $(vkd3d_cross_tests)
 tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@
+tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@

-DEMOS_LDADD = libvkd3d.la $(LDADD) @XCB_LIBS@
-DEMOS_CFLAGS = @XCB_CFLAGS@
-noinst_PROGRAMS = $(vkd3d_demos)
-EXTRA_DIST += $(vkd3d_demos_headers)
+if BUILD_DEMOS
+DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@
+DEMOS_CFLAGS = $(AM_CFLAGS) @XCB_CFLAGS@
+noinst_PROGRAMS += $(vkd3d_demos)

-EXTRA_demos_gears_DEPENDENCIES = $(spv_gears_shaders)
 demos_gears_CFLAGS = $(DEMOS_CFLAGS)
 demos_gears_LDADD = $(DEMOS_LDADD) -lm

-EXTRA_demos_triangle_DEPENDENCIES = $(spv_triangle_shaders)
 demos_triangle_CFLAGS = $(DEMOS_CFLAGS)
 demos_triangle_LDADD = $(DEMOS_LDADD)
+endif
+
+EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers)

 VKD3D_V_WIDL = $(vkd3d_v_widl_@AM_V@)
 vkd3d_v_widl_ = $(vkd3d_v_widl_@AM_DEFAULT_V@)
@@ -111,38 +152,51 @@ vkd3d_v_widl_1 =

 EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl)
 $(widl_headers): %.h: %.idl
-	$(VKD3D_V_WIDL)$(WIDL) -o $@ $<
+if HAVE_WIDL
+	$(VKD3D_V_WIDL)$(WIDL) -h -o $@.tmp $<
+	$(AM_V_at)$(SED) -e '/#include <rpc.h>/d' -e '/#include <rpcndr.h>/d' <$@.tmp >$@
+	$(AM_V_at)$(RM) $@.tmp
+else
+	@echo "widl is required to generate $@"
+endif

-VKD3D_V_GLSLANG = $(vkd3d_v_glslang_@AM_V@)
-vkd3d_v_glslang_ = $(vkd3d_v_glslang_@AM_DEFAULT_V@)
-vkd3d_v_glslang_0 = @echo "  GLSLANG " $@;
-vkd3d_v_glslang_1 =
+EXTRA_DIST += $(vkd3d_demos_shaders)

-EXTRA_DIST += $(spv_shaders:.spv=)
-$(spv_shaders): %.spv: %
-	$(VKD3D_V_GLSLANG)$(GLSLANG) -V -o $@ $<
-
-EXTRA_DIST += $(hlsl_shaders)
-
-libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in
-	sed -e 's![@]prefix[@]!$(prefix)!g' \
+libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in
+	$(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \
 		-e 's![@]exec_prefix[@]!$(exec_prefix)!g' \
 		-e 's![@]includedir[@]!$(includedir)!g' \
 		-e 's![@]libdir[@]!$(libdir)!g' \
 		-e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \
 		$< > $@

+libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in
+	$(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \
+		-e 's![@]exec_prefix[@]!$(exec_prefix)!g' \
+		-e 's![@]includedir[@]!$(includedir)!g' \
+		-e 's![@]libdir[@]!$(libdir)!g' \
+		-e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \
+		$< > $@
+
+libs/vkd3d_version.c: dummy-vkd3d-version
+	$(AM_V_GEN)version=`(GIT_DIR=$(top_srcdir)/.git git describe HEAD 2>/dev/null || echo "vkd3d-$(PACKAGE_VERSION)") | $(SED) -n -e '$$s/\(.*\)/const char vkd3d_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
+.SILENT: libs/vkd3d_version.c
+CLEANFILES += libs/vkd3d_version.c
+
+.PHONY: dummy-vkd3d-version
+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}
 EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def)

-if HAS_CROSSTARGET32
+if HAVE_CROSSTARGET32
 CROSS32_CC = @CROSSCC32@
 CROSS32_DLLTOOL = @CROSSTARGET32@-dlltool
 CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a)
-CROSS32_EXEFILES = $(vkd3d_tests:=.cross32.exe) $(vkd3d_demos:=.cross32.exe)
+CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) $(vkd3d_demos:=.cross32.exe)
 CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES)

 CLEANFILES += $(CROSS32_FILES)
@@ -163,11 +217,11 @@ else
 crosstest32:
 endif

-if HAS_CROSSTARGET64
+if HAVE_CROSSTARGET64
 CROSS64_CC = @CROSSCC64@
 CROSS64_DLLTOOL = @CROSSTARGET64@-dlltool
 CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a)
-CROSS64_EXEFILES = $(vkd3d_tests:=.cross64.exe) $(vkd3d_demos:=.cross64.exe)
+CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) $(vkd3d_demos:=.cross64.exe)
 CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES)

 CLEANFILES += $(CROSS64_FILES)
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,19 @@
 AC_PREREQ([2.69])
-AC_INIT([vkd3d], 0.0.1)
+AC_INIT([vkd3d],[1.1])

 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([GLSLANG], [glslangValidator GLSL 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([spirv-tools], AS_HELP_STRING([--with-spirv-tools],
+                                          [Build with SPIRV-Tools library (default: disabled)]))
+AC_ARG_ENABLE([demos], AS_HELP_STRING([--enable-demos], [Build demo programs (default: disabled)]))
+
+AC_USE_SYSTEM_EXTENSIONS

 dnl Check for progs
 AM_PROG_AR
@@ -19,8 +23,6 @@ AC_PROG_SED
 AC_PROG_MKDIR_P
 AC_CHECK_PROG([WIDL], [widl], [widl], [no])
 AS_IF([test "x$WIDL" = "xno"], [AC_MSG_WARN([widl is required to build header files.])])
-AC_CHECK_PROG([GLSLANG], [glslangValidator], [glslangValidator], [no])
-AS_IF([test "x$GLSLANG" = "xno"], [AC_MSG_ERROR([glslangValidator is required to compile shaders.])])

 AM_INIT_AUTOMAKE([1.11 foreign silent-rules subdir-objects no-dist-gzip dist-xz -Wall -Werror])
 AM_MAINTAINER_MODE([enable])
@@ -29,43 +31,87 @@ AM_SILENT_RULES([yes])
 LT_PREREQ([2.4.2])
 LT_INIT

+gl_LD_VERSION_SCRIPT
+
 dnl Check compiler specific flags
-AC_SUBST([VKD3D_CFLAGS], [""])
+AC_SUBST([VKD3D_CFLAGS])
 AS_IF([test "x${GCC}" = "xyes"],
      [VKD3D_CFLAGS="-Wall -pipe"
      VKD3D_CHECK_CFLAGS([-std=c99])
      VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement])
      VKD3D_CHECK_CFLAGS([-Wmissing-prototypes])
      VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter])
-      VKD3D_CHECK_CFLAGS([-Wvla])])
+      VKD3D_CHECK_CFLAGS([-Wvla])
+      VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])])

 dnl Check for cross compilers
 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([pthread.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"],
+      [AC_MSG_ERROR([spirv.h not found.])])
+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.])])

 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_CHECK_LIB([dl], [dlopen],
+             [AC_SUBST([DL_LIBS], ["-ldl"])],
+             [AC_MSG_ERROR([libdl not found.])])
+
 AC_ARG_VAR([PTHREAD_LIBS], [linker flags for pthreads])
 AC_CHECK_LIB([pthread], [pthread_create],
-             [AC_SUBST(PTHREAD_LIBS, "-lpthread")],
-             [AC_MSG_ERROR(libpthread not found.)])
+             [AC_SUBST([PTHREAD_LIBS], ["-lpthread"])],
+             [AC_MSG_ERROR([libpthread not found.])])

-AC_CHECK_LIB([vulkan], [vkGetInstanceProcAddr], [], [AC_MSG_ERROR([libvulkan not found.])])
+AC_SUBST([VULKAN_LIBS])
+VKD3D_CHECK_SONAME([vulkan], [vkGetInstanceProcAddr],
+                   [VULKAN_LIBS="-lvulkan"],
+                   [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.])])])

-PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms])
+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.])])],
+      [with_spirv_tools=no])
+
+HAVE_XCB=no
+AS_IF([test "x$with_xcb" != "xno"],
+      [PKG_CHECK_MODULES([XCB], [xcb 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_SYNC_ADD_AND_FETCH_FUNC
-VKD3D_CHECK_SYNC_SUB_AND_FETCH_FUNC
+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_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)])

-AM_CONDITIONAL([HAS_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"])
-AM_CONDITIONAL([HAS_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])
+VKD3D_CHECK_PTHREAD_SETNAME_NP
+
+dnl Makefiles
+AS_IF([test "x$enable_demos" != "xyes"], [enable_demos=no])
+AS_IF([test "x$enable_demos" = "xyes" -a "x$HAVE_XCB" != "xyes"],
+      [AC_MSG_ERROR([libxcb is required for demos.])])
+AM_CONDITIONAL([BUILD_DEMOS], [test "x$enable_demos" = "xyes"])
+AM_CONDITIONAL([HAVE_WIDL], [test "x$WIDL" != "xno"])
+AM_CONDITIONAL([HAVE_CROSSTARGET32], [test "x$CROSSTARGET32" != "xno"])
+AM_CONDITIONAL([HAVE_CROSSTARGET64], [test "x$CROSSTARGET64" != "xno"])

 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
@@ -77,6 +123,11 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"],
 AS_ECHO(["
  Configuration summary for $PACKAGE $VERSION

+  Have XCB: ${HAVE_XCB}
+  Have SPIRV-Tools: ${with_spirv_tools}
+
+  Building demos: ${enable_demos}
+
  Building crosstests: ${HAVE_CROSSTEST}"])
 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"])])
--- a/demos/demo.h
+++ b/demos/demo.h
@@ -1,23 +1,19 @@
 /*
 * Copyright 2016 Henri Verbeet for CodeWeavers
 *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
 *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
 *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

 /* Hack for MinGW-w64 headers.
@@ -40,7 +36,7 @@
 #include <vkd3d_windows.h>
 #define WIDL_C_INLINE_WRAPPERS
 #define COBJMACROS
-#include <d3d12.h>
+#include <vkd3d_d3d12.h>
 #include <inttypes.h>

 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*x))
@@ -127,9 +123,25 @@ static inline void demo_blend_desc_init_default(D3D12_BLEND_DESC *desc)
    }
 }

+static inline HRESULT demo_create_root_signature(ID3D12Device *device,
+        const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **signature)
+{
+    ID3DBlob *blob;
+    HRESULT hr;
+
+    if (FAILED(hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1, &blob, NULL)))
+        return hr;
+    hr = ID3D12Device_CreateRootSignature(device, 0, ID3D10Blob_GetBufferPointer(blob),
+            ID3D10Blob_GetBufferSize(blob), &IID_ID3D12RootSignature, (void **)signature);
+    ID3D10Blob_Release(blob);
+
+    return hr;
+}
+
 #ifdef _WIN32
 #include "demo_win32.h"
 #else
 #include <vkd3d_utils.h>
+#define INFINITE VKD3D_INFINITE
 #include "demo_xcb.h"
 #endif
--- a/demos/demo_win32.h
+++ b/demos/demo_win32.h
@@ -2,26 +2,22 @@
 * Copyright 2016 Józef Kucia for CodeWeavers
 * Copyright 2016 Henri Verbeet for CodeWeavers
 *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
 *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
 *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

-#include <dxgi1_4.h>
+#include <vkd3d_dxgi1_4.h>
 #include <stdbool.h>
 #include <stdio.h>

@@ -29,10 +25,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;

@@ -202,11 +194,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;
@@ -220,7 +207,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;
@@ -228,16 +215,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,
@@ -329,46 +311,3 @@ static inline void demo_destroy_event(HANDLE event)
 {
    CloseHandle(event);
 }
-
-static inline HRESULT demo_create_root_signature(ID3D12Device *device,
-        const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **signature)
-{
-    ID3DBlob *blob;
-    HRESULT hr;
-
-    if (FAILED(hr = D3D12SerializeRootSignature(desc, D3D_ROOT_SIGNATURE_VERSION_1, &blob, NULL)))
-        return hr;
-    hr = ID3D12Device_CreateRootSignature(device, 0, ID3D10Blob_GetBufferPointer(blob),
-            ID3D10Blob_GetBufferSize(blob), &IID_ID3D12RootSignature, (void **)signature);
-    ID3D10Blob_Release(blob);
-
-    return hr;
-}
-
-static inline bool demo_load_shader(struct demo *demo, const wchar_t *hlsl_name, const char *entry_point,
-        const char *profile, const char *spv_name, D3D12_SHADER_BYTECODE *shader)
-{
-    ID3D10Blob *blob, *errors;
-    HRESULT hr;
-
-    hr = demo->compile_from_file(hlsl_name, NULL, NULL, entry_point, profile, 0, 0, &blob, &errors);
-    if (errors)
-    {
-        fprintf(stderr, "%.*s\n", (int)ID3D10Blob_GetBufferSize(errors), (char *)ID3D10Blob_GetBufferPointer(errors));
-        ID3D10Blob_Release(errors);
-    }
-    if (FAILED(hr))
-        return false;
-
-    shader->BytecodeLength = ID3D10Blob_GetBufferSize(blob);
-    if (!(shader->pShaderBytecode = malloc(shader->BytecodeLength)))
-    {
-        ID3D10Blob_Release(blob);
-        return false;
-    }
-
-    memcpy((void *)shader->pShaderBytecode, ID3D10Blob_GetBufferPointer(blob), shader->BytecodeLength);
-
-    ID3D10Blob_Release(blob);
-    return true;
-}
--- a/demos/demo_xcb.h
+++ b/demos/demo_xcb.h
@@ -2,23 +2,19 @@
 * Copyright 2016 Józef Kucia for CodeWeavers
 * Copyright 2016 Henri Verbeet for CodeWeavers
 *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
 *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
 *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

 #define VK_USE_PLATFORM_XCB_KHR
@@ -30,6 +26,7 @@
 #include <limits.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <stdbool.h>

 struct demo
 {
@@ -37,6 +34,7 @@ struct demo
    xcb_atom_t wm_protocols_atom;
    xcb_atom_t wm_delete_window_atom;
    xcb_key_symbols_t *xcb_keysyms;
+    int screen;

    struct demo_window **windows;
    size_t windows_size;
@@ -64,7 +62,7 @@ struct demo_swapchain

    VkInstance vk_instance;
    VkDevice vk_device;
-    VkQueue vk_queue;
+    ID3D12CommandQueue *command_queue;

    uint32_t current_buffer;
    unsigned int buffer_count;
@@ -134,6 +132,20 @@ static inline struct demo_window *demo_find_window(struct demo *demo, xcb_window
    return NULL;
 }

+static inline xcb_screen_t *demo_get_screen(xcb_connection_t *c, int idx)
+{
+    xcb_screen_iterator_t iter;
+
+    iter = xcb_setup_roots_iterator(xcb_get_setup(c));
+    for (; iter.rem; xcb_screen_next(&iter), --idx)
+    {
+        if (!idx)
+            return iter.data;
+    }
+
+    return NULL;
+}
+
 static inline struct demo_window *demo_window_create(struct demo *demo, const char *title,
        unsigned int width, unsigned int height, void *user_data)
 {
@@ -143,6 +155,9 @@ static inline struct demo_window *demo_window_create(struct demo *demo, const ch
    xcb_size_hints_t hints;
    xcb_screen_t *screen;

+    if (!(screen = demo_get_screen(demo->connection, demo->screen)))
+        return NULL;
+
    if (!(window = malloc(sizeof(*window))))
        return NULL;

@@ -157,7 +172,6 @@ static inline struct demo_window *demo_window_create(struct demo *demo, const ch
    window->user_data = user_data;
    window->expose_func = NULL;
    window->key_press_func = NULL;
-    screen = xcb_setup_roots_iterator(xcb_get_setup(demo->connection)).data;
    xcb_create_window(demo->connection, XCB_COPY_FROM_PARENT, window->window, screen->root, 0, 0,
            width, height, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, screen->root_visual,
            XCB_CW_EVENT_MASK, &window_events);
@@ -254,7 +268,7 @@ static inline void demo_process_events(struct demo *demo)

 static inline bool demo_init(struct demo *demo, void *user_data)
 {
-    if (!(demo->connection = xcb_connect(NULL, NULL)))
+    if (!(demo->connection = xcb_connect(NULL, &demo->screen)))
        return false;
    if (xcb_connection_has_error(demo->connection) > 0)
        goto fail;
@@ -291,27 +305,16 @@ static inline void demo_set_idle_func(struct demo *demo,
    demo->idle_func = idle_func;
 }

-static inline DXGI_FORMAT demo_get_srgb_format(DXGI_FORMAT format)
-{
-    switch (format)
-    {
-        case DXGI_FORMAT_B8G8R8A8_UNORM:
-            return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB;
-        default:
-            return DXGI_FORMAT_UNKNOWN;
-    }
-}
-
 static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *command_queue,
        struct demo_window *window, const struct demo_swapchain_desc *desc)
 {
+    struct vkd3d_image_resource_create_info resource_create_info;
    struct VkSwapchainCreateInfoKHR vk_swapchain_desc;
    struct VkXcbSurfaceCreateInfoKHR surface_desc;
    VkSwapchainKHR vk_swapchain = VK_NULL_HANDLE;
    uint32_t format_count, queue_family_index;
    VkSurfaceCapabilitiesKHR surface_caps;
    VkPhysicalDevice vk_physical_device;
-    D3D12_RESOURCE_DESC resource_desc;
    VkFence vk_fence = VK_NULL_HANDLE;
    struct demo_swapchain *swapchain;
    unsigned int image_count, i, j;
@@ -325,13 +328,13 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c
    VkImage *vk_images;
    VkFormat format;

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

    if (FAILED(ID3D12CommandQueue_GetDevice(command_queue, &IID_ID3D12Device, (void **)&d3d12_device)))
        return NULL;

-    vk_instance = vkd3d_get_vk_instance(d3d12_device);
+    vk_instance = vkd3d_instance_get_vk_instance(vkd3d_instance_from_device(d3d12_device));
    vk_physical_device = vkd3d_get_vk_physical_device(d3d12_device);
    vk_device = vkd3d_get_vk_device(d3d12_device);

@@ -372,11 +375,11 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c
    }

    if (format_count != 1 || formats->format != VK_FORMAT_UNDEFINED
-            || formats->colorSpace != VK_COLORSPACE_SRGB_NONLINEAR_KHR)
+            || formats->colorSpace != VK_COLOR_SPACE_SRGB_NONLINEAR_KHR)
    {
        for (i = 0; i < format_count; ++i)
        {
-            if (formats[i].format == format && formats[i].colorSpace == VK_COLORSPACE_SRGB_NONLINEAR_KHR)
+            if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR)
                break;
        }

@@ -396,7 +399,7 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c
    vk_swapchain_desc.surface = vk_surface;
    vk_swapchain_desc.minImageCount = desc->buffer_count;
    vk_swapchain_desc.imageFormat = format;
-    vk_swapchain_desc.imageColorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR;
+    vk_swapchain_desc.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
    vk_swapchain_desc.imageExtent.width = desc->width;
    vk_swapchain_desc.imageExtent.height = desc->height;
    vk_swapchain_desc.imageArrayLayers = 1;
@@ -438,29 +441,31 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c
    swapchain->vk_fence = vk_fence;
    swapchain->vk_instance = vk_instance;
    swapchain->vk_device = vk_device;
-    swapchain->vk_queue = vkd3d_get_vk_queue(command_queue);

    vkAcquireNextImageKHR(vk_device, vk_swapchain, UINT64_MAX,
            VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer);
    vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX);
    vkResetFences(vk_device, 1, &vk_fence);

-    resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
-    resource_desc.Alignment = 0;
-    resource_desc.Width = desc->width;
-    resource_desc.Height = desc->height;
-    resource_desc.DepthOrArraySize = 1;
-    resource_desc.MipLevels = 1;
-    resource_desc.Format = desc->format;
-    resource_desc.SampleDesc.Count = 1;
-    resource_desc.SampleDesc.Quality = 0;
-    resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
-    resource_desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+    resource_create_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO;
+    resource_create_info.next = NULL;
+    resource_create_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D;
+    resource_create_info.desc.Alignment = 0;
+    resource_create_info.desc.Width = desc->width;
+    resource_create_info.desc.Height = desc->height;
+    resource_create_info.desc.DepthOrArraySize = 1;
+    resource_create_info.desc.MipLevels = 1;
+    resource_create_info.desc.Format = desc->format;
+    resource_create_info.desc.SampleDesc.Count = 1;
+    resource_create_info.desc.SampleDesc.Quality = 0;
+    resource_create_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN;
+    resource_create_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET;
+    resource_create_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION;
+    resource_create_info.present_state = D3D12_RESOURCE_STATE_PRESENT;
    for (i = 0; i < image_count; ++i)
    {
-        if (FAILED(vkd3d_create_image_resource(d3d12_device, &resource_desc, vk_images[i],
-                VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_SWAPCHAIN_IMAGE,
-                &swapchain->buffers[i])))
+        resource_create_info.vk_image = vk_images[i];
+        if (FAILED(vkd3d_create_image_resource(d3d12_device, &resource_create_info, &swapchain->buffers[i])))
        {
            for (j = 0; j < i; ++j)
            {
@@ -475,6 +480,8 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c
    free(vk_images);
    ID3D12Device_Release(d3d12_device);

+    ID3D12CommandQueue_AddRef(swapchain->command_queue = command_queue);
+
    return swapchain;

 fail:
@@ -505,6 +512,7 @@ static inline ID3D12Resource *demo_swapchain_get_back_buffer(struct demo_swapcha
 static inline void demo_swapchain_present(struct demo_swapchain *swapchain)
 {
    VkPresentInfoKHR present_desc;
+    VkQueue vk_queue;

    present_desc.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
    present_desc.pNext = NULL;
@@ -515,7 +523,9 @@ static inline void demo_swapchain_present(struct demo_swapchain *swapchain)
    present_desc.pImageIndices = &swapchain->current_buffer;
    present_desc.pResults = NULL;

-    vkQueuePresentKHR(swapchain->vk_queue, &present_desc);
+    vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue);
+    vkQueuePresentKHR(vk_queue, &present_desc);
+    vkd3d_release_vk_queue(swapchain->command_queue);

    vkAcquireNextImageKHR(swapchain->vk_device, swapchain->vk_swapchain, UINT64_MAX,
            VK_NULL_HANDLE, swapchain->vk_fence, &swapchain->current_buffer);
@@ -527,6 +537,7 @@ static inline void demo_swapchain_destroy(struct demo_swapchain *swapchain)
 {
    unsigned int i;

+    ID3D12CommandQueue_Release(swapchain->command_queue);
    for (i = 0; i < swapchain->buffer_count; ++i)
    {
        ID3D12Resource_Release(swapchain->buffers[i]);
@@ -551,47 +562,3 @@ static inline void demo_destroy_event(HANDLE event)
 {
    vkd3d_destroy_event(event);
 }
-
-static inline HRESULT demo_create_root_signature(ID3D12Device *device,
-        const D3D12_ROOT_SIGNATURE_DESC *desc, ID3D12RootSignature **signature)
-{
-    return ID3D12Device_CreateRootSignature(device, 0, desc, ~(SIZE_T)0,
-            &IID_ID3D12RootSignature, (void **)signature);
-}
-
-static inline bool demo_load_shader(struct demo *demo, const wchar_t *hlsl_name, const char *entry_point,
-        const char *profile, const char *spv_name, D3D12_SHADER_BYTECODE *shader)
-{
-    size_t data_size;
-    struct stat st;
-    ssize_t res;
-    void *data;
-    int fd;
-
-    if ((fd = open(spv_name, O_RDONLY)) == -1)
-        return false;
-
-    if (fstat(fd, &st) == -1)
-        goto fail;
-
-    data_size = st.st_size;
-    if (!(data = malloc(data_size)))
-        goto fail;
-
-    res = read(fd, data, data_size);
-    close(fd);
-    if (res != data_size)
-    {
-        free(data);
-        return false;
-    }
-
-    shader->pShaderBytecode = data;
-    shader->BytecodeLength = data_size;
-
-    return true;
-
-fail:
-    close(fd);
-    return false;
-}
--- a/demos/gears.c
+++ b/demos/gears.c
@@ -1,23 +1,19 @@
 /*
 * Copyright 2016 Henri Verbeet for CodeWeavers
 *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
 *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
 *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

 /*
@@ -52,6 +48,10 @@
 #include <math.h>
 #include "demo.h"

+#include "gears_vs.h"
+#include "gears_ps_flat.h"
+#include "gears_ps_smooth.h"
+
 struct cxg_fence
 {
    ID3D12Fence *fence;
@@ -659,7 +659,6 @@ static void cxg_load_assets(struct cx_gears *cxg)
    D3D12_RANGE read_range = {0, 0};
    D3D12_CLEAR_VALUE clear_value;
    HRESULT hr;
-    bool ret;

    root_parameter.ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV;
    root_parameter.Descriptor.ShaderRegister = 0;
@@ -681,11 +680,10 @@ static void cxg_load_assets(struct cx_gears *cxg)
    pso_desc.InputLayout.pInputElementDescs = il_desc;
    pso_desc.InputLayout.NumElements = ARRAY_SIZE(il_desc);
    pso_desc.pRootSignature = cxg->root_signature;
-    ret = demo_load_shader(&cxg->demo, L"gears.hlsl", "vs_main", "vs_5_0", "gears.vert.spv", &pso_desc.VS);
-    assert(ret);
-    ret = demo_load_shader(&cxg->demo, L"gears.hlsl", "ps_main_flat",
-            "ps_5_0", "gears_flat.frag.spv", &pso_desc.PS);
-    assert(ret);
+    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);

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

-    free((void *)pso_desc.PS.pShaderBytecode);
-    ret = demo_load_shader(&cxg->demo, L"gears.hlsl", "ps_main_smooth",
-            "ps_5_0", "gears_smooth.frag.spv", &pso_desc.PS);
-    assert(ret);
+    pso_desc.PS.pShaderBytecode = g_ps_main_smooth;
+    pso_desc.PS.BytecodeLength = sizeof(g_ps_main_smooth);
    hr = ID3D12Device_CreateGraphicsPipelineState(cxg->device, &pso_desc,
            &IID_ID3D12PipelineState, (void **)&cxg->pipeline_state_smooth);
    assert(SUCCEEDED(hr));

-    free((void *)pso_desc.PS.pShaderBytecode);
-    free((void *)pso_desc.VS.pShaderBytecode);
-
    hr = ID3D12Device_CreateCommandList(cxg->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxg->command_allocator[0],
            cxg->pipeline_state_flat, &IID_ID3D12GraphicsCommandList, (void **)&cxg->command_list[0]);
    assert(SUCCEEDED(hr));
--- a/demos/gears.vert
+++ b/demos/gears.vert
@@ -1,40 +0,0 @@
-#version 150
-#extension GL_ARB_separate_shader_objects : enable
-
-layout(location = 0) in vec4 position_in;
-layout(location = 1) in vec3 normal_in;
-layout(location = 2) in vec3 diffuse_in;
-layout(location = 3) in vec4 transform_in;
-
-layout(location = 0) out vec4 colour_out;
-
-uniform gear_block
-{
-    uniform mat4 mvp_matrix;
-    uniform mat3 normal_matrix;
-} gear;
-
-void main()
-{
-    const vec3 l_pos = vec3(5.0, 5.0, 10.0);
-    vec3 dir, normal;
-    vec4 position;
-    float att;
-
-    position.x = transform_in.x * position_in.x - transform_in.y * position_in.y + transform_in.z;
-    position.y = transform_in.x * position_in.y + transform_in.y * position_in.x + transform_in.w;
-    position.zw = position_in.zw;
-
-    gl_Position = gear.mvp_matrix * position;
-    dir = normalize(l_pos - gl_Position.xyz / gl_Position.w);
-
-    normal.x = transform_in.x * normal_in.x - transform_in.y * normal_in.y;
-    normal.y = transform_in.x * normal_in.y + transform_in.y * normal_in.x;
-    normal.z = normal_in.z;
-    att = 0.2 + dot(dir, normalize(gear.normal_matrix * normal));
-
-    colour_out.xyz = diffuse_in.xyz * att;
-    colour_out.w = 1.0;
-
-    gl_Position.y = -gl_Position.y;
-}
--- a/demos/gears_flat.frag
+++ b/demos/gears_flat.frag
@@ -1,10 +0,0 @@
-#version 150
-#extension GL_ARB_separate_shader_objects : enable
-
-layout(location = 0) flat in vec4 colour_in;
-layout(location = 0) out vec4 colour_out;
-
-void main(void)
-{
-    colour_out = colour_in;
-}
--- a/demos/gears_ps_flat.h
+++ b/demos/gears_ps_flat.h
@@ -0,0 +1,73 @@
+#if 0
+//
+// Generated by Microsoft (R) D3D Shader Disassembler
+//
+//
+// Input signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// SV_POSITION              0   xyzw        0      POS   float
+// COLOR                    0   xyzw        1     NONE   float   xyzw
+//
+//
+// Output signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
+//
+ps_5_0
+dcl_globalFlags refactoringAllowed
+dcl_input_ps constant v1.xyzw
+dcl_output o0.xyzw
+mov o0.xyzw, v1.xyzw
+ret
+// Approximately 0 instruction slots used
+#endif
+
+const BYTE g_ps_main_flat[] =
+{
+     68,  88,  66,  67, 254, 211,
+     50,  72, 228, 208,  73,  13,
+    143, 221, 134, 105,   6, 165,
+     26, 140,   1,   0,   0,   0,
+    248,   0,   0,   0,   3,   0,
+      0,   0,  44,   0,   0,   0,
+    128,   0,   0,   0, 180,   0,
+      0,   0,  73,  83,  71,  78,
+     76,   0,   0,   0,   2,   0,
+      0,   0,   8,   0,   0,   0,
+     56,   0,   0,   0,   0,   0,
+      0,   0,   1,   0,   0,   0,
+      3,   0,   0,   0,   0,   0,
+      0,   0,  15,   0,   0,   0,
+     68,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      3,   0,   0,   0,   1,   0,
+      0,   0,  15,  15,   0,   0,
+     83,  86,  95,  80,  79,  83,
+     73,  84,  73,  79,  78,   0,
+     67,  79,  76,  79,  82,   0,
+    171, 171,  79,  83,  71,  78,
+     44,   0,   0,   0,   1,   0,
+      0,   0,   8,   0,   0,   0,
+     32,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      3,   0,   0,   0,   0,   0,
+      0,   0,  15,   0,   0,   0,
+     83,  86,  95,  84,  65,  82,
+     71,  69,  84,   0, 171, 171,
+     83,  72,  69,  88,  60,   0,
+      0,   0,  80,   0,   0,   0,
+     15,   0,   0,   0, 106,   8,
+      0,   1,  98,   8,   0,   3,
+    242,  16,  16,   0,   1,   0,
+      0,   0, 101,   0,   0,   3,
+    242,  32,  16,   0,   0,   0,
+      0,   0,  54,   0,   0,   5,
+    242,  32,  16,   0,   0,   0,
+      0,   0,  70,  30,  16,   0,
+      1,   0,   0,   0,  62,   0,
+      0,   1
+};
--- a/demos/gears_ps_smooth.h
+++ b/demos/gears_ps_smooth.h
@@ -0,0 +1,73 @@
+#if 0
+//
+// Generated by Microsoft (R) D3D Shader Disassembler
+//
+//
+// Input signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// SV_POSITION              0   xyzw        0      POS   float
+// COLOR                    0   xyzw        1     NONE   float   xyzw
+//
+//
+// Output signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
+//
+ps_5_0
+dcl_globalFlags refactoringAllowed
+dcl_input_ps linear v1.xyzw
+dcl_output o0.xyzw
+mov o0.xyzw, v1.xyzw
+ret
+// Approximately 0 instruction slots used
+#endif
+
+const BYTE g_ps_main_smooth[] =
+{
+     68,  88,  66,  67,  80, 239,
+    109,  26,   0, 147,   6, 156,
+    240, 104, 206, 124, 185,  57,
+     18,  98,   1,   0,   0,   0,
+    248,   0,   0,   0,   3,   0,
+      0,   0,  44,   0,   0,   0,
+    128,   0,   0,   0, 180,   0,
+      0,   0,  73,  83,  71,  78,
+     76,   0,   0,   0,   2,   0,
+      0,   0,   8,   0,   0,   0,
+     56,   0,   0,   0,   0,   0,
+      0,   0,   1,   0,   0,   0,
+      3,   0,   0,   0,   0,   0,
+      0,   0,  15,   0,   0,   0,
+     68,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      3,   0,   0,   0,   1,   0,
+      0,   0,  15,  15,   0,   0,
+     83,  86,  95,  80,  79,  83,
+     73,  84,  73,  79,  78,   0,
+     67,  79,  76,  79,  82,   0,
+    171, 171,  79,  83,  71,  78,
+     44,   0,   0,   0,   1,   0,
+      0,   0,   8,   0,   0,   0,
+     32,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      3,   0,   0,   0,   0,   0,
+      0,   0,  15,   0,   0,   0,
+     83,  86,  95,  84,  65,  82,
+     71,  69,  84,   0, 171, 171,
+     83,  72,  69,  88,  60,   0,
+      0,   0,  80,   0,   0,   0,
+     15,   0,   0,   0, 106,   8,
+      0,   1,  98,  16,   0,   3,
+    242,  16,  16,   0,   1,   0,
+      0,   0, 101,   0,   0,   3,
+    242,  32,  16,   0,   0,   0,
+      0,   0,  54,   0,   0,   5,
+    242,  32,  16,   0,   0,   0,
+      0,   0,  70,  30,  16,   0,
+      1,   0,   0,   0,  62,   0,
+      0,   1
+};
--- a/demos/gears_smooth.frag
+++ b/demos/gears_smooth.frag
@@ -1,10 +0,0 @@
-#version 150
-#extension GL_ARB_separate_shader_objects : enable
-
-layout(location = 0) in vec4 colour_in;
-layout(location = 0) out vec4 colour_out;
-
-void main(void)
-{
-    colour_out = colour_in;
-}
--- a/demos/gears_vs.h
+++ b/demos/gears_vs.h
@@ -0,0 +1,272 @@
+#if 0
+//
+// Generated by Microsoft (R) D3D Shader Disassembler
+//
+//
+// Input signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// POSITION                 0   xyzw        0     NONE   float   xyzw
+// NORMAL                   0   xyz         1     NONE   float   xyz
+// DIFFUSE                  0   xyz         2     NONE   float   xyz
+// TRANSFORM                0   xyzw        3     NONE   float   xyzw
+//
+//
+// Output signature:
+//
+// Name                 Index   Mask Register SysValue  Format   Used
+// -------------------- ----- ------ -------- -------- ------- ------
+// SV_POSITION              0   xyzw        0      POS   float   xyzw
+// COLOR                    0   xyzw        1     NONE   float   xyzw
+//
+vs_5_0
+dcl_globalFlags refactoringAllowed
+dcl_constantbuffer CB0[7], immediateIndexed
+dcl_input v0.xyzw
+dcl_input v1.xyz
+dcl_input v2.xyz
+dcl_input v3.xyzw
+dcl_output_siv o0.xyzw, position
+dcl_output o1.xyzw
+dcl_temps 2
+mul r0.x, v0.y, v3.y
+mad r0.x, v3.x, v0.x, -r0.x
+dp2 r0.y, v3.yxyy, v0.xyxx
+add r0.xy, r0.xyxx, v3.zwzz
+mul r1.xyzw, r0.yyyy, cb0[1].xyzw
+mad r0.xyzw, cb0[0].xyzw, r0.xxxx, r1.xyzw
+mad r0.xyzw, cb0[2].xyzw, v0.zzzz, r0.xyzw
+mad r0.xyzw, cb0[3].xyzw, v0.wwww, r0.xyzw
+mov o0.xyzw, r0.xyzw
+div r0.xyz, r0.xyzx, r0.wwww
+add r0.xyz, -r0.xyzx, l(5.000000, 5.000000, 10.000000, 0.000000)
+dp3 r0.w, r0.xyzx, r0.xyzx
+rsq r0.w, r0.w
+mul r0.xyz, r0.wwww, r0.xyzx
+mul r0.w, v1.y, v3.y
+mad r0.w, v3.x, v1.x, -r0.w
+dp2 r1.x, v3.yxyy, v1.xyxx
+mul r1.xyz, r1.xxxx, cb0[5].xyzx
+mad r1.xyz, cb0[4].xyzx, r0.wwww, r1.xyzx
+mad r1.xyz, cb0[6].xyzx, v1.zzzz, r1.xyzx
+dp3 r0.w, r1.xyzx, r1.xyzx
+rsq r0.w, r0.w
+mul r1.xyz, r0.wwww, r1.xyzx
+dp3 r0.x, r0.xyzx, r1.xyzx
+add r0.x, r0.x, l(0.200000)
+mul o1.xyz, r0.xxxx, v2.xyzx
+mov o1.w, l(1.000000)
+ret
+// Approximately 0 instruction slots used
+#endif
+
+const BYTE g_vs_main[] =
+{
+     68,  88,  66,  67,  82,  90,
+     22, 185,  41,  66, 113, 173,
+     43,  53, 199,  35,  30,  50,
+     78,   7,   1,   0,   0,   0,
+    208,   4,   0,   0,   3,   0,
+      0,   0,  44,   0,   0,   0,
+    192,   0,   0,   0,  20,   1,
+      0,   0,  73,  83,  71,  78,
+    140,   0,   0,   0,   4,   0,
+      0,   0,   8,   0,   0,   0,
+    104,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      3,   0,   0,   0,   0,   0,
+      0,   0,  15,  15,   0,   0,
+    113,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      3,   0,   0,   0,   1,   0,
+      0,   0,   7,   7,   0,   0,
+    120,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      3,   0,   0,   0,   2,   0,
+      0,   0,   7,   7,   0,   0,
+    128,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      3,   0,   0,   0,   3,   0,
+      0,   0,  15,  15,   0,   0,
+     80,  79,  83,  73,  84,  73,
+     79,  78,   0,  78,  79,  82,
+     77,  65,  76,   0,  68,  73,
+     70,  70,  85,  83,  69,   0,
+     84,  82,  65,  78,  83,  70,
+     79,  82,  77,   0, 171, 171,
+     79,  83,  71,  78,  76,   0,
+      0,   0,   2,   0,   0,   0,
+      8,   0,   0,   0,  56,   0,
+      0,   0,   0,   0,   0,   0,
+      1,   0,   0,   0,   3,   0,
+      0,   0,   0,   0,   0,   0,
+     15,   0,   0,   0,  68,   0,
+      0,   0,   0,   0,   0,   0,
+      0,   0,   0,   0,   3,   0,
+      0,   0,   1,   0,   0,   0,
+     15,   0,   0,   0,  83,  86,
+     95,  80,  79,  83,  73,  84,
+     73,  79,  78,   0,  67,  79,
+     76,  79,  82,   0, 171, 171,
+     83,  72,  69,  88, 180,   3,
+      0,   0,  80,   0,   1,   0,
+    237,   0,   0,   0, 106,   8,
+      0,   1,  89,   0,   0,   4,
+     70, 142,  32,   0,   0,   0,
+      0,   0,   7,   0,   0,   0,
+     95,   0,   0,   3, 242,  16,
+     16,   0,   0,   0,   0,   0,
+     95,   0,   0,   3, 114,  16,
+     16,   0,   1,   0,   0,   0,
+     95,   0,   0,   3, 114,  16,
+     16,   0,   2,   0,   0,   0,
+     95,   0,   0,   3, 242,  16,
+     16,   0,   3,   0,   0,   0,
+    103,   0,   0,   4, 242,  32,
+     16,   0,   0,   0,   0,   0,
+      1,   0,   0,   0, 101,   0,
+      0,   3, 242,  32,  16,   0,
+      1,   0,   0,   0, 104,   0,
+      0,   2,   2,   0,   0,   0,
+     56,   0,   0,   7,  18,   0,
+     16,   0,   0,   0,   0,   0,
+     26,  16,  16,   0,   0,   0,
+      0,   0,  26,  16,  16,   0,
+      3,   0,   0,   0,  50,   0,
+      0,  10,  18,   0,  16,   0,
+      0,   0,   0,   0,  10,  16,
+     16,   0,   3,   0,   0,   0,
+     10,  16,  16,   0,   0,   0,
+      0,   0,  10,   0,  16, 128,
+     65,   0,   0,   0,   0,   0,
+      0,   0,  15,   0,   0,   7,
+     34,   0,  16,   0,   0,   0,
+      0,   0,  22,  21,  16,   0,
+      3,   0,   0,   0,  70,  16,
+     16,   0,   0,   0,   0,   0,
+      0,   0,   0,   7,  50,   0,
+     16,   0,   0,   0,   0,   0,
+     70,   0,  16,   0,   0,   0,
+      0,   0, 230,  26,  16,   0,
+      3,   0,   0,   0,  56,   0,
+      0,   8, 242,   0,  16,   0,
+      1,   0,   0,   0,  86,   5,
+     16,   0,   0,   0,   0,   0,
+     70, 142,  32,   0,   0,   0,
+      0,   0,   1,   0,   0,   0,
+     50,   0,   0,  10, 242,   0,
+     16,   0,   0,   0,   0,   0,
+     70, 142,  32,   0,   0,   0,
+      0,   0,   0,   0,   0,   0,
+      6,   0,  16,   0,   0,   0,
+      0,   0,  70,  14,  16,   0,
+      1,   0,   0,   0,  50,   0,
+      0,  10, 242,   0,  16,   0,
+      0,   0,   0,   0,  70, 142,
+     32,   0,   0,   0,   0,   0,
+      2,   0,   0,   0, 166,  26,
+     16,   0,   0,   0,   0,   0,
+     70,  14,  16,   0,   0,   0,
+      0,   0,  50,   0,   0,  10,
+    242,   0,  16,   0,   0,   0,
+      0,   0,  70, 142,  32,   0,
+      0,   0,   0,   0,   3,   0,
+      0,   0, 246,  31,  16,   0,
+      0,   0,   0,   0,  70,  14,
+     16,   0,   0,   0,   0,   0,
+     54,   0,   0,   5, 242,  32,
+     16,   0,   0,   0,   0,   0,
+     70,  14,  16,   0,   0,   0,
+      0,   0,  14,   0,   0,   7,
+    114,   0,  16,   0,   0,   0,
+      0,   0,  70,   2,  16,   0,
+      0,   0,   0,   0, 246,  15,
+     16,   0,   0,   0,   0,   0,
+      0,   0,   0,  11, 114,   0,
+     16,   0,   0,   0,   0,   0,
+     70,   2,  16, 128,  65,   0,
+      0,   0,   0,   0,   0,   0,
+      2,  64,   0,   0,   0,   0,
+    160,  64,   0,   0, 160,  64,
+      0,   0,  32,  65,   0,   0,
+      0,   0,  16,   0,   0,   7,
+    130,   0,  16,   0,   0,   0,
+      0,   0,  70,   2,  16,   0,
+      0,   0,   0,   0,  70,   2,
+     16,   0,   0,   0,   0,   0,
+     68,   0,   0,   5, 130,   0,
+     16,   0,   0,   0,   0,   0,
+     58,   0,  16,   0,   0,   0,
+      0,   0,  56,   0,   0,   7,
+    114,   0,  16,   0,   0,   0,
+      0,   0, 246,  15,  16,   0,
+      0,   0,   0,   0,  70,   2,
+     16,   0,   0,   0,   0,   0,
+     56,   0,   0,   7, 130,   0,
+     16,   0,   0,   0,   0,   0,
+     26,  16,  16,   0,   1,   0,
+      0,   0,  26,  16,  16,   0,
+      3,   0,   0,   0,  50,   0,
+      0,  10, 130,   0,  16,   0,
+      0,   0,   0,   0,  10,  16,
+     16,   0,   3,   0,   0,   0,
+     10,  16,  16,   0,   1,   0,
+      0,   0,  58,   0,  16, 128,
+     65,   0,   0,   0,   0,   0,
+      0,   0,  15,   0,   0,   7,
+     18,   0,  16,   0,   1,   0,
+      0,   0,  22,  21,  16,   0,
+      3,   0,   0,   0,  70,  16,
+     16,   0,   1,   0,   0,   0,
+     56,   0,   0,   8, 114,   0,
+     16,   0,   1,   0,   0,   0,
+      6,   0,  16,   0,   1,   0,
+      0,   0,  70, 130,  32,   0,
+      0,   0,   0,   0,   5,   0,
+      0,   0,  50,   0,   0,  10,
+    114,   0,  16,   0,   1,   0,
+      0,   0,  70, 130,  32,   0,
+      0,   0,   0,   0,   4,   0,
+      0,   0, 246,  15,  16,   0,
+      0,   0,   0,   0,  70,   2,
+     16,   0,   1,   0,   0,   0,
+     50,   0,   0,  10, 114,   0,
+     16,   0,   1,   0,   0,   0,
+     70, 130,  32,   0,   0,   0,
+      0,   0,   6,   0,   0,   0,
+    166,  26,  16,   0,   1,   0,
+      0,   0,  70,   2,  16,   0,
+      1,   0,   0,   0,  16,   0,
+      0,   7, 130,   0,  16,   0,
+      0,   0,   0,   0,  70,   2,
+     16,   0,   1,   0,   0,   0,
+     70,   2,  16,   0,   1,   0,
+      0,   0,  68,   0,   0,   5,
+    130,   0,  16,   0,   0,   0,
+      0,   0,  58,   0,  16,   0,
+      0,   0,   0,   0,  56,   0,
+      0,   7, 114,   0,  16,   0,
+      1,   0,   0,   0, 246,  15,
+     16,   0,   0,   0,   0,   0,
+     70,   2,  16,   0,   1,   0,
+      0,   0,  16,   0,   0,   7,
+     18,   0,  16,   0,   0,   0,
+      0,   0,  70,   2,  16,   0,
+      0,   0,   0,   0,  70,   2,
+     16,   0,   1,   0,   0,   0,
+      0,   0,   0,   7,  18,   0,
+     16,   0,   0,   0,   0,   0,
+     10,   0,  16,   0,   0,   0,
+      0,   0,   1,  64,   0,   0,
+    205, 204,  76,  62,  56,   0,
+      0,   7, 114,  32,  16,   0,
+      1,   0,   0,   0,   6,   0,
+     16,   0,   0,   0,   0,   0,
+     70,  18,  16,   0,   2,   0,
+      0,   0,  54,   0,   0,   5,
+    130,  32,  16,   0,   1,   0,
+      0,   0,   1,  64,   0,   0,
+      0,   0, 128,  63,  62,   0,
+      0,   1
+};
--- a/demos/triangle.c
+++ b/demos/triangle.c
@@ -1,23 +1,19 @@
 /*
 * Copyright 2016 Henri Verbeet for CodeWeavers
 *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
 *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
 *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */

 /*
@@ -49,6 +45,9 @@
 #include <assert.h>
 #include "demo.h"

+#include "triangle_vs.h"
+#include "triangle_ps.h"
+
 struct cxt_fence
 {
    ID3D12Fence *fence;
@@ -240,16 +239,6 @@ static void cxt_destroy_assets(struct cx_triangle *cxt)
    ID3D12RootSignature_Release(cxt->root_signature);
 }

-static void cxt_load_shaders(struct cx_triangle *cxt, D3D12_SHADER_BYTECODE *vs, D3D12_SHADER_BYTECODE *ps)
-{
-    bool ret;
-
-    ret = demo_load_shader(&cxt->demo, L"triangle.hlsl", "vs_main", "vs_5_0", "triangle.vert.spv", vs);
-    assert(ret);
-    ret = demo_load_shader(&cxt->demo, L"triangle.hlsl", "ps_main", "ps_5_0", "triangle.frag.spv", ps);
-    assert(ret);
-}
-
 static void cxt_fence_create(struct cxt_fence *fence, ID3D12Device *device)
 {
    HRESULT hr;
@@ -299,7 +288,10 @@ static void cxt_load_assets(struct cx_triangle *cxt)
    pso_desc.InputLayout.pInputElementDescs = il_desc;
    pso_desc.InputLayout.NumElements = ARRAY_SIZE(il_desc);
    pso_desc.pRootSignature = cxt->root_signature;
-    cxt_load_shaders(cxt, &pso_desc.VS, &pso_desc.PS);
+    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);
    demo_rasterizer_desc_init_default(&pso_desc.RasterizerState);
    demo_blend_desc_init_default(&pso_desc.BlendState);
    pso_desc.DepthStencilState.DepthEnable = FALSE;
@@ -313,9 +305,6 @@ static void cxt_load_assets(struct cx_triangle *cxt)
            &IID_ID3D12PipelineState, (void **)&cxt->pipeline_state);
    assert(SUCCEEDED(hr));

-    free((void *)pso_desc.PS.pShaderBytecode);
-    free((void *)pso_desc.VS.pShaderBytecode);
-
    hr = ID3D12Device_CreateCommandList(cxt->device, 0, D3D12_COMMAND_LIST_TYPE_DIRECT, cxt->command_allocator,
            cxt->pipeline_state, &IID_ID3D12GraphicsCommandList, (void **)&cxt->command_list);
    assert(SUCCEEDED(hr));
--- a/demos/triangle.frag
+++ b/demos/triangle.frag
@@ -1,10 +0,0 @@
-#version 150
-#extension GL_ARB_separate_shader_objects : enable
-
-layout(location = 0) in vec4 colour_in;
-layout(location = 0) out vec4 colour_out;
-
-void main(void)
-{
-    colour_out = colour_in;
-}
--- a/demos/triangle.vert
+++ b/demos/triangle.vert
@@ -1,14 +0,0 @@
-#version 150
-#extension GL_ARB_separate_shader_objects : enable
-
-layout(location = 0) in vec4 position_in;
-layout(location = 1) in vec4 colour_in;
-
-layout(location = 0) out vec4 colour_out;
-
-void main(void)
-{
-    gl_Position.xzw = position_in.xzw;
-    gl_Position.y = -position_in.y;
-    colour_out = colour_in;
-}
--- a/Show More
+++ b/Show More