November 2021 - Wine-Devel - list.winehq.org

[PATCH 1/9] include/wine/mscvpdb.h: update symbol header for linetab2's block size

by Eric Pouech

Fixed tools/winedump and dlls/dbghelp to use that information (instead of trying to guess it, with an erroneous result) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 7 ++++--- include/wine/mscvpdb.h | 4 ++-- tools/winedump/pdb.c | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a1f009cf678..4aaee196370 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2424,6 +2424,7 @@ static void pdb_convert_symbol_file(const PDB_SYMBOLS* symbols, sfile->range.index = sym_file->range.index; sfile->symbol_size = sym_file->symbol_size; sfile->lineno_size = sym_file->lineno_size; + sfile->lineno2_size = sym_file->lineno2_size; *size = sizeof(PDB_SYMBOL_FILE) - 1; } else @@ -2818,14 +2819,14 @@ static BOOL pdb_process_internal(const struct process* pcs, codeview_snarf(msc_dbg, modimage, sizeof(DWORD), sfile.symbol_size, TRUE); + if (sfile.lineno_size && sfile.lineno2_size) FIXME("Both line info present... only supporting first\n"); if (sfile.lineno_size) codeview_snarf_linetab(msc_dbg, modimage + sfile.symbol_size, sfile.lineno_size, pdb_file->kind == PDB_JG); - if (files_image) - codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size + sfile.lineno_size, - pdb_get_file_size(pdb_file, sfile.file) - sfile.symbol_size - sfile.lineno_size, + else if (sfile.lineno2_size && files_image) + codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size, sfile.lineno2_size, files_image + 12, files_size); pdb_free(modimage); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 1ede937abc4..53eeec96916 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2343,7 +2343,7 @@ typedef struct _PDB_SYMBOL_FILE WORD file; DWORD symbol_size; DWORD lineno_size; - DWORD unknown2; + DWORD lineno2_size; DWORD nSrcFiles; DWORD attribute; CHAR filename[1]; @@ -2357,7 +2357,7 @@ typedef struct _PDB_SYMBOL_FILE_EX WORD file; DWORD symbol_size; DWORD lineno_size; - DWORD unknown2; + DWORD lineno2_size; DWORD nSrcFiles; DWORD attribute; DWORD reserved[2]; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 71a2bc49cc8..bbaf1cb94e8 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -466,7 +466,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file = (const char*)symbols + sizeof(PDB_SYMBOLS); while (file - (const char*)symbols < sizeof(PDB_SYMBOLS) + symbols->module_size) { - int file_nr, symbol_size, lineno_size; + int file_nr, symbol_size, lineno_size, lineno2_size; const char* file_name; if (symbols->version < 19970000) @@ -476,6 +476,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file_name = sym_file->filename; symbol_size = sym_file->symbol_size; lineno_size = sym_file->lineno_size; + lineno2_size = sym_file->lineno2_size; printf("\t--------symbol file----------- %s\n", file_name); printf("\tgot symbol_file\n" "\t\tunknown1: %08x\n" @@ -491,7 +492,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tfile: %04x\n" "\t\tsymb size: %08x\n" "\t\tline size: %08x\n" - "\t\tunknown2: %08x\n" + "\t\tline2 size: %08x\n" "\t\tnSrcFiles: %08x\n" "\t\tattribute: %08x\n", sym_file->unknown1, @@ -506,7 +507,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx sym_file->file, sym_file->symbol_size, sym_file->lineno_size, - sym_file->unknown2, + sym_file->lineno2_size, sym_file->nSrcFiles, sym_file->attribute); } @@ -517,6 +518,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file_name = sym_file->filename; symbol_size = sym_file->symbol_size; lineno_size = sym_file->lineno_size; + lineno2_size = sym_file->lineno2_size; printf("\t--------symbol file----------- %s\n", file_name); printf("\t\tunknown1: %08x\n" "\t\trange\n" @@ -533,7 +535,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tfile: %04x\n" "\t\tsymb size: %08x\n" "\t\tline size: %08x\n" - "\t\tunknown2: %08x\n" + "\t\tline2 size: %08x\n" "\t\tnSrcFiles: %08x\n" "\t\tattribute: %08x\n" "\t\treserved/0: %08x\n" @@ -552,7 +554,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx sym_file->file, sym_file->symbol_size, sym_file->lineno_size, - sym_file->unknown2, + sym_file->lineno2_size, sym_file->nSrcFiles, sym_file->attribute, sym_file->reserved[0], @@ -569,15 +571,13 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx /* line number info */ if (lineno_size) codeview_dump_linetab((const char*)modimage + symbol_size, TRUE, " "); - /* anyway, lineno_size doesn't see to really be the size of the line number information, and - * it's not clear yet when to call for linetab2... - */ - codeview_dump_linetab2((const char*)modimage + symbol_size + lineno_size, - total_size - (symbol_size + lineno_size), - filesimage ? filesimage + 12 : NULL, filessize, " "); + else if (lineno2_size) /* actually, only one of the 2 lineno should be present */ + codeview_dump_linetab2((const char*)modimage + symbol_size, lineno2_size, + filesimage ? filesimage + 12 : NULL, filessize, " "); /* what's that part ??? */ if (0) - dump_data(modimage + symbol_size + lineno_size, total_size - (symbol_size + lineno_size), " "); + dump_data(modimage + symbol_size + lineno_size + lineno2_size, + total_size - (symbol_size + lineno_size + lineno2_size), " "); free(modimage); }

Nov. 2, 2021

[PATCH] mshtml: Implement HTMLAnchorElement_get_pathname().

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/mshtml/htmlanchor.c | 31 +++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 22 ++++++++++++++++++++-- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a3608abbeb1..a9c5844d440 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -476,8 +476,35 @@ static HRESULT WINAPI HTMLAnchorElement_put_pathname(IHTMLAnchorElement *iface, static HRESULT WINAPI HTMLAnchorElement_get_pathname(IHTMLAnchorElement *iface, BSTR *p) { HTMLAnchorElement *This = impl_from_IHTMLAnchorElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IUri *uri; + HRESULT hres; + BSTR path; + + TRACE("(%p)->(%p)\n", This, p); + + uri = get_anchor_uri(This); + if(!uri) { + WARN("Could not create IUri\n"); + *p = NULL; + return S_OK; + } + + hres = IUri_GetPath(uri, &path); + IUri_Release(uri); + if(FAILED(hres)) + return hres; + + if(path[0] == '/') { + BSTR str = SysAllocString(path + 1); + SysFreeString(path); + if (!str) + return E_OUTOFMEMORY; + *p = str; + } + else + *p = path; + + return S_OK; } static HRESULT WINAPI HTMLAnchorElement_put_port(IHTMLAnchorElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 03f5c0431ea..2e5fd58cdfb 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1689,6 +1689,22 @@ static void _test_anchor_port(unsigned line, IUnknown *unk, const WCHAR *port) SysFreeString(str); } +#define test_anchor_pathname(a,p) _test_anchor_pathname(__LINE__,a,p) +static void _test_anchor_pathname(unsigned line, IUnknown *unk, const WCHAR *pathname) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_pathname(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_pathname failed: %08x\n", hres); + if(pathname) + ok_(__FILE__,line)(!lstrcmpW(str, pathname), "pathname = %s, expected %s\n", wine_dbgstr_w(str), wine_dbgstr_w(pathname)); + else + ok_(__FILE__,line)(str == NULL, "pathname = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + #define test_anchor_search(a,h,n) _test_anchor_search(__LINE__,a,h,n) static void _test_anchor_search(unsigned line, IUnknown *elem, const WCHAR *search, BOOL allowbroken) { @@ -9220,12 +9236,14 @@ static void test_elems(IHTMLDocument2 *doc) if(elem) { test_anchor_href((IUnknown*)elem, L"http://test/"); test_anchor_port((IUnknown*)elem, L"80"); + test_anchor_pathname((IUnknown*)elem, L""); /* Change the href */ - test_anchor_put_href((IUnknown*)elem, L"http://test1:8080/"); - test_anchor_href((IUnknown*)elem, L"http://test1:8080/"); + test_anchor_put_href((IUnknown*)elem, L"http://test1:8080/path"); + test_anchor_href((IUnknown*)elem, L"http://test1:8080/path"); test_anchor_hostname((IUnknown*)elem, L"test1"); test_anchor_port((IUnknown*)elem, L"8080"); + test_anchor_pathname((IUnknown*)elem, L"path"); /* Restore the href */ test_anchor_put_href((IUnknown*)elem, L"http://test/"); -- 2.30.2

Nov. 2, 2021

Re: [PATCH vkd3d 4/5] vkd3d-shader/hlsl: Lex the SamplerState keyword.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> On 02/11/21 01:43, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.l | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l > index 762a8a026..caf8fe8f9 100644 > --- a/libs/vkd3d-shader/hlsl.l > +++ b/libs/vkd3d-shader/hlsl.l > @@ -109,6 +109,7 @@ sampler3D {return KW_SAMPLER3D; } > samplerCUBE {return KW_SAMPLERCUBE; } > sampler_state {return KW_SAMPLER_STATE; } > SamplerComparisonState {return KW_SAMPLERCOMPARISONSTATE;} > +SamplerState {return KW_SAMPLER; } > shared {return KW_SHARED; } > stateblock {return KW_STATEBLOCK; } > stateblock_state {return KW_STATEBLOCK_STATE; } >

Nov. 2, 2021

Re: [PATCH vkd3d 2/5] vkd3d-shader/hlsl: Write SM4 image load instructions.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> On 02/11/21 01:43, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl_sm4.c | 95 +++++++++++++++++++++++++++++++++--- > 1 file changed, 88 insertions(+), 7 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c > index f8eb0a1ef..5ab7df5f9 100644 > --- a/libs/vkd3d-shader/hlsl_sm4.c > +++ b/libs/vkd3d-shader/hlsl_sm4.c > @@ -763,6 +763,7 @@ static unsigned int sm4_swizzle_type(enum vkd3d_sm4_register_type type) > > case VKD3D_SM4_RT_CONSTBUFFER: > case VKD3D_SM4_RT_INPUT: > + case VKD3D_SM4_RT_RESOURCE: > case VKD3D_SM4_RT_TEMP: > return VKD3D_SM4_SWIZZLE_VEC4; > > @@ -779,14 +780,26 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r > > if (var->is_uniform) > { > - unsigned int offset = hlsl_offset_from_deref(deref) + var->buffer_offset; > + if (data_type->type == HLSL_CLASS_OBJECT && data_type->base_type == HLSL_TYPE_TEXTURE) > + { > + reg->type = VKD3D_SM4_RT_RESOURCE; > + reg->dim = VKD3D_SM4_DIMENSION_VEC4; > + reg->idx[0] = var->reg.id; > + reg->idx_count = 1; > + *writemask = VKD3DSP_WRITEMASK_ALL; > + } > + else > + { > + unsigned int offset = hlsl_offset_from_deref(deref) + var->buffer_offset; > > - reg->type = VKD3D_SM4_RT_CONSTBUFFER; > - reg->dim = VKD3D_SM4_DIMENSION_VEC4; > - reg->idx[0] = var->buffer->reg.id; > - reg->idx[1] = offset / 4; > - reg->idx_count = 2; > - *writemask = ((1u << data_type->dimx) - 1) << (offset & 3); > + assert(data_type->type <= HLSL_CLASS_VECTOR); > + reg->type = VKD3D_SM4_RT_CONSTBUFFER; > + reg->dim = VKD3D_SM4_DIMENSION_VEC4; > + reg->idx[0] = var->buffer->reg.id; > + reg->idx[1] = offset / 4; > + reg->idx_count = 2; > + *writemask = ((1u << data_type->dimx) - 1) << (offset & 3); > + } > } > else if (var->is_input_semantic) > { > @@ -1154,6 +1167,50 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, > write_sm4_instruction(buffer, &instr); > } > > +static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, > + const struct hlsl_type *resource_type, const struct hlsl_ir_node *dst, > + const struct hlsl_deref *resource, const struct hlsl_ir_node *coords) > +{ > + struct sm4_instruction instr; > + unsigned int writemask; > + > + memset(&instr, 0, sizeof(instr)); > + instr.opcode = VKD3D_SM4_OP_LD; > + > + sm4_register_from_node(&instr.dsts[0].reg, &instr.dsts[0].writemask, dst); > + instr.dst_count = 1; > + > + sm4_register_from_node(&instr.srcs[0].reg, &writemask, coords); > + instr.srcs[0].swizzle = hlsl_swizzle_from_writemask(writemask); > + > + /* Mipmap level is in the last component in the IR, but needs to be in the W > + * component in the instruction. */ > + switch (resource_type->sampler_dim) > + { > + case HLSL_SAMPLER_DIM_1D: > + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); > + break; > + > + case HLSL_SAMPLER_DIM_2D: > + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); > + break; > + > + case HLSL_SAMPLER_DIM_3D: > + case HLSL_SAMPLER_DIM_CUBE: > + break; > + > + case HLSL_SAMPLER_DIM_GENERIC: > + assert(0); > + } > + > + sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, resource, resource_type); > + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dsts[0].writemask); > + > + instr.src_count = 2; > + > + write_sm4_instruction(buffer, &instr); > +} > + > static void write_sm4_expr(struct hlsl_ctx *ctx, > struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) > { > @@ -1375,6 +1432,26 @@ static void write_sm4_load(struct hlsl_ctx *ctx, > write_sm4_instruction(buffer, &instr); > } > > +static void write_sm4_resource_load(struct hlsl_ctx *ctx, > + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_resource_load *load) > +{ > + const struct hlsl_type *resource_type = load->resource.var->data_type; > + const struct hlsl_ir_node *coords = load->coords.node; > + > + if (!load->resource.var->is_uniform) > + { > + hlsl_fixme(ctx, load->node.loc, "Load from non-uniform resource variable."); > + return; > + } > + > + switch (load->load_type) > + { > + case HLSL_RESOURCE_LOAD: > + write_sm4_ld(ctx, buffer, resource_type, &load->node, &load->resource, coords); > + break; > + } > +} > + > static void write_sm4_store(struct hlsl_ctx *ctx, > struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_store *store) > { > @@ -1504,6 +1581,10 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, > write_sm4_load(ctx, &buffer, hlsl_ir_load(instr)); > break; > > + case HLSL_IR_RESOURCE_LOAD: > + write_sm4_resource_load(ctx, &buffer, hlsl_ir_resource_load(instr)); > + break; > + > case HLSL_IR_STORE: > write_sm4_store(ctx, &buffer, hlsl_ir_store(instr)); > break; >

Nov. 2, 2021

Re: [PATCH vkd3d 1/5] vkd3d-shader/hlsl: Define a symbolic constant to represent the D3D_SIF_TEXTURE_COMPONENTS shift.

by Giovanni Mascellani

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> On 02/11/21 01:43, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl_sm4.c | 2 +- > libs/vkd3d-shader/sm4.h | 3 +++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c > index 9d45e1633..f8eb0a1ef 100644 > --- a/libs/vkd3d-shader/hlsl_sm4.c > +++ b/libs/vkd3d-shader/hlsl_sm4.c > @@ -561,7 +561,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) > put_u32(&buffer, sm4_resource_format(var->data_type)); > put_u32(&buffer, sm4_rdef_resource_dimension(var->data_type)); > put_u32(&buffer, ~0u); /* FIXME: multisample count */ > - flags |= (var->data_type->e.resource_format->dimx - 1) << 2; > + flags |= (var->data_type->e.resource_format->dimx - 1) << VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT; > } > put_u32(&buffer, var->reg.id); > put_u32(&buffer, 1); /* bind count */ > diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h > index ddcb9a861..17a08ee27 100644 > --- a/libs/vkd3d-shader/sm4.h > +++ b/libs/vkd3d-shader/sm4.h > @@ -526,4 +526,7 @@ enum vkd3d_sm4_shader_data_type > VKD3D_SM4_SHADER_DATA_MESSAGE = 0x4, > }; > > +/* The shift that corresponds to the D3D_SIF_TEXTURE_COMPONENTS mask. */ > +#define VKD3D_SM4_SIF_TEXTURE_COMPONENTS_SHIFT 2 > + > #endif /* __VKD3D_SM4_H */ >

