June 2021 - Wine-commits - list.winehq.org

Matteo Bruni : vkd3d-shader: Zero-initialize constant definitions.
by Alexandre Julliard 23 Jun '21

23 Jun '21

Module: vkd3d Branch: master Commit: 06551db10aa8f9bd78f28758ea621a0ab0d64b1b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=06551db10aa8f9bd78f2875… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 21 23:37:06 2021 -0500 vkd3d-shader: Zero-initialize constant definitions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_codegen.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 366b8bd..54c91bf 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -843,7 +843,12 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list * if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size, constant->reg.id + reg_size, sizeof(*defs->values))) return; - defs->count = max(defs->count, constant->reg.id + reg_size); + if (constant->reg.id + reg_size > defs->count) + { + memset(&defs->values[defs->count], 0, + sizeof(*defs->values) * (constant->reg.id + reg_size - defs->count)); + defs->count = constant->reg.id + reg_size; + } assert(type->type <= HLSL_CLASS_LAST_NUMERIC);

1 0

Zebediah Figura : vkd3d-shader: Rename the "regnum" field of struct hlsl_reg_reservation to "index".
by Alexandre Julliard 23 Jun '21

23 Jun '21

Module: vkd3d Branch: master Commit: e81989492ce02321e0385d50a02f622b011c20ee URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e81989492ce02321e0385d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 21 23:37:07 2021 -0500 vkd3d-shader: Rename the "regnum" field of struct hlsl_reg_reservation to "index". Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index d9e51b8..8c54202 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -213,7 +213,7 @@ struct hlsl_src struct hlsl_reg_reservation { char type; - DWORD regnum; + unsigned int index; }; struct hlsl_ir_var diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 2e631fa..1a102a5 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -784,7 +784,7 @@ static struct hlsl_reg_reservation parse_reg_reservation(const char *reg_string) { struct hlsl_reg_reservation reservation = {0}; - if (!sscanf(reg_string + 1, "%u", &reservation.regnum)) + if (!sscanf(reg_string + 1, "%u", &reservation.index)) { FIXME("Unsupported register reservation syntax.\n"); return reservation;

1 0

Zebediah Figura : vkd3d-shader: Get rid of HLSL_IR_SEQUENCE.
by Alexandre Julliard 23 Jun '21

23 Jun '21

Module: vkd3d Branch: master Commit: c30ad6ddeabe19e37dce09c57de49d11eeb43ed8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c30ad6ddeabe19e37dce09c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 21 23:37:08 2021 -0500 vkd3d-shader: Get rid of HLSL_IR_SEQUENCE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 2 -- libs/vkd3d-shader/hlsl.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index e9bfc37..c8ca4bb 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1015,8 +1015,6 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) "pow", "lerp", - - ",", }; return op_names[expr->op]; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 8c54202..b159cbb 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -329,8 +329,6 @@ enum hlsl_ir_expr_op HLSL_IR_BINOP_POW, HLSL_IR_TEROP_LERP, - - HLSL_IR_SEQUENCE, }; struct hlsl_ir_expr

1 0

Zebediah Figura : vkd3d-shader: Parse buffer declarations.
by Alexandre Julliard 23 Jun '21

23 Jun '21

