Release 1.6.

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

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

-  - Support for various HLSL features and intrinsics.
-  - Typed unordered access view loads of multicomponent formats.
+  - Initial support for HLSL compute shaders.
+  - More support for HLSL features and intrinsics.
  - Miscellaneous bug fixes.

 The source is available from the following location:

-  https://dl.winehq.org/vkd3d/source/vkd3d-1.5.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:

@@ -21,30 +21,40 @@ for the complete list.

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

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


 *** libvkd3d-shader

 - New features for the HLSL source type:
-  - Improved support for HLSL object types (like e.g. `Texture2D') inside
-    structures and arrays.
-  - Implicitly sized array initialisers.
-  - Support for the dot() intrinsic function.
-  - Support for the ldexp() intrinsic function.
-  - Support for the lerp() intrinsic function.
-  - Support for the logical `and', `or', and `not' operators in shader model 4
-    and 5 targets.
-  - Support for casts from `bool' types in shader model 4 and 5 targets.
-  - Constant folding for integer bitwise operations.
-  - Constant folding for integer min() and max().
+  - Initial support for compute shaders.
+  - Improved support for initialisation and assignment of compound objects
+    like structures and arrays, including casts and implicit conversions.
+  - Support for loads and stores of texture resource unordered-access views.
+  - Support for function attributes. In particular, the required "numthreads"
+    attribute for compute shader entry points is now supported.
+  - Support for the asuint() intrinsic function.
+  - Support for the length() intrinsic function.
+  - Support for the normalize() intrinsic function.
+  - Support for integer division and modulus.
+  - Support for taking the absolute value of integers.
+  - Support for floating-point modulus.
+

 - New interfaces:
-  - The VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV compile option can be used to
-    specify the SPIR-V format to use for typed unordered access view loads.
-    When set to `Unknown', and the `shaderStorageImageReadWithoutFormat'
-    feature is enabled in the target environment, this allows typed loads from
-    multicomponent format unordered access views. If left unspecified, a R32
-    format will be used, like in previous versions of libvkd3d-shader.
+  - The VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_ATOMICS descriptor info flag is
+    used to indicate that atomic operations are used on unordered-access view
+    descriptors.
+
+
+*** 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
+
+- The demos now use libvkd3d-shader to compile HLSL shaders at run-time.

--- a/1
+++ b/1
@@ -3,6 +3,7 @@ Andrew Eikum
 Andrey Gusev
 Atharva Nimbalkar
 Biswapriyo Nath
+Brendan Shanks
 Chip Davis
 Conor McCarthy
 David Gow
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,15 +31,6 @@ vkd3d_public_headers = \
 	include/vkd3d_utils.h \
 	include/vkd3d_windows.h

-vkd3d_demos_shaders = \
-	demos/gears.hlsl \
-	demos/gears_ps_flat.h \
-	demos/gears_ps_smooth.h \
-	demos/gears_vs.h \
-	demos/triangle.hlsl \
-	demos/triangle_ps.h \
-	demos/triangle_vs.h
-
 vkd3d_tests = \
 	tests/vkd3d_api \
 	tests/vkd3d_common \
@@ -53,18 +44,24 @@ vkd3d_cross_tests = \
 vkd3d_shader_tests = \
 	tests/abs.shader_test \
 	tests/arithmetic-float.shader_test \
+	tests/arithmetic-float-uniform.shader_test \
 	tests/arithmetic-int.shader_test \
 	tests/arithmetic-int-uniform.shader_test \
 	tests/arithmetic-uint.shader_test \
 	tests/bitwise.shader_test \
 	tests/cast-broadcast.shader_test \
+	tests/cast-componentwise-equal.shader_test \
+	tests/cast-componentwise-compatible.shader_test \
 	tests/cast-to-float.shader_test \
 	tests/cast-to-half.shader_test \
 	tests/cast-to-int.shader_test \
 	tests/cast-to-uint.shader_test \
+	tests/cbuffer.shader_test \
+	tests/compute.shader_test \
 	tests/conditional.shader_test \
 	tests/floor.shader_test \
 	tests/hlsl-array-dimension.shader_test \
+	tests/hlsl-attributes.shader_test \
 	tests/hlsl-bool-cast.shader_test \
 	tests/hlsl-clamp.shader_test \
 	tests/hlsl-comma.shader_test \
@@ -90,14 +87,17 @@ vkd3d_shader_tests = \
 	tests/hlsl-intrinsic-override.shader_test \
 	tests/hlsl-invalid.shader_test \
 	tests/hlsl-ldexp.shader_test \
+	tests/hlsl-length.shader_test \
 	tests/hlsl-lerp.shader_test \
 	tests/hlsl-majority-pragma.shader_test \
 	tests/hlsl-majority-typedef.shader_test \
 	tests/hlsl-matrix-indexing.shader_test \
 	tests/hlsl-mul.shader_test \
 	tests/hlsl-nested-arrays.shader_test \
+	tests/hlsl-normalize.shader_test \
 	tests/hlsl-numeric-constructor-truncation.shader_test \
 	tests/hlsl-numeric-types.shader_test \
+	tests/hlsl-numthreads.shader_test \
 	tests/hlsl-return-implicit-conversion.shader_test \
 	tests/hlsl-return-void.shader_test \
 	tests/hlsl-shape.shader_test \
@@ -113,9 +113,10 @@ vkd3d_shader_tests = \
 	tests/logic-operations.shader_test \
 	tests/math.shader_test \
 	tests/matrix-semantics.shader_test \
+	tests/max.shader_test \
 	tests/multiple-rt.shader_test \
 	tests/nointerpolation.shader_test \
-	tests/object-references.shader_test
+	tests/object-references.shader_test \
 	tests/pow.shader_test \
 	tests/preproc-if.shader_test \
 	tests/preproc-ifdef.shader_test \
@@ -140,6 +141,7 @@ vkd3d_shader_tests = \
 	tests/texture-load-typed.shader_test \
 	tests/trigonometry.shader_test \
 	tests/uav.shader_test \
+	tests/uav-load.shader_test \
 	tests/writemask-assignop-0.shader_test \
 	tests/writemask-assignop-1.shader_test \
 	tests/writemask-assignop-2.shader_test \
@@ -172,6 +174,7 @@ libvkd3d_common_la_SOURCES = \
 	libs/vkd3d-common/error.c \
 	libs/vkd3d-common/memory.c \
 	libs/vkd3d-common/utf8.c
+libvkd3d_common_la_LIBADD = @PTHREAD_LIBS@

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

@@ -242,7 +245,7 @@ libvkd3d_shader_la_SOURCES = \
 	libs/vkd3d-shader/vkd3d_shader_main.c \
 	libs/vkd3d-shader/vkd3d_shader_private.h
 libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@
-libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:0:3
+libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 5:0:4
 libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm
 if HAVE_LD_VERSION_SCRIPT
 libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map
@@ -276,7 +279,7 @@ libvkd3d_la_SOURCES = \
 	libs/vkd3d/vkd3d_shaders.h \
 	libs/vkd3d/vulkan_procs.h
 libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE
-libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 6:0:5
+libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 7:0:6
 libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@
 if HAVE_LD_VERSION_SCRIPT
 libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map
@@ -288,7 +291,7 @@ libvkd3d_utils_la_SOURCES = \
 	libs/vkd3d-utils/vkd3d_utils_main.c \
 	libs/vkd3d-utils/vkd3d_utils_private.h
 libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE
-libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:1:3
+libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 4:2:3
 libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la libvkd3d.la @PTHREAD_LIBS@
 if HAVE_LD_VERSION_SCRIPT
 libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map
@@ -339,11 +342,11 @@ DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @DL_LIBS@ @DEMO_LIBS@
 DEMOS_CFLAGS = $(AM_CFLAGS) @DEMO_CFLAGS@
 bin_PROGRAMS += $(vkd3d_demos)

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

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

-EXTRA_DIST += $(vkd3d_demos_shaders)
-
 libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in Makefile
 	$(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \
 		-e 's![@]exec_prefix[@]!$(exec_prefix)!g' \
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([vkd3d],[1.5])
+AC_INIT([vkd3d],[1.6])

 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])