Nov. 2, 2021

Re: [PATCH vkd3d 5/5] vkd3d-shader/hlsl: Parse the Sample() method.

by Giovanni Mascellani

Hi, On 02/11/21 01:43, Zebediah Figura wrote: > + if (!(coords = add_implicit_conversion(ctx, instrs, params->args[1], > + ctx->builtin_types.vector[HLSL_TYPE_FLOAT][sampler_dim - 1], loc))) > + coords = params->args[1]; I would suggest to use the hlsl_get_vector_type helper. Thanks, Giovanni.

Nov. 2, 2021

Re: [PATCH] d2d1: Explicitly set default blend state.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=101166 Your paranoid android. === debiant2 (32 bit report) === Report validation errors: d2d1:d2d1 is missing some skip messages

Nov. 2, 2021

[PATCH] d2d1: Explicitly set default blend state.

by Jan Sikorski

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d2d1/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index c6ef2e28690..2069eeda0fc 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -175,6 +175,10 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D11DeviceContext1_OMSetBlendState(context, render_target->bs, NULL, D3D11_DEFAULT_SAMPLE_MASK); d2d_brush_bind_resources(brush, render_target, 0); } + else + { + ID3D11DeviceContext1_OMSetBlendState(context, NULL, NULL, D3D11_DEFAULT_SAMPLE_MASK); + } if (opacity_brush) d2d_brush_bind_resources(opacity_brush, render_target, 1); -- 2.32.0

