From: Conor McCarthy cmccarthy@codeweavers.com
--- libs/vkd3d-shader/dxil.c | 88 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 7 deletions(-)
diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0481a9d2..fc96f89b 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -100,6 +100,10 @@ struct vkd3d_shader_sm6_parser struct vkd3d_shader_sm6_block root_block; struct vkd3d_shader_sm6_block *current_block;
+ struct vkd3d_shader_sm6_global_abbrev **abbrevs; + size_t abbrev_capacity; + size_t abbrev_count; + struct vkd3d_shader_parser p; };
@@ -116,6 +120,12 @@ struct vkd3d_shader_sm6_abbrev struct vkd3d_shader_sm6_abbrev_operand operands[]; };
+struct vkd3d_shader_sm6_global_abbrev +{ + unsigned int block_id; + struct vkd3d_shader_sm6_abbrev abbrev; +}; + static struct vkd3d_shader_sm6_parser *vkd3d_shader_sm6_parser(struct vkd3d_shader_parser *parser) { return CONTAINING_RECORD(parser, struct vkd3d_shader_sm6_parser, p); @@ -411,6 +421,36 @@ static enum vkd3d_result shader_sm6_abbrev_init(struct vkd3d_shader_sm6_abbrev * return parser->failed ? VKD3D_ERROR_INVALID_ARGUMENT : VKD3D_OK; }
+static enum vkd3d_result shader_sm6_add_global_abbrev(struct vkd3d_shader_parser *parser) +{ + struct vkd3d_shader_sm6_parser *sm6 = vkd3d_shader_sm6_parser(parser); + struct vkd3d_shader_sm6_block *block = sm6->current_block; + struct vkd3d_shader_sm6_global_abbrev *global_abbrev; + unsigned int count = shader_sm6_read_vbr(parser, 5); + enum vkd3d_result ret; + + assert(block->id == BLOCKINFO_BLOCK); + + if (!vkd3d_array_reserve((void **)&sm6->abbrevs, &sm6->abbrev_capacity, sm6->abbrev_count + 1, sizeof(*sm6->abbrevs)) + || !(global_abbrev = vkd3d_malloc(sizeof(*global_abbrev) + count * sizeof(global_abbrev->abbrev.operands[0])))) + { + ERR("Failed to allocate global abbreviation.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + if ((ret = shader_sm6_abbrev_init(&global_abbrev->abbrev, count, parser)) < 0) + { + vkd3d_free(global_abbrev); + return ret; + } + + global_abbrev->block_id = block->blockinfo_bid; + + sm6->abbrevs[sm6->abbrev_count++] = global_abbrev; + + return VKD3D_OK; +} + static enum vkd3d_result shader_sm6_add_block_abbrev(struct vkd3d_shader_parser *parser) { struct vkd3d_shader_sm6_parser *sm6 = vkd3d_shader_sm6_parser(parser); @@ -420,10 +460,7 @@ static enum vkd3d_result shader_sm6_add_block_abbrev(struct vkd3d_shader_parser unsigned int count;
if (block->id == BLOCKINFO_BLOCK) - { - FIXME("Unhandled global abbreviation.\n"); - return VKD3D_ERROR_INVALID_ARGUMENT; - } + return shader_sm6_add_global_abbrev(parser);
count = shader_sm6_read_vbr(parser, 5); if (!vkd3d_array_reserve((void **)&block->abbrevs, &block->abbrev_capacity, block->abbrev_count + 1, sizeof(*block->abbrevs)) @@ -585,12 +622,23 @@ static enum vkd3d_result shader_sm6_block_read(struct vkd3d_shader_sm6_block *pa return VKD3D_ERROR_INVALID_ARGUMENT; }
+static inline unsigned int shader_sm6_compute_global_abbrev_count_for_block_id(struct vkd3d_shader_sm6_parser *sm6, + unsigned int block_id) +{ + unsigned int i, count; + + for (i = 0, count = 0; i < sm6->abbrev_count; ++i) + count += sm6->abbrevs[i]->block_id == block_id; + + return count; +} + static enum vkd3d_result shader_sm6_block_init(struct vkd3d_shader_sm6_block *block, const struct vkd3d_shader_sm6_block *parent, struct vkd3d_shader_parser *parser) { struct vkd3d_shader_sm6_parser *sm6 = vkd3d_shader_sm6_parser(parser); + unsigned int i, abbrev_count = 0; enum vkd3d_result ret; - unsigned int i;
block->parent = parent; block->level = parent ? parent->level + 1 : 0; @@ -601,11 +649,26 @@ static enum vkd3d_result shader_sm6_block_init(struct vkd3d_shader_sm6_block *bl block->start = parser->ptr - sm6->start; block->abbrevs = NULL; block->abbrev_capacity = 0; - block->abbrev_count = 0;
if (parser->failed) return VKD3D_ERROR_INVALID_ARGUMENT;
+ if ((block->abbrev_count = shader_sm6_compute_global_abbrev_count_for_block_id(sm6, block->id))) + { + if (!vkd3d_array_reserve((void **)&block->abbrevs, &block->abbrev_capacity, + block->abbrev_count, sizeof(*block->abbrevs))) + { + ERR("Failed to allocate block abbreviations.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + for (i = 0; i < sm6->abbrev_count; ++i) + if (sm6->abbrevs[i]->block_id == block->id) + block->abbrevs[abbrev_count++] = &sm6->abbrevs[i]->abbrev; + + assert(abbrev_count == block->abbrev_count); + } + block->child_blocks = NULL; block->child_block_capacity = 0; block->child_block_count = 0; @@ -615,7 +678,7 @@ static enum vkd3d_result shader_sm6_block_init(struct vkd3d_shader_sm6_block *bl
ret = shader_sm6_block_read(block, parser);
- for (i = 0; i < block->abbrev_count; ++i) + for (i = abbrev_count; i < block->abbrev_count; ++i) vkd3d_free(block->abbrevs[i]); vkd3d_free(block->abbrevs); block->abbrevs = NULL; @@ -624,6 +687,15 @@ static enum vkd3d_result shader_sm6_block_init(struct vkd3d_shader_sm6_block *bl return ret; }
+static void shader_sm6_global_abbrevs_cleanup(struct vkd3d_shader_sm6_global_abbrev **abbrevs, unsigned int count) +{ + unsigned int i; + + for (i = 0; i < count; ++i) + vkd3d_free(abbrevs[i]); + vkd3d_free(abbrevs); +} + static void shader_sm6_block_destroy(struct vkd3d_shader_sm6_block *block) { unsigned int i; @@ -753,6 +825,8 @@ static enum vkd3d_result shader_sm6_init(struct vkd3d_shader_sm6_parser *sm6, co return ret; }
+ shader_sm6_global_abbrevs_cleanup(sm6->abbrevs, sm6->abbrev_count); + if (block->start + block->length != sm6->p.ptr - sm6->start) { WARN("Invalid block end position %zu, expected %u.\n", sm6->p.ptr - sm6->start,