September 2012 - Wine-Commits

Francois Gouget : d3dcompiler_43: Make add_type_to_scope() static.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: e4ca67f7aaa9ea3a68812fba56889479c122fabc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ca67f7aaa9ea3a68812fba5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:12:17 2012 +0200 d3dcompiler_43: Make add_type_to_scope() static. --- dlls/d3dcompiler_43/hlsl.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5670586..eea49be 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -186,7 +186,7 @@ static BOOL check_type_modifiers(DWORD modifiers, struct source_location *loc) return TRUE; } -BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) +static BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) { if (get_type(scope, def->name, FALSE)) return FALSE;

1 0

Francois Gouget : kernel32: Replace the format_message() helper macro with a static function.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: bca6e18d1ba4176c9e2d019a08549fc6e4da7ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bca6e18d1ba4176c9e2d019a0… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:37:24 2012 +0200 kernel32: Replace the format_message() helper macro with a static function. --- dlls/kernel32/format_msg.c | 73 +++++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 34 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index b9e471f..a3cbab9 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -261,30 +261,36 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, return format; } +struct _format_message_data +{ + LPWSTR formatted; + DWORD size; + LPWSTR t; +}; + +static void format_add_char(struct _format_message_data *fmd, WCHAR c) +{ + *fmd->t++ = c; + if ((DWORD)(fmd->t - fmd->formatted) == fmd->size) { + fmd->formatted = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, fmd->formatted, (fmd->size * 2) * sizeof(WCHAR)); + fmd->t = fmd->formatted + fmd->size; + fmd->size *= 2; + } +} + /********************************************************************** * format_message (internal) */ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr, struct format_args *format_args ) { - LPWSTR target,t; - DWORD talloced; + struct _format_message_data fmd; LPCWSTR f; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; BOOL eos = FALSE; - WCHAR ch; - - target = t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); - talloced = 100; -#define ADD_TO_T(c) do {\ - *t++=c;\ - if ((DWORD)(t-target) == talloced) {\ - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ - t = target+talloced;\ - talloced*=2;\ - } \ -} while (0) + fmd.size = 100; + fmd.formatted = fmd.t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, fmd.size * sizeof(WCHAR) ); f = fmtstr; while (*f && !eos) { @@ -302,7 +308,7 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->list)) { SetLastError(ERROR_INVALID_PARAMETER); - HeapFree(GetProcessHeap(), 0, target); + HeapFree(GetProcessHeap(), 0, fmd.formatted); return NULL; } insertnr = *f-'0'; @@ -319,20 +325,20 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr break; } f = format_insert( unicode_caller, insertnr, f, dwFlags, format_args, &str ); - for (x = str; *x; x++) ADD_TO_T(*x); + for (x = str; *x; x++) format_add_char(&fmd, *x); HeapFree( GetProcessHeap(), 0, str ); break; case 'n': - ADD_TO_T('\r'); - ADD_TO_T('\n'); + format_add_char(&fmd, '\r'); + format_add_char(&fmd, '\n'); f++; break; case 'r': - ADD_TO_T('\r'); + format_add_char(&fmd, '\r'); f++; break; case 't': - ADD_TO_T('\t'); + format_add_char(&fmd, '\t'); f++; break; case '0': @@ -341,49 +347,48 @@ static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr break; case '\0': SetLastError(ERROR_INVALID_PARAMETER); - HeapFree(GetProcessHeap(), 0, target); + HeapFree(GetProcessHeap(), 0, fmd.formatted); return NULL; ignore_inserts: default: if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) - ADD_TO_T('%'); - ADD_TO_T(*f++); + format_add_char(&fmd, '%'); + format_add_char(&fmd, *f++); break; } } else { - ch = *f; + WCHAR ch = *f; f++; if (ch == '\r') { if (*f == '\n') f++; if(width) - ADD_TO_T(' '); + format_add_char(&fmd, ' '); else { - ADD_TO_T('\r'); - ADD_TO_T('\n'); + format_add_char(&fmd, '\r'); + format_add_char(&fmd, '\n'); } } else { if (ch == '\n') { if(width) - ADD_TO_T(' '); + format_add_char(&fmd, ' '); else { - ADD_TO_T('\r'); - ADD_TO_T('\n'); + format_add_char(&fmd, '\r'); + format_add_char(&fmd, '\n'); } } else - ADD_TO_T(ch); + format_add_char(&fmd, ch); } } } - *t = '\0'; + *fmd.t = '\0'; - return target; + return fmd.formatted; } -#undef ADD_TO_T /*********************************************************************** * FormatMessageA (KERNEL32.@)

