[PATCH v3 2/7] vkd3d-shader: Add an is_null variable to immediate constant buffer objects.

[Conor McCarthy]

From: Conor McCarthy

Null buffers are used as initialisers in DXIL shaders.
---
 libs/vkd3d-shader/d3d_asm.c              | 1 +
 libs/vkd3d-shader/spirv.c                | 1 +
 libs/vkd3d-shader/tpf.c                  | 1 +
 libs/vkd3d-shader/vkd3d_shader_private.h | 1 +
 4 files changed, 4 insertions(+)

diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c
index 9b3769e00..3c4273b4e 100644
--- a/libs/vkd3d-shader/d3d_asm.c
+++ b/libs/vkd3d-shader/d3d_asm.c
@@ -1647,6 +1647,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
         case VKD3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER:
             vkd3d_string_buffer_printf(buffer, " {\n");
             assert(ins->declaration.icb->component_count == VKD3D_VEC4_SIZE);
+            assert(!ins->declaration.icb->is_null);
             for (i = 0; i < ins->declaration.icb->element_count; ++i)
             {
                 shader_print_hex_literal(compiler, "    {", ins->declaration.icb->data[4 * i + 0], "");
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index fe1a5997e..b9f6067c2 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -5680,6 +5680,7 @@ static void spirv_compiler_emit_dcl_immediate_constant_buffer(struct spirv_compi

assert(icb->data_type == VKD3D_DATA_FLOAT);
     assert(icb->component_count == VKD3D_VEC4_SIZE);
+    assert(!icb->is_null);

if (!(elements = vkd3d_calloc(icb->element_count, sizeof(*elements))))
         return;
diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index dec8189da..c5354777f 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -770,6 +770,7 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, ui
     icb->data_type = VKD3D_DATA_FLOAT;
     icb->component_count = VKD3D_VEC4_SIZE;
     icb->element_count = icb_size / VKD3D_VEC4_SIZE;
+    icb->is_null = false;
     memcpy(icb->data, tokens, sizeof(*tokens) * icb_size);
     shader_instruction_array_add_icb(&priv->p.instructions, icb);
     ins->declaration.icb = icb;
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index ce2480372..7714785b4 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -719,6 +719,7 @@ struct vkd3d_shader_immediate_constant_buffer
     /* total count is element_count * component_count */
     unsigned int element_count;
     unsigned int component_count;
+    bool is_null;
     uint32_t data[];
 };