Zebediah Figura : vkd3d-shader/hlsl: Write the SHDR token count.
Alexandre Julliard
julliard at winehq.org
Mon Aug 23 16:24:07 CDT 2021
Module: vkd3d
Branch: master
Commit: 864e816de807de7ad5792e30673d9c86a8590126
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=864e816de807de7ad5792e30673d9c86a8590126
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Thu Aug 19 18:44:32 2021 -0500
vkd3d-shader/hlsl: Write the SHDR token count.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d-shader/hlsl_sm4.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index 253aa24..1592767 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -791,6 +791,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc)
struct vkd3d_bytecode_buffer buffer = {0};
const struct hlsl_buffer *cbuffer;
const struct hlsl_ir_var *var;
+ size_t token_count_position;
static const uint16_t shader_types[VKD3D_SHADER_TYPE_COUNT] =
{
@@ -806,7 +807,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc)
};
put_u32(&buffer, vkd3d_make_u32((profile->major_version << 4) | profile->minor_version, shader_types[profile->type]));
- put_u32(&buffer, 0); /* FIXME: instruction token count */
+ token_count_position = put_u32(&buffer, 0);
LIST_FOR_EACH_ENTRY(cbuffer, &ctx->buffers, struct hlsl_buffer, entry)
{
@@ -825,6 +826,8 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc)
write_sm4_ret(&buffer);
+ set_u32(&buffer, token_count_position, bytecode_get_size(&buffer) / sizeof(uint32_t));
+
dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size);
}
More information about the wine-cvs
mailing list