[PATCH v2 0/2] MR1606: d3dx9/preshader: Move register table debug names to the rest of table info.
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- v2: d3dx9/effect: Split parameters data from effect object. d3dx9/preshader: Handle input register table. https://gitlab.winehq.org/wine/wine/-/merge_requests/1606
From: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 1 + dlls/d3dx9_36/preshader.c | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 7ee754b104a..12f275e8523 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -241,6 +241,7 @@ enum pres_reg_tables { PRES_REGTAB_IMMED, PRES_REGTAB_CONST, + PRES_REGTAB_INPUT, PRES_REGTAB_OCONST, PRES_REGTAB_OBCONST, PRES_REGTAB_OICONST, diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 3f9374c7d1a..12083271815 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -202,6 +202,7 @@ table_info[] = { {sizeof(double), PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */ {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */ + {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_INPUT */ {sizeof(float), PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */ {sizeof(BOOL), PRES_VT_BOOL }, /* PRES_REGTAB_OBCONST */ {sizeof(int), PRES_VT_INT, }, /* PRES_REGTAB_OICONST */ @@ -211,7 +212,7 @@ table_info[] = static const char *table_symbol[] = { - "imm", "c", "oc", "ob", "oi", "r", "(null)", + "imm", "c", "v", "oc", "ob", "oi", "r", "(null)", }; static const enum pres_reg_tables pres_regset2table[] = @@ -414,7 +415,7 @@ static unsigned int *parse_pres_reg(unsigned int *ptr, struct d3dx_pres_reg *reg { static const enum pres_reg_tables reg_table[8] = { - PRES_REGTAB_COUNT, PRES_REGTAB_IMMED, PRES_REGTAB_CONST, PRES_REGTAB_COUNT, + PRES_REGTAB_COUNT, PRES_REGTAB_IMMED, PRES_REGTAB_CONST, PRES_REGTAB_INPUT, PRES_REGTAB_OCONST, PRES_REGTAB_OBCONST, PRES_REGTAB_OICONST, PRES_REGTAB_TEMP }; @@ -1019,7 +1020,7 @@ static void update_table_sizes_consts(unsigned int *table_sizes, struct d3dx_con static void dump_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *arg, int component_count) { static const char *xyzw_str = "xyzw"; - unsigned int i, table; + unsigned int i, table, reg_offset; table = arg->reg.table; if (table == PRES_REGTAB_IMMED && arg->index_reg.table == PRES_REGTAB_COUNT) @@ -1032,16 +1033,21 @@ static void dump_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *a } else { + reg_offset = get_reg_offset(table, arg->reg.offset); + if (arg->index_reg.table == PRES_REGTAB_COUNT) { - TRACE("%s%u.", table_symbol[table], get_reg_offset(table, arg->reg.offset)); + if (table == PRES_REGTAB_INPUT && reg_offset < 2) + TRACE("%s%s.", table_symbol[table], reg_offset ? "PSize" : "Pos"); + else + TRACE("%s%u.", table_symbol[table], reg_offset); } else { unsigned int index_reg; index_reg = get_reg_offset(arg->index_reg.table, arg->index_reg.offset); - TRACE("%s[%u + %s%u.%c].", table_symbol[table], get_reg_offset(table, arg->reg.offset), + TRACE("%s[%u + %s%u.%c].", table_symbol[table], reg_offset, table_symbol[arg->index_reg.table], index_reg, xyzw_str[arg->index_reg.offset - get_offset_reg(arg->index_reg.table, index_reg)]); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1606
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 14 +++- dlls/d3dx9_36/effect.c | 150 +++++++++++++++++----------------- dlls/d3dx9_36/preshader.c | 19 +++-- 3 files changed, 95 insertions(+), 88 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 12f275e8523..d22415b1f69 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -386,14 +386,24 @@ static inline BOOL is_param_dirty(struct d3dx_parameter *param, ULONG64 update_v return is_top_level_param_dirty(param->top_level_param, update_version); } -struct d3dx_parameter *get_parameter_by_name(struct d3dx_effect *effect, +struct d3dx_parameters_store +{ + struct wine_rb_tree tree; + struct d3dx_top_level_parameter *parameters; + unsigned int count; + + char *full_name_tmp; + unsigned int full_name_tmp_size; +}; + +struct d3dx_parameter *get_parameter_by_name(struct d3dx_parameters_store *store, struct d3dx_parameter *parameter, const char *name) DECLSPEC_HIDDEN; #define SET_D3D_STATE_(manager, device, method, args...) (manager ? manager->lpVtbl->method(manager, args) \ : device->lpVtbl->method(device, args)) #define SET_D3D_STATE(base_effect, args...) SET_D3D_STATE_(base_effect->manager, base_effect->device, args) -HRESULT d3dx_create_param_eval(struct d3dx_effect *effect, void *byte_code, +HRESULT d3dx_create_param_eval(struct d3dx_parameters_store *parameters, void *byte_code, unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval, ULONG64 *version_counter, const char **skip_constants, unsigned int skip_constants_count) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7719edd4f25..c5e1f6ed348 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -171,17 +171,13 @@ struct d3dx_effect ID3DXEffect ID3DXEffect_iface; LONG ref; - unsigned int parameter_count; unsigned int technique_count; unsigned int object_count; - struct d3dx_top_level_parameter *parameters; struct d3dx_technique *techniques; struct d3dx_object *objects; DWORD flags; - struct wine_rb_tree param_tree; - char *full_name_tmp; - unsigned int full_name_tmp_size; + struct d3dx_parameters_store params; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -527,7 +523,7 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx_effect *effect, D3 sizeof(parameter_magic_string))) return handle_param; - return effect->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(effect, NULL, parameter); + return effect->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(&effect->params, NULL, parameter); } static struct d3dx_parameter_block *get_valid_parameter_block(D3DXHANDLE handle) @@ -764,13 +760,13 @@ static void d3dx_effect_cleanup(struct d3dx_effect *effect) free_parameter_block(block); } - heap_free(effect->full_name_tmp); + heap_free(effect->params.full_name_tmp); - if (effect->parameters) + if (effect->params.parameters) { - for (i = 0; i < effect->parameter_count; ++i) - free_top_level_parameter(&effect->parameters[i]); - heap_free(effect->parameters); + for (i = 0; i < effect->params.count; ++i) + free_top_level_parameter(&effect->params.parameters[i]); + heap_free(effect->params.parameters); } if (effect->techniques) @@ -947,7 +943,7 @@ static HRESULT set_value(struct d3dx_parameter *param, const void *data, unsigne return D3D_OK; } -static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_effect *effect, +static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameters_store *store, struct d3dx_parameter *parameter, const char *name) { UINT element; @@ -969,7 +965,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_effect * switch (*part++) { case '.': - return get_parameter_by_name(effect, temp_parameter, part); + return get_parameter_by_name(store, temp_parameter, part); case '\0': TRACE("Returning parameter %p\n", temp_parameter); @@ -1013,10 +1009,10 @@ static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, switch (*part++) { case '.': - return get_parameter_by_name(effect, temp_parameter, part); + return get_parameter_by_name(&effect->params, temp_parameter, part); case '[': - return get_parameter_element_by_name(effect, temp_parameter, part); + return get_parameter_element_by_name(&effect->params, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -1029,7 +1025,7 @@ static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, return NULL; } -struct d3dx_parameter *get_parameter_by_name(struct d3dx_effect* effect, +struct d3dx_parameter *get_parameter_by_name(struct d3dx_parameters_store *store, struct d3dx_parameter *parameter, const char *name) { struct d3dx_parameter *temp_parameter; @@ -1040,13 +1036,13 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx_effect* effect, const char *part; char *full_name; - TRACE("effect %p, parameter %p, name %s.\n", effect, parameter, debugstr_a(name)); + TRACE("store %p, parameter %p, name %s.\n", store, parameter, debugstr_a(name)); if (!name || !*name) return NULL; if (!parameter) { - if ((entry = wine_rb_get(&effect->param_tree, name))) + if ((entry = wine_rb_get(&store->tree, name))) return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); return NULL; } @@ -1056,26 +1052,26 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx_effect* effect, name_len = strlen(name); param_name_len = strlen(parameter->full_name); full_name_size = name_len + param_name_len + 2; - if (effect->full_name_tmp_size < full_name_size) + if (store->full_name_tmp_size < full_name_size) { - if (!(full_name = heap_realloc(effect->full_name_tmp, full_name_size))) + if (!(full_name = heap_realloc(store->full_name_tmp, full_name_size))) { ERR("Out of memory.\n"); return NULL; } - effect->full_name_tmp = full_name; - effect->full_name_tmp_size = full_name_size; + store->full_name_tmp = full_name; + store->full_name_tmp_size = full_name_size; } else { - full_name = effect->full_name_tmp; + full_name = store->full_name_tmp; } memcpy(full_name, parameter->full_name, param_name_len); full_name[param_name_len] = '.'; memcpy(full_name + param_name_len + 1, name, name_len); full_name[param_name_len + 1 + name_len] = 0; - if ((entry = wine_rb_get(&effect->param_tree, full_name))) + if ((entry = wine_rb_get(&store->tree, full_name))) return WINE_RB_ENTRY_VALUE(entry, struct d3dx_parameter, rb_entry); return NULL; } @@ -1101,10 +1097,10 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx_effect* effect, switch (*part++) { case '.': - return get_parameter_by_name(effect, temp_parameter, part); + return get_parameter_by_name(store, temp_parameter, part); case '[': - return get_parameter_element_by_name(effect, temp_parameter, part); + return get_parameter_element_by_name(store, temp_parameter, part); default: FIXME("Unhandled case \"%c\"\n", *--part); @@ -2025,7 +2021,7 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d /* TODO: add creator and function count. */ desc->Creator = NULL; desc->Functions = 0; - desc->Parameters = effect->parameter_count; + desc->Parameters = effect->params.count; desc->Techniques = effect->technique_count; return D3D_OK; @@ -2150,10 +2146,10 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE if (!parameter) { - if (index < effect->parameter_count) + if (index < effect->params.count) { - TRACE("Returning parameter %p.\n", &effect->parameters[index]); - return get_parameter_handle(&effect->parameters[index].param); + TRACE("Returning parameter %p.\n", &effect->params.parameters[index]); + return get_parameter_handle(&effect->params.parameters[index].param); } } else @@ -2186,7 +2182,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DX return handle; } - handle = get_parameter_handle(get_parameter_by_name(effect, param, name)); + handle = get_parameter_handle(get_parameter_by_name(&effect->params, param, name)); TRACE("Returning parameter %p.\n", handle); return handle; @@ -2204,9 +2200,9 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, if (!parameter) { - for (i = 0; i < effect->parameter_count; ++i) + for (i = 0; i < effect->params.count; ++i) { - temp_param = &effect->parameters[i].param; + temp_param = &effect->params.parameters[i].param; if (!temp_param->semantic) { @@ -2263,10 +2259,10 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3D if (!param) { - if (index < effect->parameter_count) + if (index < effect->params.count) { - TRACE("Returning parameter %p.\n", &effect->parameters[index]); - return get_parameter_handle(&effect->parameters[index].param); + TRACE("Returning parameter %p.\n", &effect->params.parameters[index]); + return get_parameter_handle(&effect->params.parameters[index].param); } } else @@ -4178,8 +4174,8 @@ static HRESULT WINAPI d3dx_effect_OnLostDevice(ID3DXEffect *iface) TRACE("iface %p.\n", iface); - for (i = 0; i < effect->parameter_count; ++i) - walk_parameter_tree(&effect->parameters[i].param, param_on_lost_device, NULL); + for (i = 0; i < effect->params.count; ++i) + walk_parameter_tree(&effect->params.parameters[i].param, param_on_lost_device, NULL); return D3D_OK; } @@ -4405,10 +4401,10 @@ static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevic return hr; } - for (i = 0; i < src->parameter_count; ++i) + for (i = 0; i < src->params.count; ++i) { - const struct d3dx_top_level_parameter *src_param = &src->parameters[i]; - struct d3dx_top_level_parameter *dst_param = &dst->parameters[i]; + const struct d3dx_top_level_parameter *src_param = &src->params.parameters[i]; + struct d3dx_top_level_parameter *dst_param = &dst->params.parameters[i]; copy_parameter(dst, src, &dst_param->param, &src_param->param); for (j = 0; j < src_param->annotation_count; ++j) @@ -5438,7 +5434,7 @@ static void add_param_to_tree(struct d3dx_effect *effect, struct d3dx_parameter memcpy(param->full_name, param->name, len); } TRACE("Full name is %s.\n", param->full_name); - wine_rb_put(&effect->param_tree, param->full_name, ¶m->rb_entry); + wine_rb_put(&effect->params.tree, param->full_name, ¶m->rb_entry); if (is_top_level_parameter(param)) for (i = 0; i < param->top_level_param->annotation_count; ++i) @@ -6071,7 +6067,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx TRACE("Parsing array entry selection state for parameter %p.\n", param); string_size = *(uint32_t *)ptr; - state->referenced_param = get_parameter_by_name(effect, NULL, ptr + 4); + state->referenced_param = get_parameter_by_name(&effect->params, NULL, ptr + 4); if (state->referenced_param) { TRACE("Mapping to parameter %s.\n", debugstr_a(state->referenced_param->name)); @@ -6085,7 +6081,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx if (string_size % sizeof(uint32_t)) FIXME("Unaligned string_size %u.\n", string_size); - if (FAILED(ret = d3dx_create_param_eval(effect, (uint32_t *)(ptr + string_size) + 1, + if (FAILED(ret = d3dx_create_param_eval(&effect->params, (uint32_t *)(ptr + string_size) + 1, object->size - (string_size + sizeof(uint32_t)), D3DXPT_INT, ¶m->param_eval, get_version_counter_ptr(effect), NULL, 0))) return ret; @@ -6106,7 +6102,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx { TRACE("Creating preshader for object %u.\n", param->members[i].object_id); object = &effect->objects[param->members[i].object_id]; - if (FAILED(ret = d3dx_create_param_eval(effect, object->data, object->size, param->type, + if (FAILED(ret = d3dx_create_param_eval(&effect->params, object->data, object->size, param->type, ¶m->members[i].param_eval, get_version_counter_ptr(effect), skip_constants, skip_constants_count))) break; @@ -6145,13 +6141,13 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, struct d3dx_parameter *parameter; struct d3dx_sampler *sampler; - if (index >= effect->parameter_count) + if (index >= effect->params.count) { - FIXME("Index out of bounds: index %u >= parameter_count %u.\n", index, effect->parameter_count); + FIXME("Index out of bounds: index %u >= parameter count %u.\n", index, effect->params.count); return E_FAIL; } - parameter = &effect->parameters[index].param; + parameter = &effect->params.parameters[index].param; if (element_index != 0xffffffff) { if (element_index >= parameter->element_count && parameter->element_count != 0) @@ -6224,7 +6220,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, { if (FAILED(hr = d3dx9_create_object(effect, object))) return hr; - if (FAILED(hr = d3dx_create_param_eval(effect, object->data, object->size, param->type, + if (FAILED(hr = d3dx_create_param_eval(&effect->params, object->data, object->size, param->type, ¶m->param_eval, get_version_counter_ptr(effect), skip_constants, skip_constants_count))) return hr; @@ -6238,7 +6234,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, state->type = ST_FXLC; if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; - if (FAILED(hr = d3dx_create_param_eval(effect, object->data, object->size, param->type, + if (FAILED(hr = d3dx_create_param_eval(&effect->params, object->data, object->size, param->type, ¶m->param_eval, get_version_counter_ptr(effect), NULL, 0))) return hr; break; @@ -6255,7 +6251,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, return hr; TRACE("Looking for parameter %s.\n", debugstr_a(object->data)); - state->referenced_param = get_parameter_by_name(effect, NULL, object->data); + state->referenced_param = get_parameter_by_name(&effect->params, NULL, object->data); if (state->referenced_param) { struct d3dx_parameter *refpar = state->referenced_param; @@ -6267,7 +6263,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, if (!refpar->param_eval) { - if (FAILED(hr = d3dx_create_param_eval(effect, refobj->data, refobj->size, + if (FAILED(hr = d3dx_create_param_eval(&effect->params, refobj->data, refobj->size, refpar->type, &refpar->param_eval, get_version_counter_ptr(effect), skip_constants, skip_constants_count))) return hr; @@ -6310,8 +6306,8 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U unsigned int i; HRESULT hr; - effect->parameter_count = read_u32(&ptr); - TRACE("Parameter count: %u.\n", effect->parameter_count); + effect->params.count = read_u32(&ptr); + TRACE("Parameter count: %u.\n", effect->params.count); effect->technique_count = read_u32(&ptr); TRACE("Technique count: %u.\n", effect->technique_count); @@ -6330,28 +6326,28 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U goto err_out; } - wine_rb_init(&effect->param_tree, param_rb_compare); - if (effect->parameter_count) + wine_rb_init(&effect->params.tree, param_rb_compare); + if (effect->params.count) { - effect->parameters = heap_alloc_zero(sizeof(*effect->parameters) * effect->parameter_count); - if (!effect->parameters) + effect->params.parameters = heap_alloc_zero(sizeof(*effect->params.parameters) * effect->params.count); + if (!effect->params.parameters) { ERR("Out of memory.\n"); hr = E_OUTOFMEMORY; goto err_out; } - for (i = 0; i < effect->parameter_count; ++i) + for (i = 0; i < effect->params.count; ++i) { - param_set_magic_number(&effect->parameters[i].param); - hr = d3dx_parse_effect_parameter(effect, &effect->parameters[i], data, &ptr, effect->objects); + param_set_magic_number(&effect->params.parameters[i].param); + hr = d3dx_parse_effect_parameter(effect, &effect->params.parameters[i], data, &ptr, effect->objects); if (hr != D3D_OK) { WARN("Failed to parse parameter %u.\n", i); goto err_out; } - walk_parameter_tree(&effect->parameters[i].param, param_set_top_level_param, &effect->parameters[i]); - add_param_to_tree(effect, &effect->parameters[i].param, NULL, 0, 0); + walk_parameter_tree(&effect->params.parameters[i].param, param_set_top_level_param, &effect->params.parameters[i]); + add_param_to_tree(effect, &effect->params.parameters[i].param, NULL, 0, 0); } } @@ -6412,12 +6408,12 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } } - for (i = 0; i < effect->parameter_count; ++i) + for (i = 0; i < effect->params.count; ++i) { - if (FAILED(hr = d3dx_pool_sync_shared_parameter(effect->pool, &effect->parameters[i]))) + if (FAILED(hr = d3dx_pool_sync_shared_parameter(effect->pool, &effect->params.parameters[i]))) goto err_out; - effect->parameters[i].version_counter = get_version_counter_ptr(effect); - set_dirty(&effect->parameters[i].param); + effect->params.parameters[i].version_counter = get_version_counter_ptr(effect); + set_dirty(&effect->params.parameters[i].param); } return D3D_OK; @@ -6431,14 +6427,14 @@ err_out: effect->techniques = NULL; } - if (effect->parameters) + if (effect->params.parameters) { - for (i = 0; i < effect->parameter_count; ++i) + for (i = 0; i < effect->params.count; ++i) { - free_top_level_parameter(&effect->parameters[i]); + free_top_level_parameter(&effect->params.parameters[i]); } - heap_free(effect->parameters); - effect->parameters = NULL; + heap_free(effect->params.parameters); + effect->params.parameters = NULL; } if (effect->objects) @@ -6587,7 +6583,7 @@ static HRESULT d3dx9_effect_init_from_dxbc(struct d3dx_effect *effect, for (i = 0; i < skip_constants_count; ++i) { struct d3dx_parameter *param; - param = get_parameter_by_name(effect, NULL, skip_constants[i]); + param = get_parameter_by_name(&effect->params, NULL, skip_constants[i]); if (param) { for (j = 0; j < effect->technique_count; ++j) @@ -6630,11 +6626,11 @@ fail: heap_free(effect->techniques); } - if (effect->parameters) + if (effect->params.parameters) { - for (i = 0; i < effect->parameter_count; ++i) - free_top_level_parameter(&effect->parameters[i]); - heap_free(effect->parameters); + for (i = 0; i < effect->params.count; ++i) + free_top_level_parameter(&effect->params.parameters[i]); + heap_free(effect->params.parameters); } if (effect->objects) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 12083271815..8a7dfd76935 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -851,7 +851,7 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC } static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab *out, - struct d3dx_effect *effect, const char **skip_constants, + struct d3dx_parameters_store *parameters, const char **skip_constants, unsigned int skip_constants_count, struct d3dx_preshader *pres) { ID3DXConstantTable *ctab; @@ -896,7 +896,7 @@ static HRESULT get_constants_desc(unsigned int *byte_code, struct d3dx_const_tab } if (FAILED(hr = get_ctab_constant_desc(ctab, hc, &cdesc[index], &constantinfo_reserved))) goto cleanup; - inputs_param[index] = get_parameter_by_name(effect, NULL, cdesc[index].Name); + inputs_param[index] = get_parameter_by_name(parameters, NULL, cdesc[index].Name); if (!inputs_param[index]) { WARN("Could not find parameter %s in effect.\n", cdesc[index].Name); @@ -1106,7 +1106,8 @@ static void dump_preshader(struct d3dx_preshader *pres) dump_ins(&pres->regs, &pres->ins[i]); } -static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, unsigned int count, struct d3dx_effect *effect) +static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, unsigned int count, + struct d3dx_parameters_store *parameters) { unsigned int *p; unsigned int i, j, const_count; @@ -1173,7 +1174,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u saved_word = *ptr; *ptr = 0xfffe0000; - hr = get_constants_desc(ptr, &pres->inputs, effect, NULL, 0, NULL); + hr = get_constants_desc(ptr, &pres->inputs, parameters, NULL, 0, NULL); *ptr = saved_word; if (FAILED(hr)) return hr; @@ -1226,7 +1227,7 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u return D3D_OK; } -HRESULT d3dx_create_param_eval(struct d3dx_effect *effect, void *byte_code, unsigned int byte_code_size, +HRESULT d3dx_create_param_eval(struct d3dx_parameters_store *parameters, void *byte_code, unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval_out, ULONG64 *version_counter, const char **skip_constants, unsigned int skip_constants_count) { @@ -1237,8 +1238,8 @@ HRESULT d3dx_create_param_eval(struct d3dx_effect *effect, void *byte_code, unsi unsigned int count, pres_size; HRESULT ret; - TRACE("effect %p, byte_code %p, byte_code_size %u, type %u, peval_out %p.\n", - effect, byte_code, byte_code_size, type, peval_out); + TRACE("parameters %p, byte_code %p, byte_code_size %u, type %u, peval_out %p.\n", + parameters, byte_code, byte_code_size, type, peval_out); count = byte_code_size / sizeof(unsigned int); if (!byte_code || !count) @@ -1288,7 +1289,7 @@ HRESULT d3dx_create_param_eval(struct d3dx_effect *effect, void *byte_code, unsi pres_size = count; } - if (ptr && FAILED(ret = parse_preshader(&peval->pres, ptr, pres_size, effect))) + if (ptr && FAILED(ret = parse_preshader(&peval->pres, ptr, pres_size, parameters))) { FIXME("Failed parsing preshader, byte code for analysis follows.\n"); dump_bytecode(byte_code, byte_code_size); @@ -1297,7 +1298,7 @@ HRESULT d3dx_create_param_eval(struct d3dx_effect *effect, void *byte_code, unsi if (shader) { - if (FAILED(ret = get_constants_desc(shader_ptr, &peval->shader_inputs, effect, + if (FAILED(ret = get_constants_desc(shader_ptr, &peval->shader_inputs, parameters, skip_constants, skip_constants_count, &peval->pres))) { TRACE("Could not get shader constant table, hr %#lx.\n", ret); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/1606
I removed name field change for now, it's not that important at this point. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1606#note_18077
On Wed Nov 30 15:04:32 2022 +0000, Nikolay Sivov wrote:
This check is for index_reg.table and trace is for "table", which is different. Table table is used in 4 places total, I can add a helper to return static (null) from it, and remove this new entry. Is that okay? Curious that I noticed the same mismatch in the branch above but not here :face_palm:
Anyway, I see that you dropped this patch for the time being: it's okay either way. The related cleanup that we discussed privately, about making our PRES_REGTAB_ values match with what's in the bytecode, is also probably good. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1606#note_18275
This merge request was approved by Matteo Bruni. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/1606
participants (3)
-
Matteo Bruni (＠Mystral) -
Nikolay Sivov
-
Nikolay Sivov (＠nsivov)