Nov. 2, 2021

Re: [PATCH vkd3d 3/5] tests: Add a shader test for texture sampling.

by Giovanni Mascellani

Hi, On 02/11/21 01:43, Zebediah Figura wrote: > +static D3D12_TEXTURE_ADDRESS_MODE parse_sampler_address_mode(const char *line, const char **rest) > +{ > + if (match_string(line, "border", rest)) > + return D3D12_TEXTURE_ADDRESS_MODE_BORDER; > + if (match_string(line, "clamp", rest)) > + return D3D12_TEXTURE_ADDRESS_MODE_CLAMP; > + if (match_string(line, "mirror once", rest)) > + return D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE; > + if (match_string(line, "mirror", rest)) > + return D3D12_TEXTURE_ADDRESS_MODE_MIRROR; > + if (match_string(line, "wrap", rest)) > + return D3D12_TEXTURE_ADDRESS_MODE_WRAP; > + fprintf(stderr, "Malformed address mode '%s'.\n", line); > + return D3D12_TEXTURE_ADDRESS_MODE_WRAP; > +} I don't like very much the "mirror once" thing: the structure of the file hints that spaces are used for token separation, and here we would be using two tokens for an option that seems to be completely similar to the other options using just one token. Also, the hypothetical line "mirror_once mirror mirror_once" would be easier to mentally scan than "mirror once mirror mirror once". Can we change to "mirror_once"? Also, the validation fundamentalist that is in me would happily swap the last return statement with a call to abort(), but I guess I can silence him for a test program. > +static void parse_sampler_directive(struct sampler *sampler, const char *line) > +{ > + const char *const orig_line = line; > + > + if (match_string(line, "address", &line)) > + { > + sampler->u_address = parse_sampler_address_mode(line, &line); > + sampler->v_address = parse_sampler_address_mode(line, &line); > + sampler->w_address = parse_sampler_address_mode(line, &line); > + } > + else if (match_string(line, "filter", &line)) > + { > + static const struct > + { > + const char *string; > + D3D12_FILTER filter; > + } > + filters[] = > + { > + {"point point point", D3D12_FILTER_MIN_MAG_MIP_POINT}, > + {"point point linear", D3D12_FILTER_MIN_MAG_POINT_MIP_LINEAR}, > + {"point linear point", D3D12_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT}, > + {"point linear linear", D3D12_FILTER_MIN_POINT_MAG_MIP_LINEAR}, > + {"linear point point", D3D12_FILTER_MIN_LINEAR_MAG_MIP_POINT}, > + {"linear point linear", D3D12_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR}, > + {"linear linear point", D3D12_FILTER_MIN_MAG_LINEAR_MIP_POINT}, > + {"linear linear linear", D3D12_FILTER_MIN_MAG_MIP_LINEAR}, > + }; > + unsigned int i; > + > + for (i = 0; i < ARRAY_SIZE(filters); ++i) > + { > + if (match_string(line, filters[i].string, &line)) > + sampler->filter = filters[i].filter; > + } > + } > + else > + { > + goto err; > + } > + > + return; > + > +err: > + fprintf(stderr, "Ignoring malformed line '%s'.\n", orig_line); > +} I don't find the goto statement very useful: you could just print the error in the "else" branch. Unless you have plans to extend the function in ways I don't see now, I think this is just complicating the control flow. > @@ -305,21 +383,40 @@ static void parse_test_directive(struct shader_context *context, const char *lin > range->RegisterSpace = 0; > range->OffsetInDescriptorsFromTableStart = 0; > > - texture->heap = create_gpu_descriptor_heap(context->c.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); > - texture->resource = create_default_texture(context->c.device, texture->width, texture->height, > - texture->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); > - resource_data.pData = texture->data; > - resource_data.SlicePitch = resource_data.RowPitch = texture->width * texture->texel_size; > - upload_texture_data(texture->resource, &resource_data, 1, context->c.queue, command_list); > - reset_command_list(command_list, context->c.allocator); > - transition_resource_state(command_list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, > - D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); > - ID3D12Device_CreateShaderResourceView(context->c.device, texture->resource, > - NULL, get_cpu_descriptor_handle(&context->c, texture->heap, 0)); > + if (!texture->resource) > + { > + texture->heap = create_gpu_descriptor_heap(context->c.device, > + D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); > + texture->resource = create_default_texture(context->c.device, texture->width, texture->height, > + texture->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); > + resource_data.pData = texture->data; > + resource_data.SlicePitch = resource_data.RowPitch = texture->width * texture->texel_size; > + upload_texture_data(texture->resource, &resource_data, 1, context->c.queue, command_list); > + reset_command_list(command_list, context->c.allocator); > + transition_resource_state(command_list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, > + D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); > + ID3D12Device_CreateShaderResourceView(context->c.device, texture->resource, > + NULL, get_cpu_descriptor_handle(&context->c, texture->heap, 0)); > + } Is this hunk related to the patch? AFAIU, it just prevents recreating the texture resource if it's already there, which is a good thing, but probably worthy of another patch. > @@ -650,11 +765,36 @@ START_TEST(shader_runner_d3d12) > if (!strcmp(line, "[pixel shader]\n")) > { > state = STATE_SHADER_PIXEL; > + > + if (context.ps_code) > + ID3D10Blob_Release(context.ps_code); > + context.ps_code = NULL; > } This hunk too seems unrelated to this patch. Thanks, Giovanni.

Nov. 2, 2021

Re: [v2 PATCH] d3d11: Correctly handle optional arguments in OMGetBlendState().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Nov. 2, 2021