1 0

Francois Gouget : msvcp71: Remove an unused debug channel.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 5e15a3031eedf994b6f8157f4b78a1078217ceca URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e15a3031eedf994b6f8157f4… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 19 20:11:59 2012 +0200 msvcp71: Remove an unused debug channel. --- dlls/msvcp71/msvcp71.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp71/msvcp71.c b/dlls/msvcp71/msvcp71.c index 5bf76e4..cb36893 100644 --- a/dlls/msvcp71/msvcp71.c +++ b/dlls/msvcp71/msvcp71.c @@ -26,8 +26,6 @@ #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp); - #ifdef __i386__ #define DEFINE_VTBL_WRAPPER(off) \

1 0

Henri Verbeet : d3d10: Get rid of the unused idx_offset field from struct d3d10_effect_object.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 5fe32c8bfd778e20daf055ace415929d94809df7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe32c8bfd778e20daf055ace… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:20 2012 +0200 d3d10: Get rid of the unused idx_offset field from struct d3d10_effect_object. --- dlls/d3d10/d3d10_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 01068e0..51696ef 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -69,7 +69,6 @@ struct d3d10_effect_object { struct d3d10_effect_pass *pass; enum d3d10_effect_object_type type; - DWORD idx_offset; DWORD index; void *data; };

1 0

