June 2012 - Wine-Commits - list.winehq.org

Francois Gouget : d3dx9_36/tests: Make a couple of test functions static.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: bebcce32b0fa5965ee8b95d995836e57fd60edbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebcce32b0fa5965ee8b95d99… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jun 12 10:25:33 2012 +0200 d3dx9_36/tests: Make a couple of test functions static. --- dlls/d3dx9_36/tests/core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 7f9ab44..ec7d40d 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -448,7 +448,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) } else skip("Failed to create a ID3DXFont object\n"); } -void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) +static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device) { int i; HRESULT hr; @@ -885,7 +885,7 @@ static void test_ID3DXRenderToSurface(IDirect3DDevice9 *device) test_ID3DXRenderToSurface_device_state(device); } -void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) +static void test_D3DXCreateRenderToEnvMap(IDirect3DDevice9 *device) { int i; HRESULT hr;

1 0

Jacek Caban : urlmon: Avoid useless InternetQueryOptionW call.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 5c654b4839521dbfa54d676363860323978153da URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c654b4839521dbfa54d67636… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 12 10:35:52 2012 +0200 urlmon: Avoid useless InternetQueryOptionW call. --- dlls/urlmon/http.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index c67d36e..b1ca83a 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -79,18 +79,13 @@ static LPWSTR query_http_info(HttpProtocol *This, DWORD option) return ret; } -static inline BOOL set_security_flag(HttpProtocol *This, DWORD new_flag) +static inline BOOL set_security_flag(HttpProtocol *This, DWORD flags) { - DWORD flags, size = sizeof(flags); BOOL res; - res = InternetQueryOptionW(This->base.request, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); - if(res) { - flags |= new_flag; - res = InternetSetOptionW(This->base.request, INTERNET_OPTION_SECURITY_FLAGS, &flags, size); - } + res = InternetSetOptionW(This->base.request, INTERNET_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); if(!res) - ERR("Failed to set security flag(s): %x\n", new_flag); + ERR("Failed to set security flags: %x\n", flags); return res; }

1 0