Module: vkd3d Branch: master Commit: 4695690ac876cc0c70c663a7b7154391d196162d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4695690ac876cc0c70c663a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 21 23:37:09 2021 -0500 vkd3d-shader: Parse buffer declarations. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 24 ++++++++++++++++++++++++ libs/vkd3d-shader/hlsl.h | 18 ++++++++++++++++++ libs/vkd3d-shader/hlsl.y | 30 ++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c8ca4bb..aa95a43 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -592,6 +592,22 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl return decl; } +struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, + const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc) +{ + struct hlsl_buffer *buffer; + + if (!(buffer = hlsl_alloc(ctx, sizeof(*buffer)))) + return NULL; + buffer->type = type; + buffer->name = name; + if (reservation) + buffer->reservation = *reservation; + buffer->loc = loc; + list_add_tail(&ctx->buffers, &buffer->entry); + return buffer; +} + static int compare_hlsl_types_rb(const void *key, const struct rb_entry *entry) { const struct hlsl_type *type = RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); @@ -1583,12 +1599,14 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * list_init(&ctx->static_initializers); list_init(&ctx->extern_vars); + list_init(&ctx->buffers); return true; } static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) { + struct hlsl_buffer *buffer, *next_buffer; struct hlsl_scope *scope, *next_scope; struct hlsl_ir_var *var, *next_var; struct hlsl_type *type, *next_type; @@ -1611,6 +1629,12 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) LIST_FOR_EACH_ENTRY_SAFE(type, next_type, &ctx->types, struct hlsl_type, entry) hlsl_free_type(type); + + LIST_FOR_EACH_ENTRY_SAFE(buffer, next_buffer, &ctx->buffers, struct hlsl_buffer, entry) + { + vkd3d_free((void *)buffer->name); + vkd3d_free(buffer); + } } int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b159cbb..16ec976 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -417,6 +417,21 @@ struct hlsl_vec4 float f[4]; }; +enum hlsl_buffer_type +{ + HLSL_BUFFER_CONSTANT, + HLSL_BUFFER_TEXTURE, +}; + +struct hlsl_buffer +{ + struct vkd3d_shader_location loc; + enum hlsl_buffer_type type; + const char *name; + struct hlsl_reg_reservation reservation; + struct list entry; +}; + struct hlsl_ctx { const struct hlsl_profile_info *profile; @@ -435,6 +450,7 @@ struct hlsl_ctx struct list scopes; struct list extern_vars; + struct list buffers; struct list types; struct rb_tree functions; const struct hlsl_ir_function_decl *cur_function; @@ -609,6 +625,8 @@ struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *ba unsigned int array_size) DECLSPEC_HIDDEN; struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) DECLSPEC_HIDDEN; +struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, + const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *node, struct hlsl_type *type, struct vkd3d_shader_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *node) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1a102a5..6f83648 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1561,6 +1561,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t struct hlsl_reg_reservation reg_reservation; struct parse_colon_attribute colon_attribute; struct hlsl_semantic semantic; + enum hlsl_buffer_type buffer_type; } %token KW_BLENDSTATE @@ -1711,6 +1712,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t %type <boolval> boolean +%type <buffer_type> buffer_type + %type <colon_attribute> colon_attribute %type <function> func_declaration @@ -1776,6 +1779,7 @@ hlsl_prog: hlsl_add_function(ctx, $2.name, $2.decl, false); } + | hlsl_prog buffer_declaration | hlsl_prog declaration_statement { if (!list_empty($2)) @@ -1785,6 +1789,32 @@ hlsl_prog: | hlsl_prog preproc_directive | hlsl_prog ';' +buffer_declaration: + buffer_type any_identifier colon_attribute '{' declaration_statement_list '}' + { + struct hlsl_buffer *buffer; + + if ($3.semantic.name) + hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, "Semantics are not allowed on buffers."); + + if (!(buffer = hlsl_new_buffer(ctx, $1, $2, &$3.reg_reservation, @2))) + YYABORT; + } + +buffer_type: + KW_CBUFFER + { + $$ = HLSL_BUFFER_CONSTANT; + } + | KW_TBUFFER + { + $$ = HLSL_BUFFER_TEXTURE; + } + +declaration_statement_list: + declaration_statement + | declaration_statement_list declaration_statement + preproc_directive: PRE_LINE STRING {

1 0

Zebediah Figura : vkd3d-shader: Keep track of the buffer in which a variable was defined.
by Alexandre Julliard 23 Jun '21

23 Jun '21

Module: vkd3d Branch: master Commit: dbfe63d6a1f6b9f7ac5052ecd6efcd5b29f5a410 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dbfe63d6a1f6b9f7ac5052e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 21 23:37:10 2021 -0500 vkd3d-shader: Keep track of the buffer in which a variable was defined. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 6 ++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 16 +++++++++++----- libs/vkd3d-shader/hlsl_codegen.c | 1 + 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index aa95a43..c36fe60 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1599,8 +1599,14 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, const struct hlsl_profile_info * list_init(&ctx->static_initializers); list_init(&ctx->extern_vars); + list_init(&ctx->buffers); + if (!(ctx->globals_buffer = hlsl_new_buffer(ctx, HLSL_BUFFER_CONSTANT, + hlsl_strdup(ctx, "$Globals"), NULL, ctx->location))) + return false; + ctx->cur_buffer = ctx->globals_buffer; + return true; } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 16ec976..e2ac0a7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -222,6 +222,7 @@ struct hlsl_ir_var struct vkd3d_shader_location loc; const char *name; struct hlsl_semantic semantic; + struct hlsl_buffer *buffer; unsigned int modifiers; struct hlsl_reg_reservation reg_reservation; struct list scope_entry, param_entry, extern_entry; @@ -451,6 +452,7 @@ struct hlsl_ctx struct list extern_vars; struct list buffers; + struct hlsl_buffer *cur_buffer, *globals_buffer; struct list types; struct rb_tree functions; const struct hlsl_ir_function_decl *cur_function; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6f83648..4355b9a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1393,6 +1393,8 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } + var->buffer = ctx->cur_buffer; + if (ctx->cur_scope == ctx->globals) { local = false; @@ -1779,7 +1781,7 @@ hlsl_prog: hlsl_add_function(ctx, $2.name, $2.decl, false); } - | hlsl_prog buffer_declaration + | hlsl_prog buffer_declaration buffer_body | hlsl_prog declaration_statement { if (!list_empty($2)) @@ -1790,17 +1792,21 @@ hlsl_prog: | hlsl_prog ';' buffer_declaration: - buffer_type any_identifier colon_attribute '{' declaration_statement_list '}' + buffer_type any_identifier colon_attribute { - struct hlsl_buffer *buffer; - if ($3.semantic.name) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC, "Semantics are not allowed on buffers."); - if (!(buffer = hlsl_new_buffer(ctx, $1, $2, &$3.reg_reservation, @2))) + if (!(ctx->cur_buffer = hlsl_new_buffer(ctx, $1, $2, &$3.reg_reservation, @2))) YYABORT; } +buffer_body: + '{' declaration_statement_list '}' + { + ctx->cur_buffer = ctx->globals_buffer; + } + buffer_type: KW_CBUFFER { diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 54c91bf..068fb16 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -41,6 +41,7 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru list_add_tail(&ctx->extern_vars, &uniform->extern_entry); uniform->is_uniform = 1; uniform->is_param = temp->is_param; + uniform->buffer = temp->buffer; if (!(name = hlsl_get_string_buffer(ctx))) return;

1 0

Zebediah Figura : vkd3d-shader: Track register size in components.
by Alexandre Julliard 23 Jun '21

23 Jun '21

Module: vkd3d Branch: master Commit: 0dc665484b55942228df49184987422a48a3d8b0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0dc665484b55942228df491… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 22 12:29:03 2021 -0500 vkd3d-shader: Track register size in components. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 8 ++++---- libs/vkd3d-shader/hlsl.y | 10 +++++----- libs/vkd3d-shader/hlsl_codegen.c | 35 +++++++++++++++++------------------ 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c36fe60..721458e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -111,9 +111,9 @@ struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, enum hls type->dimx = dimx; type->dimy = dimy; if (type_class == HLSL_CLASS_MATRIX) - type->reg_size = hlsl_type_is_row_major(type) ? dimy : dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? dimy : dimx) * 4; else - type->reg_size = 1; + type->reg_size = 4; list_add_tail(&ctx->types, &type->entry); @@ -352,11 +352,11 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, u } case HLSL_CLASS_MATRIX: - type->reg_size = hlsl_type_is_row_major(type) ? type->dimy : type->dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? type->dimy : type->dimx) * 4; break; default: - type->reg_size = 1; + type->reg_size = 4; break; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4355b9a..828b19a 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -567,7 +567,7 @@ static struct hlsl_ir_load *add_record_load(struct hlsl_ctx *ctx, struct list *i { struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, loc))) return NULL; list_add_tail(instrs, &c->node.entry); @@ -601,7 +601,7 @@ static struct hlsl_ir_load *add_array_load(struct hlsl_ctx *ctx, struct list *in return NULL; } - if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size * 4, loc))) + if (!(c = hlsl_new_uint_constant(ctx, data_type->reg_size, loc))) return NULL; list_add_tail(instrs, &c->node.entry); if (!(mul = hlsl_new_binary_expr(ctx, HLSL_IR_BINOP_MUL, index, &c->node))) @@ -663,7 +663,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ *modifiers &= ~HLSL_TYPE_MODIFIERS_MASK; if (new_type->type == HLSL_CLASS_MATRIX) - new_type->reg_size = hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx; + new_type->reg_size = (hlsl_type_is_row_major(new_type) ? new_type->dimy : new_type->dimx) * 4; return new_type; } @@ -738,7 +738,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, type->modifiers, v->loc); else - type->reg_size = hlsl_type_is_row_major(type) ? type->dimy : type->dimx; + type->reg_size = (hlsl_type_is_row_major(type) ? type->dimy : type->dimx) * 4; if ((type->modifiers & HLSL_MODIFIER_COLUMN_MAJOR) && (type->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -1328,7 +1328,7 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru if (hlsl_type_component_count(field->type) == hlsl_type_component_count(node->data_type)) { - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, node->loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, node->loc))) break; list_add_tail(list, &c->node.entry); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 068fb16..79cae35 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -93,7 +93,7 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; list_add_head(instrs, &load->node.entry); - if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + if (!(offset = hlsl_new_uint_constant(ctx, field_offset, var->loc))) return; list_add_after(&load->node.entry, &offset->node.entry); @@ -160,7 +160,7 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct list_add_before(&var->scope_entry, &output->scope_entry); list_add_tail(&ctx->extern_vars, &output->extern_entry); - if (!(offset = hlsl_new_uint_constant(ctx, field_offset * 4, var->loc))) + if (!(offset = hlsl_new_uint_constant(ctx, field_offset, var->loc))) return; list_add_tail(instrs, &offset->node.entry); @@ -291,7 +291,7 @@ static bool split_struct_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr struct hlsl_ir_load *field_load; struct hlsl_ir_constant *c; - if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset * 4, instr->loc))) + if (!(c = hlsl_new_uint_constant(ctx, field->reg_offset, instr->loc))) return false; list_add_before(&instr->entry, &c->node.entry); @@ -714,9 +714,8 @@ static bool is_range_available(struct liveness *liveness, unsigned int first_wri } static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liveness, - unsigned int first_write, unsigned int last_read, unsigned int reg_count) + unsigned int first_write, unsigned int last_read, unsigned int component_count) { - const unsigned int component_count = reg_count * 4; unsigned int i, component_idx; struct hlsl_reg ret = {0}; @@ -738,9 +737,9 @@ static struct hlsl_reg allocate_range(struct hlsl_ctx *ctx, struct liveness *liv static const char *debug_register(char class, struct hlsl_reg reg, const struct hlsl_type *type) { - if (type->reg_size > 1) + if (type->reg_size > 4) return vkd3d_dbg_sprintf("%c%u-%c%u", class, reg.id, class, - reg.id + type->reg_size - 1); + reg.id + (type->reg_size / 4) - 1); return vkd3d_dbg_sprintf("%c%u%s", class, reg.id, debug_hlsl_writemask(reg.writemask)); } @@ -751,7 +750,7 @@ static void allocate_variable_temp_register(struct hlsl_ctx *ctx, struct hlsl_ir if (!var->reg.allocated && var->last_read) { - if (var->data_type->reg_size > 1) + if (var->data_type->reg_size > 4) var->reg = allocate_range(ctx, liveness, var->first_write, var->last_read, var->data_type->reg_size); else @@ -770,7 +769,7 @@ static void allocate_temp_registers_recurse(struct hlsl_ctx *ctx, struct list *i { if (!instr->reg.allocated && instr->last_read) { - if (instr->data_type->reg_size > 1) + if (instr->data_type->reg_size > 4) instr->reg = allocate_range(ctx, liveness, instr->index, instr->last_read, instr->data_type->reg_size); else @@ -832,23 +831,23 @@ static void allocate_const_registers_recurse(struct hlsl_ctx *ctx, struct list * { struct hlsl_ir_constant *constant = hlsl_ir_constant(instr); const struct hlsl_type *type = instr->data_type; + unsigned int x, y, i, writemask, end_reg; unsigned int reg_size = type->reg_size; - unsigned int x, y, i, writemask; - if (reg_size > 1) + if (reg_size > 4) constant->reg = allocate_range(ctx, liveness, 1, UINT_MAX, reg_size); else constant->reg = allocate_register(ctx, liveness, 1, UINT_MAX, type->dimx); TRACE("Allocated constant @%u to %s.\n", instr->index, debug_register('c', constant->reg, type)); if (!hlsl_array_reserve(ctx, (void **)&defs->values, &defs->size, - constant->reg.id + reg_size, sizeof(*defs->values))) + constant->reg.id + reg_size / 4, sizeof(*defs->values))) return; - if (constant->reg.id + reg_size > defs->count) + end_reg = constant->reg.id + reg_size / 4; + if (end_reg > defs->count) { - memset(&defs->values[defs->count], 0, - sizeof(*defs->values) * (constant->reg.id + reg_size - defs->count)); - defs->count = constant->reg.id + reg_size; + memset(&defs->values[defs->count], 0, sizeof(*defs->values) * (end_reg - defs->count)); + defs->count = end_reg; } assert(type->type <= HLSL_CLASS_LAST_NUMERIC); @@ -931,7 +930,7 @@ static void allocate_const_registers(struct hlsl_ctx *ctx, struct hlsl_ir_functi { if (var->is_uniform && var->last_read) { - if (var->data_type->reg_size > 1) + if (var->data_type->reg_size > 4) var->reg = allocate_range(ctx, &liveness, 1, UINT_MAX, var->data_type->reg_size); else { @@ -1520,7 +1519,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct bytecode_buffer *buf { put_dword(buffer, 0); /* name */ put_dword(buffer, D3DXRS_FLOAT4 | (var->reg.id << 16)); - put_dword(buffer, var->data_type->reg_size); + put_dword(buffer, var->data_type->reg_size / 4); put_dword(buffer, 0); /* type */ put_dword(buffer, 0); /* FIXME: default value */ }

1 0

Georg Lehmann : winevulkan: Fix bit field struct members.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: afa49b18ca145830ffa31fa4a7c808833ab12b3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=afa49b18ca145830ffa31fa4… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jun 22 12:15:41 2021 +0200 winevulkan: Fix bit field struct members. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 18 ++++++++++++++++-- include/wine/vulkan.h | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b7d57b8218d..e8534cbd5f5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1078,7 +1078,7 @@ class VkHandle(object): class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, values=None, object_type=None): + dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): self.const = const self.struct_fwd_decl = struct_fwd_decl self.name = name @@ -1090,6 +1090,7 @@ class VkMember(object): self.optional = optional self.values = values self.object_type = object_type + self.bit_width = bit_width def __eq__(self, other): """ Compare member based on name against a string. @@ -1116,6 +1117,7 @@ class VkMember(object): member_type = None pointer = None array_len = None + bit_width = None values = member.get("values") @@ -1161,8 +1163,14 @@ class VkMember(object): object_type = member.get("objecttype", None) + # Some members are bit field values: + # <member><type>uint32_t</type> <name>mask</name>:8</member> + if name_elem.tail and name_elem.tail[0] == ':': + LOGGER.debug("Found bit field") + bit_width = int(name_elem.tail[1:]) + return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, - array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type) + array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type, bit_width=bit_width) def copy(self, input, output, direction, conv): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. @@ -1267,6 +1275,9 @@ class VkMember(object): if self.is_static_array(): text += "[{0}]".format(self.array_len) + if self.is_bit_field(): + text += ":{}".format(self.bit_width) + return text def get_conversions(self): @@ -1344,6 +1355,9 @@ class VkMember(object): return self.object_type != None and self.type == "uint64_t" + def is_bit_field(self): + return self.bit_width is not None + def needs_alignment(self): """ Check if this member needs alignment for 64-bit data. Various structures need alignment on 64-bit variables due diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index eb72a0cdf34..7a3ccab9758 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -5752,10 +5752,10 @@ typedef struct VkAccelerationStructureGeometryMotionTrianglesDataNV typedef struct VkAccelerationStructureInstanceKHR { VkTransformMatrixKHR transform; - uint32_t instanceCustomIndex; - uint32_t mask; - uint32_t instanceShaderBindingTableRecordOffset; - VkGeometryInstanceFlagsKHR flags; + uint32_t instanceCustomIndex:24; + uint32_t mask:8; + uint32_t instanceShaderBindingTableRecordOffset:24; + VkGeometryInstanceFlagsKHR flags:8; uint64_t WINE_VK_ALIGN(8) accelerationStructureReference; } VkAccelerationStructureInstanceKHR; typedef VkAccelerationStructureInstanceKHR VkAccelerationStructureInstanceNV; @@ -5772,10 +5772,10 @@ typedef struct VkAccelerationStructureSRTMotionInstanceNV { VkSRTDataNV transformT0; VkSRTDataNV transformT1; - uint32_t instanceCustomIndex; - uint32_t mask; - uint32_t instanceShaderBindingTableRecordOffset; - VkGeometryInstanceFlagsKHR flags; + uint32_t instanceCustomIndex:24; + uint32_t mask:8; + uint32_t instanceShaderBindingTableRecordOffset:24; + VkGeometryInstanceFlagsKHR flags:8; uint64_t WINE_VK_ALIGN(8) accelerationStructureReference; } VkAccelerationStructureSRTMotionInstanceNV; @@ -7033,10 +7033,10 @@ typedef struct VkAccelerationStructureMatrixMotionInstanceNV { VkTransformMatrixKHR transformT0; VkTransformMatrixKHR transformT1; - uint32_t instanceCustomIndex; - uint32_t mask; - uint32_t instanceShaderBindingTableRecordOffset; - VkGeometryInstanceFlagsKHR flags; + uint32_t instanceCustomIndex:24; + uint32_t mask:8; + uint32_t instanceShaderBindingTableRecordOffset:24; + VkGeometryInstanceFlagsKHR flags:8; uint64_t WINE_VK_ALIGN(8) accelerationStructureReference; } VkAccelerationStructureMatrixMotionInstanceNV;

1 0

Zebediah Figura : wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data().
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: a48513f114ac048d963c2073d8f5515ea0211356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a48513f114ac048d963c2073… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 18 11:13:24 2021 -0500 wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 12d038c0120..6cfeb4f510d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1041,7 +1041,6 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_sub_resource_data *data) { struct wined3d_resource *resource = &buffer->resource; - struct wined3d_bo_address bo; struct wined3d_box box; if (buffer->flags & WINED3D_BUFFER_USE_BO) @@ -1052,8 +1051,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, } else { - wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); - memcpy(bo.addr, data->data, resource->size); + memcpy(buffer->resource.heap_memory, data->data, resource->size); wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); }

1 0

Zebediah Figura : wined3d: Remove the now redundant "locations" parameter from wined3d_buffer_get_memory().
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 9c1a80f433e436b854b470a0c5288d40a692da95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c1a80f433e436b854b470a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 18 11:13:25 2021 -0500 wined3d: Remove the now redundant "locations" parameter from wined3d_buffer_get_memory(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 9 +++++---- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6cfeb4f510d..267a8a0bd9c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -603,9 +603,10 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } -DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, - struct wined3d_bo_address *data, DWORD locations) +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) { + unsigned int locations = buffer->locations; + TRACE("buffer %p, data %p, locations %s.\n", buffer, data, wined3d_debug_location(locations)); @@ -1005,10 +1006,10 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off TRACE("dst_buffer %p, dst_offset %u, src_buffer %p, src_offset %u, size %u.\n", dst_buffer, dst_offset, src_buffer, src_offset, size); - dst_location = wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); + dst_location = wined3d_buffer_get_memory(dst_buffer, &dst); dst.addr += dst_offset; - wined3d_buffer_get_memory(src_buffer, &src, src_buffer->locations); + wined3d_buffer_get_memory(src_buffer, &src); src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7f50126204b..8b35b9da17f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -304,7 +304,7 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi else { wined3d_buffer_load(buffer, context, state); - wined3d_buffer_get_memory(buffer, &data, buffer->locations); + wined3d_buffer_get_memory(buffer, &data); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7900df3c246..9baa0ae0cd3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1611,7 +1611,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ if (!view->counter_bo) return; - dst_location = wined3d_buffer_get_memory(buffer, &dst, buffer->locations); + dst_location = wined3d_buffer_get_memory(buffer, &dst); dst.addr += offset; src.buffer_object = view->counter_bo; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bbc2f4f4db7..6ada1fa3642 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4899,8 +4899,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; -DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, - struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Handle WINED3D_LOCATION_DISCARDED in wined3d_buffer_get_memory().
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 334a3bbe37d89ba8c11d14965946e09b939fa900 URL: https://source.winehq.org/git/wine.git/?a=commit;h=334a3bbe37d89ba8c11d1496… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 18 11:13:26 2021 -0500 wined3d: Handle WINED3D_LOCATION_DISCARDED in wined3d_buffer_get_memory(). This can't currently happen. However, we'd like to use wined3d_buffer_get_memory() in wined3d_cs_exec_update_sub_resource(). This would probably also help in implementing ID3D11DeviceContext1::DiscardResource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 26 ++++++++++++++++++++------ dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 267a8a0bd9c..cbf33df5539 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -603,13 +603,26 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } -DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, + struct wined3d_bo_address *data) { unsigned int locations = buffer->locations; - TRACE("buffer %p, data %p, locations %s.\n", - buffer, data, wined3d_debug_location(locations)); + TRACE("buffer %p, context %p, data %p, locations %s.\n", + buffer, context, data, wined3d_debug_location(locations)); + if (locations & WINED3D_LOCATION_DISCARDED) + { + locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); + if (!wined3d_buffer_prepare_location(buffer, context, locations)) + { + data->buffer_object = 0; + data->addr = NULL; + return 0; + } + wined3d_buffer_validate_location(buffer, locations); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); + } if (locations & WINED3D_LOCATION_BUFFER) { data->buffer_object = buffer->buffer_object; @@ -1006,13 +1019,14 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off TRACE("dst_buffer %p, dst_offset %u, src_buffer %p, src_offset %u, size %u.\n", dst_buffer, dst_offset, src_buffer, src_offset, size); - dst_location = wined3d_buffer_get_memory(dst_buffer, &dst); + context = context_acquire(dst_buffer->resource.device, NULL, 0); + + dst_location = wined3d_buffer_get_memory(dst_buffer, context, &dst); dst.addr += dst_offset; - wined3d_buffer_get_memory(src_buffer, &src); + wined3d_buffer_get_memory(src_buffer, context, &src); src.addr += src_offset; - context = context_acquire(dst_buffer->resource.device, NULL, 0); wined3d_context_copy_bo_address(context, &dst, &src, size); context_release(context); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8b35b9da17f..a44e979d32c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -304,7 +304,7 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi else { wined3d_buffer_load(buffer, context, state); - wined3d_buffer_get_memory(buffer, &data); + wined3d_buffer_get_memory(buffer, context, &data); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 9baa0ae0cd3..67f4b03e9d3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1611,7 +1611,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ if (!view->counter_bo) return; - dst_location = wined3d_buffer_get_memory(buffer, &dst); + dst_location = wined3d_buffer_get_memory(buffer, context, &dst); dst.addr += offset; src.buffer_object = view->counter_bo; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6ada1fa3642..400d20b94b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4899,7 +4899,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; -DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, + struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0