Matteo Bruni : d3dcompiler: Parse casts.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: ca701b7d69c97e667973449e22a8fb6d4c44790b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca701b7d69c97e667973449e2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:15 2012 +0200 d3dcompiler: Parse casts. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 3 + dlls/d3dcompiler_43/hlsl.y | 29 ++++++++++++ dlls/d3dcompiler_43/utils.c | 68 +++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index b3a9586..22207c9 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -1080,8 +1080,11 @@ struct hlsl_type *clone_hlsl_type(struct hlsl_type *old) DECLSPEC_HIDDEN; struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) DECLSPEC_HIDDEN; BOOL find_function(const char *name) DECLSPEC_HIDDEN; unsigned int components_count_type(struct hlsl_type *type) DECLSPEC_HIDDEN; +BOOL compatible_data_types(struct hlsl_type *s1, struct hlsl_type *s2) DECLSPEC_HIDDEN; struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **operands, struct source_location *loc) DECLSPEC_HIDDEN; +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_mul(struct hlsl_ir_node *op1, struct hlsl_ir_node *op2, struct source_location *loc) DECLSPEC_HIDDEN; struct hlsl_ir_expr *hlsl_div(struct hlsl_ir_node *op1, struct hlsl_ir_node *op2, diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e8f33af..5670586 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1472,6 +1472,35 @@ unary_expr: postfix_expr $$ = &new_expr(ops[$1], operands, &loc)->node; } } + /* var_modifiers just to avoid shift/reduce conflicts */ + | '(' var_modifiers type array ')' unary_expr + { + struct hlsl_ir_expr *expr; + struct hlsl_type *src_type = $6->data_type; + struct hlsl_type *dst_type; + struct source_location loc; + + set_location(&loc, &@3); + if ($2) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "unexpected modifier in a cast"); + return 1; + } + + dst_type = $3; + + if (!compatible_data_types(src_type, dst_type)) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "can't cast from %s to %s", + debug_hlsl_type(src_type), debug_hlsl_type(dst_type)); + return 1; + } + + expr = new_cast($6, dst_type, &loc); + $$ = expr ? &expr->node : NULL; + } unary_op: '+' { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 8aaa675..e0cac23 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1031,6 +1031,60 @@ static BOOL convertible_data_type(struct hlsl_type *type) return type->type != HLSL_CLASS_OBJECT; } +BOOL compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) +{ + if (!convertible_data_type(t1) || !convertible_data_type(t2)) + return FALSE; + + if (t1->type <= HLSL_CLASS_LAST_NUMERIC) + { + /* Scalar vars can be cast to pretty much everything */ + if (t1->dimx == 1 && t1->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_VECTOR && t2->type == HLSL_CLASS_VECTOR) + return t1->dimx >= t2->dimx; + } + + /* The other way around is true too i.e. whatever to scalar */ + if (t2->type <= HLSL_CLASS_LAST_NUMERIC && t2->dimx == 1 && t2->dimy == 1) + return TRUE; + + if (t1->type == HLSL_CLASS_ARRAY) + { + if (compare_hlsl_types(t1->e.array.type, t2)) + /* e.g. float4[3] to float4 is allowed */ + return TRUE; + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + else + return components_count_type(t1) == components_count_type(t2); + } + + if (t1->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) >= components_count_type(t2); + + if (t2->type == HLSL_CLASS_ARRAY || t2->type == HLSL_CLASS_STRUCT) + return components_count_type(t1) == components_count_type(t2); + + if (t1->type == HLSL_CLASS_MATRIX || t2->type == HLSL_CLASS_MATRIX) + { + if (t1->type == HLSL_CLASS_MATRIX && t2->type == HLSL_CLASS_MATRIX && t1->dimx >= t2->dimx && t1->dimy >= t2->dimy) + return TRUE; + + /* Matrix-vector conversion is apparently allowed if they have the same components count */ + if ((t1->type == HLSL_CLASS_VECTOR || t2->type == HLSL_CLASS_VECTOR) + && components_count_type(t1) == components_count_type(t2)) + return TRUE; + return FALSE; + } + + if (components_count_type(t1) >= components_count_type(t2)) + return TRUE; + return FALSE; +} + static BOOL implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) { if (!convertible_data_type(t1) || !convertible_data_type(t2)) @@ -1322,6 +1376,20 @@ struct hlsl_ir_expr *new_expr(enum hlsl_ir_expr_op op, struct hlsl_ir_node **ope return expr; } +struct hlsl_ir_expr *new_cast(struct hlsl_ir_node *node, struct hlsl_type *type, + struct source_location *loc) +{ + struct hlsl_ir_expr *cast; + struct hlsl_ir_node *operands[3]; + + operands[0] = node; + operands[1] = operands[2] = NULL; + cast = new_expr(HLSL_IR_UNOP_CAST, operands, loc); + if (cast) + cast->node.data_type = type; + return cast; +} + struct hlsl_ir_expr *hlsl_mul(struct hlsl_ir_node *op1, struct hlsl_ir_node *op2, struct source_location *loc) {

1 0

Matteo Bruni : d3dcompiler: Support simple variable initializers.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 46e368934e5075c906e7eaea70739dd3fabc973b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46e368934e5075c906e7eaea7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:14 2012 +0200 d3dcompiler: Support simple variable initializers. --- dlls/d3dcompiler_43/hlsl.y | 85 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 78 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index e558f6f..e8f33af 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -256,6 +256,19 @@ static void declare_predefined_types(struct hlsl_scope *scope) add_type_to_scope(scope, type); } +static unsigned int initializer_size(struct list *initializer) +{ + unsigned int count = 0; + struct hlsl_ir_node *node; + + LIST_FOR_EACH_ENTRY(node, initializer, struct hlsl_ir_node, entry) + { + count += components_count_type(node->data_type); + } + TRACE("Initializer size = %u\n", count); + return count; +} + static unsigned int components_count_expr_list(struct list *list) { struct hlsl_ir_node *node; @@ -543,6 +556,7 @@ static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct lis %type <type> base_type %type <type> type %type <list> declaration_statement +%type <list> declaration %type <list> type_specs %type <variable_def> type_spec %type <list> complex_initializer @@ -857,8 +871,7 @@ base_type: KW_VOID declaration_statement: declaration { - $$ = d3dcompiler_alloc(sizeof(*$$)); - list_init($$); + $$ = $1; } | typedef { @@ -902,19 +915,24 @@ type_spec: any_identifier array declaration: var_modifiers type variables_def ';' { + struct hlsl_type *type; struct parse_variable_def *v, *v_next; struct hlsl_ir_var *var; + struct hlsl_ir_node *assignment; BOOL ret, local = TRUE; + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); LIST_FOR_EACH_ENTRY_SAFE(v, v_next, $3, struct parse_variable_def, entry) { debug_dump_decl($2, $1, v->name, hlsl_ctx.line_no); var = d3dcompiler_alloc(sizeof(*var)); var->node.type = HLSL_IR_VAR; if (v->array_size) - var->node.data_type = new_array_type($2, v->array_size); + type = new_array_type($2, v->array_size); else - var->node.data_type = $2; + type = $2; + var->node.data_type = type; var->node.loc = v->loc; var->name = v->name; var->modifiers = $1; @@ -943,10 +961,63 @@ declaration: var_modifiers type variables_def ';' if (v->initializer) { - FIXME("Variable with an initializer.\n"); - free_instr_list(v->initializer); + unsigned int size = initializer_size(v->initializer); + struct hlsl_ir_node *node; + + TRACE("Variable with initializer\n"); + if (type->type <= HLSL_CLASS_LAST_NUMERIC + && type->dimx * type->dimy != size + && size != 1) + { + if (size < type->dimx * type->dimy) + { + hlsl_report_message(v->loc.file, + v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, + "'%s' initializer does not match", v->name); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + } + + if ((type->type == HLSL_CLASS_STRUCT || type->type == HLSL_CLASS_ARRAY) + && components_count_type(type) != size) + { + hlsl_report_message(v->loc.file, + v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, + "'%s' initializer does not match", v->name); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + + if (type->type > HLSL_CLASS_LAST_NUMERIC) + { + FIXME("Initializers for non scalar/struct variables not supported yet\n"); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + if (v->array_size > 0) + { + FIXME("Initializing arrays is not supported yet\n"); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + + if (list_count(v->initializer) > 1) + { + FIXME("Complex initializers are not supported yet.\n"); + free_instr_list(v->initializer); + d3dcompiler_free(v); + continue; + } + node = LIST_ENTRY(list_head(v->initializer), struct hlsl_ir_node, entry); + assignment = make_assignment(&var->node, ASSIGN_OP_ASSIGN, + BWRITERSP_WRITEMASK_ALL, node); + list_add_tail($$, &assignment->entry); } - d3dcompiler_free(v); } d3dcompiler_free($3);

1 0

Matteo Bruni : d3dcompiler: Parse "typedef" statement.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: d9c247f2ae732c86c2e0777146c826d1080412d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c247f2ae732c86c2e077714… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:13 2012 +0200 d3dcompiler: Parse "typedef" statement. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 + dlls/d3dcompiler_43/hlsl.y | 97 +++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index fffb6c6..b3a9586 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -734,6 +734,10 @@ struct hlsl_ir_node #define HLSL_MODIFIER_IN 0x00000800 #define HLSL_MODIFIER_OUT 0x00001000 +#define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_STORAGE_VOLATILE | \ + HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ + HLSL_MODIFIER_COLUMN_MAJOR) + #define HLSL_MODIFIERS_COMPARISON_MASK (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR) struct hlsl_ir_var diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 486c9a8..e558f6f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -175,6 +175,17 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) static DWORD add_modifier(DWORD modifiers, DWORD mod, const struct YYLTYPE *loc); +static BOOL check_type_modifiers(DWORD modifiers, struct source_location *loc) +{ + if (modifiers & ~HLSL_TYPE_MODIFIERS_MASK) + { + hlsl_report_message(loc->file, loc->line, loc->col, HLSL_LEVEL_ERROR, + "modifier not allowed on typedefs"); + return FALSE; + } + return TRUE; +} + BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) { if (get_type(scope, def->name, FALSE)) @@ -354,6 +365,51 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha return NULL; } +static BOOL add_typedef(DWORD modifiers, struct hlsl_type *orig_type, struct list *list, + struct source_location *loc) +{ + BOOL ret; + struct hlsl_type *type; + struct parse_variable_def *v, *v_next; + + if (!check_type_modifiers(modifiers, loc)) + { + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) + d3dcompiler_free(v); + d3dcompiler_free(list); + return FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE(v, v_next, list, struct parse_variable_def, entry) + { + if (v->array_size) + type = new_array_type(orig_type, v->array_size); + else + type = clone_hlsl_type(orig_type); + if (!type) + { + ERR("Out of memory\n"); + return FALSE; + } + d3dcompiler_free((void *)type->name); + type->name = v->name; + type->modifiers |= modifiers; + + if (type->type != HLSL_CLASS_MATRIX) + check_invalid_matrix_modifiers(type->modifiers, &v->loc); + + ret = add_type_to_scope(hlsl_ctx.cur_scope, type); + if (!ret) + { + hlsl_report_message(v->loc.file, v->loc.line, v->loc.col, HLSL_LEVEL_ERROR, + "redefinition of custom type '%s'", v->name); + } + d3dcompiler_free(v); + } + d3dcompiler_free(list); + return TRUE; +} + %} %locations @@ -487,6 +543,8 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha %type <type> base_type %type <type> type %type <list> declaration_statement +%type <list> type_specs +%type <variable_def> type_spec %type <list> complex_initializer %type <list> initializer_expr_list %type <instr> initializer_expr @@ -802,6 +860,45 @@ declaration_statement: declaration $$ = d3dcompiler_alloc(sizeof(*$$)); list_init($$); } + | typedef + { + $$ = d3dcompiler_alloc(sizeof(*$$)); + if (!$$) + { + ERR("Out of memory\n"); + return -1; + } + list_init($$); + } + +typedef: KW_TYPEDEF var_modifiers type type_specs ';' + { + struct source_location loc; + + set_location(&loc, &@1); + if (!add_typedef($2, $3, $4, &loc)) + return 1; + } + +type_specs: type_spec + { + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); + list_add_head($$, &$1->entry); + } + | type_specs ',' type_spec + { + $$ = $1; + list_add_tail($$, &$3->entry); + } + +type_spec: any_identifier array + { + $$ = d3dcompiler_alloc(sizeof(*$$)); + set_location(&$$->loc, &@1); + $$->name = $1; + $$->array_size = $2; + } declaration: var_modifiers type variables_def ';' {

1 0

Henri Verbeet : wined3d: wined3d_device_set_scissor_rect() never fails.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 2de9fc640b17a8241b8d7ee2e2fd3b01daed7277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de9fc640b17a8241b8d7ee2e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 19 21:50:21 2012 +0200 wined3d: wined3d_device_set_scissor_rect() never fails. --- dlls/d3d9/device.c | 5 ++--- dlls/wined3d/device.c | 8 +++----- include/wine/wined3d.h | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2662f4e..40bc169 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1865,15 +1865,14 @@ static HRESULT WINAPI d3d9_device_GetCurrentTexturePalette(IDirect3DDevice9Ex *i static HRESULT WINAPI d3d9_device_SetScissorRect(IDirect3DDevice9Ex *iface, const RECT *rect) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, rect %p.\n", iface, rect); wined3d_mutex_lock(); - hr = wined3d_device_set_scissor_rect(device->wined3d_device, rect); + wined3d_device_set_scissor_rect(device->wined3d_device, rect); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetScissorRect(IDirect3DDevice9Ex *iface, RECT *rect) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8439c13..6d85ff5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2382,7 +2382,7 @@ DWORD CDECL wined3d_device_get_sampler_state(const struct wined3d_device *device return device->stateBlock->state.sampler_states[sampler_idx][state]; } -HRESULT CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect) +void CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect) { TRACE("device %p, rect %s.\n", device, wine_dbgstr_rect(rect)); @@ -2390,19 +2390,17 @@ HRESULT CDECL wined3d_device_set_scissor_rect(struct wined3d_device *device, con if (EqualRect(&device->updateStateBlock->state.scissor_rect, rect)) { TRACE("App is setting the old scissor rectangle over, nothing to do.\n"); - return WINED3D_OK; + return; } CopyRect(&device->updateStateBlock->state.scissor_rect, rect); if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } device_invalidate_state(device, STATE_SCISSORRECT); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b44cc42..af88163 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2225,7 +2225,7 @@ HRESULT __cdecl wined3d_device_set_render_target(struct wined3d_device *device, UINT render_target_idx, struct wined3d_surface *render_target, BOOL set_viewport); void __cdecl wined3d_device_set_sampler_state(struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value); -HRESULT __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); +void __cdecl wined3d_device_set_scissor_rect(struct wined3d_device *device, const RECT *rect); HRESULT __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device *device, BOOL software); HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride);

1 0

Matteo Bruni : d3dcompiler: Store data types in a RB tree for faster search .
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 8f60f8f34bf633004ddff60907eb8b90a451d17b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f60f8f34bf633004ddff6090… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:12 2012 +0200 d3dcompiler: Store data types in a RB tree for faster search. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 +- dlls/d3dcompiler_43/hlsl.y | 3 +- dlls/d3dcompiler_43/utils.c | 54 +++++++++++++++++++++++++---- 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5171abe..fffb6c6 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -662,7 +662,7 @@ enum hlsl_matrix_majority struct hlsl_type { struct list entry; - struct list scope_entry; + struct wine_rb_entry scope_entry; enum hlsl_type_class type; enum hlsl_base_type base_type; enum hlsl_sampler_dim sampler_dim; @@ -924,7 +924,7 @@ struct hlsl_scope { struct list entry; struct list vars; - struct list types; + struct wine_rb_tree types; struct hlsl_scope *upper; }; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 97a1d62..486c9a8 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -180,7 +180,7 @@ BOOL add_type_to_scope(struct hlsl_scope *scope, struct hlsl_type *def) if (get_type(scope, def->name, FALSE)) return FALSE; - list_add_tail(&scope->types, &def->scope_entry); + wine_rb_put(&scope->types, def->name, &def->scope_entry); return TRUE; } @@ -1658,6 +1658,7 @@ struct bwriter_shader *parse_hlsl(enum shader_type type, DWORD major, DWORD mino { free_declaration(var); } + wine_rb_destroy(&scope->types, NULL, NULL); d3dcompiler_free(scope); } diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 05f769c..8aaa675 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -860,13 +860,10 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra struct hlsl_type *get_type(struct hlsl_scope *scope, const char *name, BOOL recursive) { - struct hlsl_type *type; + struct wine_rb_entry *entry = wine_rb_get(&scope->types, name); + if (entry) + return WINE_RB_ENTRY_VALUE(entry, struct hlsl_type, scope_entry); - LIST_FOR_EACH_ENTRY(type, &scope->types, struct hlsl_type, scope_entry) - { - if (strcmp(type->name, name) == 0) - return type; - } if (recursive && scope->upper) return get_type(scope->upper, name, recursive); return NULL; @@ -1599,6 +1596,44 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig return &assign->node; } +int compare_hlsl_types_rb(const void *key, const struct wine_rb_entry *entry) +{ + const char *name = (const char *)key; + const struct hlsl_type *type = WINE_RB_ENTRY_VALUE(entry, const struct hlsl_type, scope_entry); + + if (name == type->name) + return 0; + + if (!name || !type->name) + { + ERR("hlsl_type without a name in a scope?\n"); + return -1; + } + return strcmp(name, type->name); +} + +static inline void *d3dcompiler_alloc_rb(size_t size) +{ + return d3dcompiler_alloc(size); +} + +static inline void *d3dcompiler_realloc_rb(void *ptr, size_t size) +{ + return d3dcompiler_realloc(ptr, size); +} + +static inline void d3dcompiler_free_rb(void *ptr) +{ + d3dcompiler_free(ptr); +} +static const struct wine_rb_functions hlsl_type_rb_funcs = +{ + d3dcompiler_alloc_rb, + d3dcompiler_realloc_rb, + d3dcompiler_free_rb, + compare_hlsl_types_rb, +}; + void push_scope(struct hlsl_parse_ctx *ctx) { struct hlsl_scope *new_scope = d3dcompiler_alloc(sizeof(*new_scope)); @@ -1610,7 +1645,12 @@ void push_scope(struct hlsl_parse_ctx *ctx) } TRACE("Pushing a new scope\n"); list_init(&new_scope->vars); - list_init(&new_scope->types); + if (wine_rb_init(&new_scope->types, &hlsl_type_rb_funcs) == -1) + { + ERR("Failed to initialize types rbtree.\n"); + d3dcompiler_free(new_scope); + return; + } new_scope->upper = ctx->cur_scope; ctx->cur_scope = new_scope; list_add_tail(&ctx->scopes, &new_scope->entry);

1 0

Matteo Bruni : d3dcompiler: Parse "if/else" statement.
by Alexandre Julliard Sept. 20, 2012

Sept. 20, 2012

Module: wine Branch: master Commit: 79c6ce0a0ff295e40d2e627111c2734dcf96a155 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79c6ce0a0ff295e40d2e62711… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 19 19:46:11 2012 +0200 d3dcompiler: Parse "if/else" statement. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 21 +++++++++++ dlls/d3dcompiler_43/hlsl.y | 40 ++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 52 ++++++++++++++++++++++------ 3 files changed, 102 insertions(+), 11 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index eb75448..5171abe 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -706,6 +706,7 @@ enum hlsl_ir_node_type HLSL_IR_DEREF, HLSL_IR_EXPR, HLSL_IR_FUNCTION_DECL, + HLSL_IR_IF, HLSL_IR_JUMP, HLSL_IR_SWIZZLE, }; @@ -755,6 +756,14 @@ struct hlsl_ir_function_decl struct list *body; }; +struct hlsl_ir_if +{ + struct hlsl_ir_node node; + struct hlsl_ir_node *condition; + struct list *then_instrs; + struct list *else_instrs; +}; + struct hlsl_ir_assignment { struct hlsl_ir_node node; @@ -939,6 +948,12 @@ struct parse_variable_def struct list *initializer; }; +struct parse_if_body +{ + struct list *then_instrs; + struct list *else_instrs; +}; + enum parse_unary_op { UNARY_OP_PLUS, @@ -1043,6 +1058,12 @@ static inline struct hlsl_ir_constructor *constructor_from_node(const struct hls return CONTAINING_RECORD(node, struct hlsl_ir_constructor, node); } +static inline struct hlsl_ir_if *if_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_IF); + return CONTAINING_RECORD(node, struct hlsl_ir_if, node); +} + BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) DECLSPEC_HIDDEN; struct hlsl_ir_var *get_variable(struct hlsl_scope *scope, const char *name) DECLSPEC_HIDDEN; void free_declaration(struct hlsl_ir_var *decl) DECLSPEC_HIDDEN; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 75b5741..97a1d62 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -358,6 +358,7 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha %locations %error-verbose +%expect 1 %union { @@ -373,6 +374,7 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha struct hlsl_ir_function_decl *function; struct parse_parameter parameter; struct parse_variable_def *variable_def; + struct parse_if_body if_body; enum parse_unary_op unary_op; enum parse_assign_op assign_op; } @@ -498,12 +500,14 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha %type <list> statement_list %type <list> compound_statement %type <list> jump_statement +%type <list> selection_statement %type <function> func_declaration %type <function> func_prototype %type <parameter> parameter %type <name> semantic %type <variable_def> variable_def %type <list> variables_def +%type <if_body> if_body %type <instr> primary_expr %type <instr> postfix_expr %type <instr> unary_expr @@ -994,6 +998,7 @@ statement: declaration_statement | expr_statement | compound_statement | jump_statement + | selection_statement /* FIXME: add rule for return with no value */ jump_statement: KW_RETURN expr ';' @@ -1019,6 +1024,41 @@ jump_statement: KW_RETURN expr ';' list_add_tail($$, &jump->node.entry); } +selection_statement: KW_IF '(' expr ')' if_body + { + struct hlsl_ir_if *instr = d3dcompiler_alloc(sizeof(*instr)); + if (!instr) + { + ERR("Out of memory\n"); + return -1; + } + instr->node.type = HLSL_IR_IF; + set_location(&instr->node.loc, &@1); + instr->condition = $3; + instr->then_instrs = $5.then_instrs; + instr->else_instrs = $5.else_instrs; + if ($3->data_type->dimx > 1 || $3->data_type->dimy > 1) + { + hlsl_report_message(instr->node.loc.file, instr->node.loc.line, + instr->node.loc.col, HLSL_LEVEL_ERROR, + "if condition requires a scalar"); + } + $$ = d3dcompiler_alloc(sizeof(*$$)); + list_init($$); + list_add_head($$, &instr->node.entry); + } + +if_body: statement + { + $$.then_instrs = $1; + $$.else_instrs = NULL; + } + | statement KW_ELSE statement + { + $$.then_instrs = $1; + $$.else_instrs = $3; + } + expr_statement: ';' { $$ = d3dcompiler_alloc(sizeof(*$$)); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index e0d351c..05f769c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1742,6 +1742,7 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_DEREF", "HLSL_IR_EXPR", "HLSL_IR_FUNCTION_DECL", + "HLSL_IR_IF", "HLSL_IR_JUMP", "HLSL_IR_SWIZZLE", }; @@ -1753,6 +1754,17 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) static void debug_dump_instr(const struct hlsl_ir_node *instr); +static void debug_dump_instr_list(const struct list *list) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, list, struct hlsl_ir_node, entry) + { + debug_dump_instr(instr); + TRACE("\n"); + } +} + static void debug_dump_ir_var(const struct hlsl_ir_var *var) { if (var->modifiers) @@ -1997,6 +2009,21 @@ static void debug_dump_ir_jump(const struct hlsl_ir_jump *jump) } } +static void debug_dump_ir_if(const struct hlsl_ir_if *if_node) +{ + TRACE("if ("); + debug_dump_instr(if_node->condition); + TRACE(")\n{\n"); + debug_dump_instr_list(if_node->then_instrs); + TRACE("}\n"); + if (if_node->else_instrs) + { + TRACE("else\n{\n"); + debug_dump_instr_list(if_node->else_instrs); + TRACE("}\n"); + } +} + static void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) @@ -2022,22 +2049,14 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_JUMP: debug_dump_ir_jump(jump_from_node(instr)); break; + case HLSL_IR_IF: + debug_dump_ir_if(if_from_node(instr)); + break; default: TRACE("No dump function for %s\n", debug_node_type(instr->type)); } } -static void debug_dump_instr_list(const struct list *list) -{ - struct hlsl_ir_node *instr; - - LIST_FOR_EACH_ENTRY(instr, list, struct hlsl_ir_node, entry) - { - debug_dump_instr(instr); - TRACE("\n"); - } -} - void debug_dump_ir_function(const struct hlsl_ir_function_decl *func) { struct hlsl_ir_var *param; @@ -2159,6 +2178,14 @@ static void free_ir_assignment(struct hlsl_ir_assignment *assignment) d3dcompiler_free(assignment); } +static void free_ir_if(struct hlsl_ir_if *if_node) +{ + free_instr(if_node->condition); + free_instr_list(if_node->then_instrs); + free_instr_list(if_node->else_instrs); + d3dcompiler_free(if_node); +} + static void free_ir_jump(struct hlsl_ir_jump *jump) { if (jump->type == HLSL_IR_JUMP_RETURN) @@ -2191,6 +2218,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_ASSIGNMENT: free_ir_assignment(assignment_from_node(node)); break; + case HLSL_IR_IF: + free_ir_if(if_from_node(node)); + break; case HLSL_IR_JUMP: free_ir_jump(jump_from_node(node)); break;

1 0