Huw Davies : winspool: Set the printer status of old printers to indicate that they should check for driver updates .
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 0ef0ce2938fcdb45dd5ca4a735ae10a9e22c89cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef0ce2938fcdb45dd5ca4a73… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 12 09:42:48 2012 +0100 winspool: Set the printer status of old printers to indicate that they should check for driver updates. --- dlls/winspool.drv/info.c | 61 +++++++++++++++++++++++++--------------------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 022041c..a5ccf49 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -420,6 +420,36 @@ static int multi_sz_lenA(const char *str) return ptr - str + 1; } +/***************************************************************************** + * get_dword_from_reg + * + * Return DWORD associated with name from hkey. + */ +static DWORD get_dword_from_reg( HKEY hkey, const WCHAR *name ) +{ + DWORD sz = sizeof(DWORD), type, value = 0; + LONG ret; + + ret = RegQueryValueExW( hkey, name, 0, &type, (LPBYTE)&value, &sz ); + + if (ret != ERROR_SUCCESS) + { + WARN( "Got ret = %d on name %s\n", ret, debugstr_w(name) ); + return 0; + } + if (type != REG_DWORD) + { + ERR( "Got type %d\n", type ); + return 0; + } + return value; +} + +static inline DWORD set_reg_DWORD( HKEY hkey, const WCHAR *keyname, const DWORD value ) +{ + return RegSetValueExW( hkey, keyname, 0, REG_DWORD, (const BYTE*)&value, sizeof(value) ); +} + static void WINSPOOL_SetDefaultPrinter(const char *devname, const char *name, BOOL force) { char qbuf[200]; @@ -738,12 +768,15 @@ static BOOL CUPS_LoadPrinters(void) TRACE("Printer %d: %s\n", i, debugstr_w(nameW)); if(RegOpenKeyW(hkeyPrinters, nameW, &hkeyPrinter) == ERROR_SUCCESS) { + DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); /* overwrite old LPR:* port */ RegSetValueExW(hkeyPrinter, PortW, 0, REG_SZ, (LPBYTE)port, (lstrlenW(port) + 1) * sizeof(WCHAR)); RegDeleteValueW(hkeyPrinter, May_Delete_Value); + /* flag that the PPD file should be checked for an update */ + set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); RegCloseKey(hkeyPrinter); } else { BOOL added_driver = FALSE; @@ -990,11 +1023,6 @@ PRINTCAP_LoadPrinters(void) { return hadprinter; } -static inline DWORD set_reg_DWORD(HKEY hkey, const WCHAR *keyname, const DWORD value) -{ - return RegSetValueExW(hkey, keyname, 0, REG_DWORD, (const BYTE*)&value, sizeof(value)); -} - static inline DWORD set_reg_szW(HKEY hkey, const WCHAR *keyname, const WCHAR *value) { if (value) @@ -3593,29 +3621,6 @@ BOOL WINAPI ResetPrinterW(HANDLE hPrinter, LPPRINTER_DEFAULTSW pDefault) } /***************************************************************************** - * get_dword_from_reg - * - * Return DWORD associated with name from hkey. - */ -static DWORD get_dword_from_reg( HKEY hkey, const WCHAR *name ) -{ - DWORD sz = sizeof(DWORD), type, value = 0; - LONG ret; - - ret = RegQueryValueExW( hkey, name, 0, &type, (LPBYTE)&value, &sz ); - - if(ret != ERROR_SUCCESS) { - WARN("Got ret = %d on name %s\n", ret, debugstr_w(name)); - return 0; - } - if(type != REG_DWORD) { - ERR("Got type %d\n", type); - return 0; - } - return value; -} - -/***************************************************************************** * get_filename_from_reg [internal] * * Get ValueName from hkey storing result in out

1 0

Huw Davies : winspool: Install the ppd files into the driver directory.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: da0e1ecdd6d1c00b391333dd45a2e50791b7afc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0e1ecdd6d1c00b391333dd4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 12 09:42:47 2012 +0100 winspool: Install the ppd files into the driver directory. --- dlls/winspool.drv/info.c | 259 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 246 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da0e1ecdd6d1c00b39133…

1 0

Alistair Leslie-Hughes : msxml3: Implement IXMLParser Get/Set Flags.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 524a817195dbe147f632f9af533c155c2a731eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=524a817195dbe147f632f9af5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 29 14:30:30 2011 +1000 msxml3: Implement IXMLParser Get/Set Flags. --- .gitignore | 1 + dlls/msxml3/tests/Makefile.in | 2 + dlls/msxml3/tests/xmlparser.c | 23 ++- dlls/msxml3/tests/xmlparser.idl | 381 +++++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/xmlview.c | 3 +- dlls/msxml3/xmlparser.c | 13 +- 6 files changed, 410 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=524a817195dbe147f632f…

1 0

Matteo Bruni : d3dcompiler: Parse vector and matrix declarations.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: de11f800fd9fc7e320ebeb75278e9b61174728fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=de11f800fd9fc7e320ebeb752… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:31 2012 +0200 d3dcompiler: Parse vector and matrix declarations. --- dlls/d3dcompiler_43/hlsl.l | 2 -- dlls/d3dcompiler_43/hlsl.y | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.l b/dlls/d3dcompiler_43/hlsl.l index ef12ab9..84cf573 100644 --- a/dlls/d3dcompiler_43/hlsl.l +++ b/dlls/d3dcompiler_43/hlsl.l @@ -148,8 +148,6 @@ while {return KW_WHILE; } \.\.\. {return OP_ELLIPSIS; } \<= {return OP_LE; } \>= {return OP_GE; } -\< {return OP_LT; } -\> {return OP_GT; } != {return OP_NE; } \+= {return OP_ADDASSIGN; } \-= {return OP_SUBASSIGN; } diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index ae1599f..cc13e25 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -213,8 +213,6 @@ static DWORD add_modifier(DWORD modifiers, DWORD mod) %token OP_ELLIPSIS %token OP_LE %token OP_GE -%token OP_LT -%token OP_GT %token OP_NE %token OP_ADDASSIGN %token OP_SUBASSIGN @@ -302,6 +300,44 @@ type: base_type { $$ = $1; } + | KW_VECTOR '<' base_type ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_message("Line %u: vectors of non-scalar types are not allowed.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + if ($5 < 1 || $5 > 4) + { + hlsl_message("Line %u: vector size must be between 1 and 4.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, $3->base_type, $5, 1); + } + | KW_MATRIX '<' base_type ',' C_INTEGER ',' C_INTEGER '>' + { + if ($3->type != HLSL_CLASS_SCALAR) + { + hlsl_message("Line %u: matrices of non-scalar types are not allowed.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + if ($5 < 1 || $5 > 4 || $7 < 1 || $7 > 4) + { + hlsl_message("Line %u: matrix dimensions must be between 1 and 4.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return 1; + } + + $$ = new_hlsl_type(NULL, HLSL_CLASS_MATRIX, $3->base_type, $5, $7); + } base_type: KW_VOID {

1 0

Matteo Bruni : d3dcompiler: Parse sampler declarations.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 5e343752383c23b8696439993c384a3fb1a15265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e343752383c23b8696439993… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:32 2012 +0200 d3dcompiler: Parse sampler declarations. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 ++++++++++ dlls/d3dcompiler_43/hlsl.y | 25 +++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 10 ++++++++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 5e5f1d3..1c4b776 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -644,6 +644,15 @@ enum hlsl_base_type HLSL_TYPE_VOID, }; +enum hlsl_sampler_dim +{ + HLSL_SAMPLER_DIM_GENERIC, + HLSL_SAMPLER_DIM_1D, + HLSL_SAMPLER_DIM_2D, + HLSL_SAMPLER_DIM_3D, + HLSL_SAMPLER_DIM_CUBE, +}; + enum hlsl_matrix_majority { HLSL_COLUMN_MAJOR, @@ -656,6 +665,7 @@ struct hlsl_type struct list scope_entry; enum hlsl_type_class type; enum hlsl_base_type base_type; + enum hlsl_sampler_dim sampler_dim; const char *name; unsigned int modifiers; unsigned int dimx; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index cc13e25..7384e88 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -343,6 +343,31 @@ base_type: KW_VOID { $$ = new_hlsl_type("void", HLSL_CLASS_SCALAR, HLSL_TYPE_VOID, 1, 1); } + | KW_SAMPLER + { + $$ = new_hlsl_type("sampler", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_GENERIC; + } + | KW_SAMPLER1D + { + $$ = new_hlsl_type("sampler1D", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_1D; + } + | KW_SAMPLER2D + { + $$ = new_hlsl_type("sampler2D", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_2D; + } + | KW_SAMPLER3D + { + $$ = new_hlsl_type("sampler3D", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_3D; + } + | KW_SAMPLERCUBE + { + $$ = new_hlsl_type("samplerCUBE", HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + $$->sampler_dim = HLSL_SAMPLER_DIM_CUBE; + } | TYPE_IDENTIFIER { struct hlsl_type *type; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 304f70c..6f8b013 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -897,6 +897,16 @@ static const char *debug_base_type(const struct hlsl_type *type) case HLSL_TYPE_INT: name = "int"; break; case HLSL_TYPE_UINT: name = "uint"; break; case HLSL_TYPE_BOOL: name = "bool"; break; + case HLSL_TYPE_SAMPLER: + switch (type->sampler_dim) + { + case HLSL_SAMPLER_DIM_GENERIC: name = "sampler"; break; + case HLSL_SAMPLER_DIM_1D: name = "sampler1D"; break; + case HLSL_SAMPLER_DIM_2D: name = "sampler2D"; break; + case HLSL_SAMPLER_DIM_3D: name = "sampler3D"; break; + case HLSL_SAMPLER_DIM_CUBE: name = "samplerCUBE"; break; + } + break; default: FIXME("Unhandled case %u\n", type->base_type); }

1 0

Matteo Bruni : d3dcompiler: Parse function declarations.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: 552f10d0e803ad1a5f4b3f6e01604723b520a849 URL: http://source.winehq.org/git/wine.git/?a=commit;h=552f10d0e803ad1a5f4b3f6e0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:33 2012 +0200 d3dcompiler: Parse function declarations. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 22 ++++++ dlls/d3dcompiler_43/hlsl.y | 104 ++++++++++++++++++++++++++++- dlls/d3dcompiler_43/utils.c | 63 +++++++++++++++++- 3 files changed, 187 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=552f10d0e803ad1a5f4b3…

1 0

Matteo Bruni : d3dcompiler: Parse function definitions.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: d2673848eae67a42ea5f7d253b756edc64554f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2673848eae67a42ea5f7d253… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:34 2012 +0200 d3dcompiler: Parse function definitions. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 1 + dlls/d3dcompiler_43/hlsl.y | 74 +++++++++++++++++- dlls/d3dcompiler_43/utils.c | 124 ++++++++++++++++++++++++++++- 3 files changed, 197 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2673848eae67a42ea5f7…

1 0

Matteo Bruni : d3dcompiler: Parse constructors.
by Alexandre Julliard June 12, 2012

June 12, 2012

Module: wine Branch: master Commit: eeb550c0c39f4c5c3021aff814551b4deb27677b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb550c0c39f4c5c3021aff81… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jun 11 19:18:35 2012 +0200 d3dcompiler: Parse constructors. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 13 +++++++ dlls/d3dcompiler_43/hlsl.y | 48 +++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 54 ++++++++++++++++++++++++++++- 3 files changed, 114 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 695ee7d..d7fcfea 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -694,6 +694,7 @@ enum hlsl_ir_node_type { HLSL_IR_VAR = 0, HLSL_IR_CONSTANT, + HLSL_IR_CONSTRUCTOR, HLSL_IR_DEREF, HLSL_IR_FUNCTION_DECL, }; @@ -788,6 +789,12 @@ struct hlsl_ir_constant } v; }; +struct hlsl_ir_constructor +{ + struct hlsl_ir_node node; + struct list *arguments; +}; + struct hlsl_scope { struct list entry; @@ -847,6 +854,12 @@ static inline struct hlsl_ir_constant *constant_from_node(const struct hlsl_ir_n return CONTAINING_RECORD(node, struct hlsl_ir_constant, node); } +static inline struct hlsl_ir_constructor *constructor_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_CONSTRUCTOR); + return CONTAINING_RECORD(node, struct hlsl_ir_constructor, 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 5151002..a3e5f6e 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -112,6 +112,18 @@ static DWORD add_modifier(DWORD modifiers, DWORD mod) return modifiers | mod; } +static unsigned int components_count_expr_list(struct list *list) +{ + struct hlsl_ir_node *node; + unsigned int count = 0; + + LIST_FOR_EACH_ENTRY(node, list, struct hlsl_ir_node, entry) + { + count += components_count_type(node->data_type); + } + return count; +} + %} %error-verbose @@ -793,6 +805,42 @@ postfix_expr: primary_expr { $$ = $1; } + /* "var_modifiers" doesn't make sense in this case, but it's needed + in the grammar to avoid shift/reduce conflicts. */ + | var_modifiers type '(' initializer_expr_list ')' + { + struct hlsl_ir_constructor *constructor; + + TRACE("%s constructor.\n", debug_hlsl_type($2)); + if ($1) + { + hlsl_message("Line %u: unexpected modifier in a constructor.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return -1; + } + if ($2->type > HLSL_CLASS_LAST_NUMERIC) + { + hlsl_message("Line %u: constructors are allowed only for numeric data types.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return -1; + } + if ($2->dimx * $2->dimy != components_count_expr_list($4)) + { + hlsl_message("Line %u: wrong number of components in constructor.\n", + hlsl_ctx.line_no); + set_parse_status(&hlsl_ctx.status, PARSE_ERR); + return -1; + } + + constructor = d3dcompiler_alloc(sizeof(*constructor)); + constructor->node.type = HLSL_IR_CONSTRUCTOR; + constructor->node.data_type = $2; + constructor->arguments = $4; + + $$ = &constructor->node; + } unary_expr: postfix_expr { diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index d92243d..9c222cd 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -876,6 +876,32 @@ BOOL find_function(const char *name) return FALSE; } +unsigned int components_count_type(struct hlsl_type *type) +{ + unsigned int count = 0; + struct hlsl_struct_field *field; + + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + { + return type->dimx * type->dimy; + } + if (type->type == HLSL_CLASS_ARRAY) + { + return components_count_type(type->e.array.type) * type->e.array.elements_count; + } + if (type->type != HLSL_CLASS_STRUCT) + { + ERR("Unexpected data type %s.\n", debug_hlsl_type(type)); + return 0; + } + + LIST_FOR_EACH_ENTRY(field, type->e.elements, struct hlsl_struct_field, entry) + { + count += components_count_type(field->type); + } + return count; +} + struct hlsl_ir_deref *new_var_deref(struct hlsl_ir_var *var) { struct hlsl_ir_deref *deref = d3dcompiler_alloc(sizeof(*deref)); @@ -1027,6 +1053,7 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) { "HLSL_IR_VAR", "HLSL_IR_CONSTANT", + "HLSL_IR_CONSTRUCTOR", "HLSL_IR_DEREF", "HLSL_IR_FUNCTION_DECL", }; @@ -1112,7 +1139,20 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) TRACE("}"); } -static void debug_dump_instr(const struct hlsl_ir_node *instr) +void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) +{ + struct hlsl_ir_node *arg; + + TRACE("%s (", debug_hlsl_type(constructor->node.data_type)); + LIST_FOR_EACH_ENTRY(arg, constructor->arguments, struct hlsl_ir_node, entry) + { + debug_dump_instr(arg); + TRACE(" "); + } + TRACE(")"); +} + +void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) { @@ -1122,6 +1162,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_CONSTANT: debug_dump_ir_constant(constant_from_node(instr)); break; + case HLSL_IR_CONSTRUCTOR: + debug_dump_ir_constructor(constructor_from_node(instr)); + break; default: TRACE("No dump function for %s\n", debug_node_type(instr->type)); } @@ -1226,6 +1269,12 @@ static void free_ir_deref(struct hlsl_ir_deref *deref) d3dcompiler_free(deref); } +static void free_ir_constructor(struct hlsl_ir_constructor *constructor) +{ + free_instr_list(constructor->arguments); + d3dcompiler_free(constructor); +} + void free_instr(struct hlsl_ir_node *node) { switch (node->type) @@ -1239,6 +1288,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_DEREF: free_ir_deref(deref_from_node(node)); break; + case HLSL_IR_CONSTRUCTOR: + free_ir_constructor(constructor_from_node(node)); + break; default: FIXME("Unsupported node type %s\n", debug_node_type(node->type)); }

1 0