--- a/demos/demo_win32.h
+++ b/demos/demo_win32.h
@@ -18,6 +18,7 @@
 */

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

--- a/demos/demo_xcb.h
+++ b/demos/demo_xcb.h
@@ -19,7 +19,7 @@

 #define VK_NO_PROTOTYPES
 #define VK_USE_PLATFORM_XCB_KHR
-#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_5
+#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_6
 #include "config.h"
 #include <vkd3d.h>
 #include <vkd3d_utils.h>
--- a/demos/gears.c
+++ b/demos/gears.c
@@ -48,9 +48,7 @@
 #include <math.h>
 #include "demo.h"

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

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

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

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

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

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

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

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

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

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

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

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

+VKD3D_NORETURN static inline void vkd3d_unreachable_(const char *filename, unsigned int line)
+{
+    fprintf(stderr, "%s:%u: Aborting, reached unreachable code.\n", filename, line);
+    abort();
+}
+
+#ifdef NDEBUG
+#define vkd3d_unreachable() VKD3D_UNREACHABLE
+#else
+#define vkd3d_unreachable() vkd3d_unreachable_(__FILE__, __LINE__)
+#endif
+
 static inline unsigned int vkd3d_popcount(unsigned int v)
 {
 #ifdef _MSC_VER
--- a/include/private/vkd3d_debug.h
+++ b/include/private/vkd3d_debug.h
@@ -115,5 +115,6 @@ struct vkd3d_debug_option
 bool vkd3d_debug_list_has_member(const char *string, const char *member);
 uint64_t vkd3d_parse_debug_options(const char *string,
        const struct vkd3d_debug_option *options, unsigned int option_count);
+void vkd3d_set_thread_name(const char *name);

 #endif  /* __VKD3D_DEBUG_H */
--- a/include/vkd3d.h
+++ b/include/vkd3d.h
@@ -62,6 +62,7 @@ enum vkd3d_api_version
    VKD3D_API_VERSION_1_3,
    VKD3D_API_VERSION_1_4,
    VKD3D_API_VERSION_1_5,
+    VKD3D_API_VERSION_1_6,

    VKD3D_FORCE_32_BIT_ENUM(VKD3D_API_VERSION),
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Henri Verbeet	1eaf73147c	Release 1.6.	2022-12-07 16:08:16 +01:00
Henri Verbeet	d5f810068b	build: Add the demo shaders to the distribution.	2022-12-07 16:08:16 +01:00
Henri Verbeet	21302c09eb	build: Remove $(vkd3d_demos_shaders) from the distribution. These were removed in commits `3d85d77ced` and `763f7dfa61`.	2022-12-07 16:08:11 +01:00
Conor McCarthy	1b11b57652	vkd3d-shader: Introduce DESCRIPTOR_INFO_FLAG_UAV_ATOMICS and always declare UAV images with known type for atomic ops. Atomic ops on images with Unknown type will cause SPIR-V validation failure, and assertion failure in Mesa debug builds. D3D12 allows atomics on typed buffers, and this requires a distinction to be made between UAV reads and atomic ops. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53874	2022-11-21 18:28:54 +01:00
Conor McCarthy	fc652d2b27	tests: Test a typed UAV buffer in test_atomic_instructions(). Until vkd3d-shader is patched, an atomic op on a typed buffer where StorageImageReadWithoutFormat is available will cause SPIR-V validation failure, and assertion in Mesa debug builds, because the image will be declared with Unknown format.	2022-11-21 18:28:42 +01:00
Francisco Casas	43631bde4d	vkd3d-shader/hlsl: Revert expr_compatible_data_types() args names to "t1" and "t2". Unlike compatible_data_types() and implicit_compatible_data_types(), this function is intended to be symmetrical. So it makes sense to preserve the names "t1" and "t2" for the arguments.	2022-11-18 22:29:07 +01:00
Francisco Casas	bd501ce336	vkd3d-shader/hlsl: Don't produce a parse error on empty buffer_body.	2022-11-18 22:29:06 +01:00
Francisco Casas	f100f5b726	vkd3d-shader/hlsl: Check for non-static object references on resource stores.	2022-11-18 22:29:04 +01:00
Francisco Casas	dd1008867e	tests: Add missing entry for max.shader_test in Makefile.am.	2022-11-18 22:29:02 +01:00
Francisco Casas	f21693b284	vkd3d-shader/hlsl: Use reg_size as component count when allocating a single register. Otherwise, for instance, the added test results in: debug_hlsl_writemask: Assertion `!(writemask & ~VKD3DSP_WRITEMASK_ALL)' failed. Which happens in allocate_variable_temp_register() when the variable's type reg_size is <= 4 but its component count is larger, which may happen if it contains objects.	2022-11-10 22:48:26 +01:00
Francisco Casas	90e6e418a3	vkd3d-shader/hlsl: Use the base type of the array elements in write_sm1_type().	2022-11-10 22:48:23 +01:00
Francisco Casas	6873b71304	vkd3d-shader/hlsl: Validate that statics don't contain both resources and numerics.	2022-11-10 22:48:21 +01:00
Francisco Casas	2fa913ccaa	vkd3d-shader/hlsl: Validate that extern structs don't contain objects SM < 5. It is worth noting that these checks should also be included for declarations inside cbuffers, once they are implemented.	2022-11-10 22:48:19 +01:00
Francisco Casas	3153ce3145	vkd3d-shader/hlsl: Don't allocate object types as constant registers.	2022-11-10 22:48:16 +01:00
Francisco Casas	6f6ba8aa56	vkd3d-shader/hlsl: Properly free new store node memory if init_deref() fails.	2022-11-10 22:48:11 +01:00
Zebediah Figura	3857ca06fa	vkd3d-shader/hlsl: Write SM4 dcl_thread_group instructions.	2022-11-08 20:53:08 +01:00
Zebediah Figura	718c79b823	vkd3d-shader/hlsl: Parse the numthreads attribute.	2022-11-08 20:53:04 +01:00
Zebediah Figura	d6799bd5d3	vkd3d-shader/hlsl: Parse function attributes.	2022-11-08 20:53:03 +01:00
Zebediah Figura	da56f41ceb	vkd3d-shader/hlsl: Use hlsl_new_synthetic_var() in hlsl_new_func_decl().	2022-11-08 20:53:01 +01:00
Zebediah Figura	1019bbead6	vkd3d-shader/hlsl: Add a hlsl_fixme() for compute shader thread counts. In particular so that we don't cause test crashes by outputting invalid compute shaders.	2022-11-08 20:52:59 +01:00
Zebediah Figura	c0782a9029	tests: Add some tests for HLSL attribute syntax.	2022-11-08 20:52:59 +01:00
Zebediah Figura	4d17758657	tests: Always compile HLSL shaders. Do not rely on a draw or dispatch command to do this. This allows more efficiently testing syntax, in cases where testing the actual shader functionality is not interesting.	2022-11-08 20:52:57 +01:00
Zebediah Figura	520c7457a9	vkd3d-shader/sm4: Use a flat array to store destination types. This cuts about 12 kB off of the 64-bit build.	2022-11-08 20:52:36 +01:00
Zebediah Figura	4173158c8b	vkd3d-shader/sm4: Use a flat array to store source types.	2022-11-08 20:52:34 +01:00
Zebediah Figura	e2aed38509	vkd3d-shader/spirv: Avoid using DXBC-specific definitions.	2022-11-08 20:52:32 +01:00
Zebediah Figura	ba08825ccd	vkd3d-shader/sm4: Use the VKD3D_DXBC_MAX_SOURCE_COUNT macro where possible.	2022-11-08 20:52:31 +01:00
Zebediah Figura	35b48a8b04	vkd3d-shader/spirv: Rename struct vkd3d_dxbc_compiler to struct spirv_compiler. We would like to generate SPIR-V for input formats other than DXBC. The "vkd3d_" prefix is dropped, partly to make names shorter, and partly to help clarify what is an internal function. I prefer avoiding the vkd3d_* prefix on all internal functions, for these reasons. However, I'm open to restoring it.	2022-11-08 20:52:29 +01:00
Zebediah Figura	58c7c4b806	vkd3d-common: Always prefix debug output with "vkd3d". Make it clear which library the debug output is coming from, without relying on the function name including "vkd3d".	2022-11-08 20:52:27 +01:00
Zebediah Figura	c416627e64	vkd3d-shader/hlsl: Propagate copies for resource store instructions.	2022-10-31 22:07:47 +01:00
Zebediah Figura	9bdae4dfaa	vkd3d-shader/hlsl: Write SM4 UAV store instructions.	2022-10-31 22:07:45 +01:00
Zebediah Figura	03f9d16047	vkd3d-shader/hlsl: Parse UAV stores.	2022-10-31 22:07:44 +01:00
Zebediah Figura	0a2aaa690e	vkd3d-shader/hlsl: Implement typed UAV loads.	2022-10-31 22:07:43 +01:00
Zebediah Figura	12e397de9a	vkd3d-shader/hlsl: Write SM4 UAV declarations.	2022-10-31 22:07:41 +01:00
Zebediah Figura	2ec67e0f10	vkd3d-shader/hlsl: Allocate UAVs.	2022-10-31 22:07:40 +01:00
Francisco Casas	4096d453c4	tests: Add a test for storing to a UAV array.	2022-10-31 22:07:40 +01:00
Zebediah Figura	8044fce040	tests: Add more tests for UAV allocation.	2022-10-31 22:07:40 +01:00
Zebediah Figura	52069386c4	tests: Fix constructor declaration in the partial UAV write test. Make sure the test fails for the right reason. Spotted by Francisco Casas.	2022-10-31 22:07:37 +01:00
Francisco Casas	b711b2d66b	tests: Add additional tests for explicit casts with flat matrices and vectors.	2022-10-26 23:53:12 +02:00
Francisco Casas	fcef269347	tests: Add additional tests for explicit casts with matrices.	2022-10-26 23:53:12 +02:00
Francisco Casas	588645a79a	tests: Add additional tests for explicit casts with vectors.	2022-10-26 23:53:10 +02:00
Francisco Casas	5af7316a12	vkd3d-shader/hlsl: Support explicit cast between component-wise compatible types.	2022-10-25 21:25:58 +02:00
Francisco Casas	d21fd584b1	vkd3d-shader/hlsl: Support implicit casts between component-wise equal types.	2022-10-25 21:25:57 +02:00
Francisco Casas	1c77811648	vkd3d-shader/hlsl: Remove incorrect criteria for accepting implicit casts.	2022-10-25 21:25:55 +02:00
Francisco Casas	d93ce28995	vkd3d-shader/hlsl: Handle complex types in add_cast(). This extends the support of this function, whether doing broadcasts or component-wise casts, to struct and array types.	2022-10-25 21:25:51 +02:00
Francisco Casas	fb751b48c5	tests: Add additional tests for implicit casts that should fail.	2022-10-25 21:25:51 +02:00
Francisco Casas	0a345a2b73	vkd3d-shader/hlsl: Rename "t1" and "t2" arguments as "src" and "dst".	2022-10-25 21:25:49 +02:00
Brendan Shanks	963ea98a52	vkd3d-common: Add a Windows implementation of vkd3d_set_thread_name().	2022-10-25 21:25:38 +02:00
Zebediah Figura	0ef04659c7	vkd3d-shader/hlsl: Parse UAV types.	2022-10-19 21:59:55 +02:00
Zebediah Figura	fea50d243c	vkd3d-shader/hlsl: Parse texture index expressions.	2022-10-19 21:59:55 +02:00
Zebediah Figura	7115a94063	vkd3d-shader/hlsl: Cast array indices inside of add_array_load(). Mostly in the interest of keeping the yacc code as simple as possible.	2022-10-19 21:59:55 +02:00
Zebediah Figura	62fd13059b	tests: Add a basic shader test for typed UAV loads.	2022-10-19 21:59:55 +02:00
Zebediah Figura	75494a4ae6	tests: Add a basic shader test for compute shaders.	2022-10-19 21:59:29 +02:00
Biswapriyo Nath	6f1f14d97a	include: Add the PFN_D3D12_SERIALIZE_ROOT_SIGNATURE typedef.	2022-10-19 21:59:22 +02:00
Biswapriyo Nath	c9198735fd	include: Add the PFN_D3D12_CREATE_ROOT_SIGNATURE_DESERIALIZER typedef.	2022-10-19 21:59:22 +02:00
Giovanni Mascellani	c644244bcd	tests: Test float operations with uniform inputs. The point of the "uniform" variants is to avoid hiding code generation bugs because of the constant folding optimization.	2022-10-19 21:59:18 +02:00
Giovanni Mascellani	b6a6a927a7	tests: Test sign rules for float modulus.	2022-10-19 21:59:18 +02:00
Giovanni Mascellani	d1da5436f4	tests: Test sign rules for integer division and modulus.	2022-10-19 21:59:18 +02:00
Giovanni Mascellani	0a07ac6f88	vkd3d-shader/hlsl: Lower float modulus. Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>	2022-10-19 21:59:17 +02:00
Giovanni Mascellani	eb119878f7	vkd3d-shader/hlsl: Lower int modulus. Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>	2022-10-19 21:59:15 +02:00
Giovanni Mascellani	85856473f6	vkd3d-shader/hlsl: Write SM4 fractional part instructions. Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>	2022-10-19 21:59:13 +02:00
Francisco Casas	09d7442cb1	tests: Test explicit casts between types that are component-wise compatible.	2022-10-17 17:59:04 +02:00
Francisco Casas	653b109d8f	tests: Test implicit casts between types that are equal component-wise.	2022-10-17 17:59:01 +02:00
Francisco Casas	5a1b0dbf44	vkd3d-shader/hlsl: Always go through implicit conversion in assignments. Otherwise we silently skip some type checks.	2022-10-17 17:58:56 +02:00
Francisco Casas	e56db9bda5	tests: Test for invalid complex broadcasts.	2022-10-17 17:58:56 +02:00
Francisco Casas	791f8a8faa	tests: Rename structs for readability in broadcast test.	2022-10-17 17:58:53 +02:00
Francisco Casas	3bae0c92c7	tests: Set ULPs to 2 in normalize() test. Otherwise the test fails on a NVIDIA GeForce GTX 1050 Ti GPU. The error being: shader_runner:535:Section [test], line 9: Test failed: Got {2.72165507e-01, 4.08248246e-01, 5.44331014e-01, 6.80413783e-01}, expected {2.72165537e-01, 4.08248305e-01, 5.44331074e-01, 6.80413842e-01} at (0, 0).	2022-10-17 17:58:50 +02:00
Francisco Casas	ab8f418207	tests: Add missing backslash to restore skipped tests. Tests after this missing backslash are not being executed since `e9829fdc65`.	2022-10-17 17:58:35 +02:00
Giovanni Mascellani	eb7b594002	vkd3d-shader/hlsl: Lower int division.	2022-10-17 17:58:17 +02:00
Giovanni Mascellani	4c13ae5764	vkd3d-shader/hlsl: Lower int absolute value.	2022-10-17 17:58:14 +02:00
Giovanni Mascellani	ef4990d996	tests: Test int absolute value.	2022-10-17 17:58:14 +02:00
Giovanni Mascellani	5442f4236c	vkd3d-shader/hlsl: Write SM4 square root instructions.	2022-10-17 17:58:12 +02:00
Giovanni Mascellani	8e5aefb309	vkd3d-shader/hlsl: Parse length() intrinsic.	2022-10-17 17:58:09 +02:00
Giovanni Mascellani	a43242a3e6	tests: Test length() intrinsic.	2022-10-17 17:58:09 +02:00
Zebediah Figura	303ce66cef	include: Use __MINGW_PRINTF_FORMAT when compiling with MinGW. The default for MinGW is always ms_printf rather than gnu_printf, but if we are using ucrtbase or ANSI stdio, we want gnu_printf.	2022-10-17 17:57:56 +02:00
Zebediah Figura	6b45f290f7	vkd3d-shader/hlsl: Pass a location pointer to init_node(). Instead of a flat location structure.	2022-10-12 21:58:03 +02:00
Zebediah Figura	20fc4375ad	vkd3d-shader/hlsl: Introduce a hlsl_new_expr() helper.	2022-10-12 21:58:01 +02:00
Zebediah Figura	1e10b5e616	vkd3d-shader/hlsl: Write SM4 reinterpret instructions.	2022-10-12 21:57:59 +02:00
Zebediah Figura	2d4d2e1244	vkd3d-shader/hlsl: Parse the asuint() intrinsic.	2022-10-12 21:57:57 +02:00
Zebediah Figura	eb70f1aeb5	tests: Add a test for asuint().	2022-10-12 21:57:55 +02:00
Giovanni Mascellani	3d85d77ced	demos/gears: Recompile shaders with our compiler.	2022-10-10 21:13:50 +02:00
Giovanni Mascellani	763f7dfa61	demos/triangle: Recompile shaders with our compiler.	2022-10-10 21:13:06 +02:00
Giovanni Mascellani	1655d309bd	vkd3d-shader/hlsl: Write SM4 rsq instructions.	2022-10-10 21:13:04 +02:00
Giovanni Mascellani	d600f0488e	vkd3d-shader/hlsl: Parse normalize intrinsic. Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>	2022-10-10 21:13:03 +02:00
Giovanni Mascellani	4ab1a4cef5	tests: Test normalize() intrinsic.	2022-10-10 21:13:01 +02:00
Giovanni Mascellani	73cf9dee8a	include: Add missing vkd3d_shader_compile() transformations and chained structures.	2022-09-28 19:11:13 +02:00
Zebediah Figura	b74a546034	vkd3d-shader/hlsl: Use hlsl_new_constant() in more places.	2022-09-28 19:11:08 +02:00
Zebediah Figura	f8da100052	vkd3d-shader/hlsl: Use hlsl_new_int_constant() in the "primary_expr" rule.	2022-09-28 19:11:05 +02:00
Zebediah Figura	3fc2fdc37f	vkd3d-shader/hlsl: Introduce a hlsl_new_bool_constant() helper.	2022-09-28 19:11:02 +02:00
Zebediah Figura	4c5fd9c7b9	vkd3d-shader/hlsl: Introduce a hlsl_new_float_constant() helper.	2022-09-28 19:10:58 +02:00
Zebediah Figura	15a0b44ada	vkd3d-shader/hlsl: Pass the arguments to hlsl_new_resource_load() as an indirect structure. The function has far too many arguments, including multiple different arguments with the same type. Use a structure for clarity and to avoid errors. Merge hlsl_new_sample_lod() into hlsl_new_resource_load() accordingly.	2022-09-27 20:14:54 +02:00
Zebediah Figura	fb724d60e3	vkd3d-shader/hlsl: Make the source parameter to hlsl_copy_deref() const.	2022-09-27 20:14:53 +02:00
Zebediah Figura	e3123f5bd0	vkd3d-shader/hlsl: Pass only a template string to hlsl_new_synthetic_var(). Synthesize the internal name from the template inside of this function.	2022-09-27 20:14:51 +02:00
Zebediah Figura	991cddd139	vkd3d-shader/hlsl: Handle failure from hlsl_copy_deref().	2022-09-27 20:14:49 +02:00
Zebediah Figura	32999fc12b	vkd3d-common: Tweak the WARN for VKD3D_ERROR_INVALID_SHADER. vkd3d-shader does not consume only bytecode anymore.	2022-09-27 20:14:42 +02:00
Zebediah Figura	27a6963d6a	vkd3d: Avoid an unused variable warning when building for Win32.	2022-09-27 20:14:35 +02:00
Giovanni Mascellani	d5fd309ef8	vkd3d: Add a macro to mark unreachable code. This should silence warnings about some branches non returning any value without requiring additional "return 0" statement or similar. Also, in theory this might enable to compiler to optimize the program a little bit more, though that's unlikely to have any measurable effect.	2022-09-27 20:14:27 +02:00