January 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v5 vkd3d 13/13] tests: Add tests for texture gather methods.

by Matteo Bruni

On Wed, Dec 22, 2021 at 12:23 AM Zebediah Figura <zfigura(a)codeweavers.com> wrote: > > From: Francisco Casas <fcasas(a)codeweavers.com> > > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > v5: Split from the previous patch, add require directives to allow the tests to > pass with native d3dcompiler. > > Makefile.am | 3 + > tests/hlsl-gather-offset.shader_test | 101 +++++++++++++++++++++++ > tests/hlsl-gather.shader_test | 115 +++++++++++++++++++++++++++ > tests/shader_runner_d3d12.c | 63 ++++++++++++++- > 4 files changed, 280 insertions(+), 2 deletions(-) > create mode 100644 tests/hlsl-gather-offset.shader_test > create mode 100644 tests/hlsl-gather.shader_test > diff --git a/tests/hlsl-gather.shader_test b/tests/hlsl-gather.shader_test > new file mode 100644 > index 000000000..57af23d02 > --- /dev/null > +++ b/tests/hlsl-gather.shader_test > +[pixel shader] > +SamplerState s; > +Texture2D t; > + > +float4 main() : sv_target > +{ > + return t.GatherGreen(s, float2(0.2, 0.2), int2(0, 0), int2(0, 0), int2(0, 0), int2(0, 0)); > +} > + It might be interesting to add a test with multiple non-zero offsets.

Jan. 26, 2022

Re: [PATCH v5 vkd3d 12/13] vkd3d-shader/hlsl: Implement texture gather methods.

by Matteo Bruni

On Wed, Jan 19, 2022 at 1:06 PM Matteo Bruni <matteo.mystral(a)gmail.com> wrote: > > On Wed, Dec 22, 2021 at 12:23 AM Zebediah Figura > <zfigura(a)codeweavers.com> wrote: > > > > From: Francisco Casas <fcasas(a)codeweavers.com> > > > > Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > > --- > > v5: Strip newlines from hlsl_fixme(), get rid of the as-yet-unused > > status_out_arg variable, expand the srcs[] array to have size 4, use sm4 > > register helpers, minor stylistic tweaks. > > > > libs/vkd3d-shader/hlsl.c | 4 ++ > > libs/vkd3d-shader/hlsl.h | 4 ++ > > libs/vkd3d-shader/hlsl.y | 99 ++++++++++++++++++++++++++++++++++++ > > libs/vkd3d-shader/hlsl_sm4.c | 57 ++++++++++++++++++++- > > 4 files changed, 163 insertions(+), 1 deletion(-) > > > > diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c > > index 26175008d..856fb0f9d 100644 > > --- a/libs/vkd3d-shader/hlsl.c > > +++ b/libs/vkd3d-shader/hlsl.c > > @@ -1280,6 +1280,10 @@ static void dump_ir_resource_load(struct vkd3d_string_buffer *buffer, const stru > > { > > [HLSL_RESOURCE_LOAD] = "load_resource", > > [HLSL_RESOURCE_SAMPLE] = "sample", > > + [HLSL_RESOURCE_GATHER_RED] = "gather_red", > > + [HLSL_RESOURCE_GATHER_GREEN] = "gather_green", > > + [HLSL_RESOURCE_GATHER_BLUE] = "gather_blue", > > + [HLSL_RESOURCE_GATHER_ALPHA] = "gather_alpha", > > }; > > > > vkd3d_string_buffer_printf(buffer, "%s(resource = ", type_names[load->load_type]); > > diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h > > index 2396adb40..49fa8d9d3 100644 > > --- a/libs/vkd3d-shader/hlsl.h > > +++ b/libs/vkd3d-shader/hlsl.h > > @@ -378,6 +378,10 @@ enum hlsl_resource_load_type > > { > > HLSL_RESOURCE_LOAD, > > HLSL_RESOURCE_SAMPLE, > > + HLSL_RESOURCE_GATHER_RED, > > + HLSL_RESOURCE_GATHER_GREEN, > > + HLSL_RESOURCE_GATHER_BLUE, > > + HLSL_RESOURCE_GATHER_ALPHA, > > }; > > > > struct hlsl_ir_resource_load > > diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y > > index 9b1e5c071..460ba44bb 100644 > > --- a/libs/vkd3d-shader/hlsl.y > > +++ b/libs/vkd3d-shader/hlsl.y > > @@ -1930,6 +1930,105 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl > > list_add_tail(instrs, &load->node.entry); > > return true; > > } > > + else if (!strcmp(name, "Gather") || !strcmp(name, "GatherRed") || !strcmp(name, "GatherBlue") > > + || !strcmp(name, "GatherGreen") || !strcmp(name, "GatherAlpha")) > > + { > > + const unsigned int sampler_dim = sampler_dim_count(object_type->sampler_dim); > > + enum hlsl_resource_load_type load_type; > > + const struct hlsl_type *sampler_type; > > + struct hlsl_ir_resource_load *load; > > + struct hlsl_ir_node *offset = NULL; > > + struct hlsl_ir_load *sampler_load; > > + struct hlsl_type *result_type; > > + struct hlsl_ir_node *coords; > > + unsigned int read_channel; > > + > > + if (!strcmp(name, "GatherGreen")) > > + { At some point we probably want to introduce an enum for intrinsics and e.g. table-driven intrinsic_from_{function,method}() helpers to find out which intrinsic a call is supposed to match, if any. Repeatedly string-matching the function name like this is a bit ugly and it's only going to get worse as we introduce more intrinsics. The intrinsics currently in hlsl.y, intrinsic_functions[] sidestep the problem but that's only going to apply to those that can be inlined straight away.

Jan. 26, 2022

[PATCH 10/10] d2d1/tests: Avoid "misleading indentation" warnings.

by Henri Verbeet

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 224405. v2: - If we're touching it... - Use a less ambiguous commit message. dlls/d2d1/tests/d2d1.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 0228ae8d52b..b0aa02ad2a9 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4766,7 +4766,7 @@ static void test_shared_bitmap(BOOL d3d11) bitmap_desc.pixelFormat = bitmap_format_tests[i].original; hr = ID2D1RenderTarget_CreateSharedBitmap(rt2, &IID_IDXGISurface, surface2, &bitmap_desc, &bitmap2); - todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) + todo_wine_if(i == 2 || i == 3 || i == 5 || i == 6) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -5233,8 +5233,7 @@ static void test_draw_text_layout(BOOL d3d11) ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine - ok(hr == D2DERR_WRONG_FACTORY, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == D2DERR_WRONG_FACTORY, "Got unexpected hr %#x.\n", hr); /* Effect is d2d resource, but not a brush. */ set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f); @@ -5500,8 +5499,7 @@ static void test_dc_target(BOOL d3d11) /* Invalid DC. */ hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); -todo_wine - ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); + todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); ID2D1DCRenderTarget_BeginDraw(rt); @@ -5512,8 +5510,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine - ok(clr == RGB(255, 0, 0), "Unexpected color 0x%08x.\n", clr); + todo_wine ok(clr == RGB(255, 0, 0), "Got unexpected colour 0x%08x.\n", clr); hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); ok(hr == E_INVALIDARG, "BindDC() returned %#x.\n", hr); @@ -5527,8 +5524,7 @@ todo_wine ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr); clr = GetPixel(hdc2, 0, 0); -todo_wine - ok(clr == RGB(0, 0, 255), "Unexpected color 0x%08x.\n", clr); + todo_wine ok(clr == RGB(0, 0, 255), "Got unexpected colour 0x%08x.\n", clr); DeleteDC(hdc); DeleteDC(hdc2); @@ -7884,8 +7880,7 @@ static void test_gdi_interop(BOOL d3d11) dc = (void *)0xdeadbeef; hr = ID2D1GdiInteropRenderTarget_GetDC(interop, D2D1_DC_INITIALIZE_MODE_COPY, &dc); ok(FAILED(hr), "GetDC() was expected to fail, hr %#x.\n", hr); -todo_wine - ok(dc == NULL, "Expected NULL dc, got %p.\n", dc); + todo_wine ok(!dc, "Got unexpected DC %p.\n", dc); ID2D1GdiInteropRenderTarget_Release(interop); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); @@ -7942,8 +7937,7 @@ todo_wine ID2D1RenderTarget_BeginDraw(rt); hr = IWICBitmap_Lock(wic_bitmap, NULL, WICBitmapLockRead, &wic_lock); -todo_wine - ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Expected bitmap to be locked, hr %#x.\n", hr); + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) IWICBitmapLock_Release(wic_lock); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); @@ -7954,8 +7948,7 @@ todo_wine ok(SUCCEEDED(hr), "Expected bitmap to be unlocked, hr %#x.\n", hr); ID2D1RenderTarget_BeginDraw(rt); hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); -todo_wine - ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == WINCODEC_ERR_ALREADYLOCKED, "Got unexpected hr %#x.\n", hr); IWICBitmapLock_Release(wic_lock); ID2D1GdiInteropRenderTarget_Release(interop); @@ -8460,7 +8453,7 @@ static void test_bitmap_surface(BOOL d3d11) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; hr = ID2D1DeviceContext_CreateBitmapFromDxgiSurface(device_context, ctx.surface, &bitmap_desc, &bitmap); - todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) + todo_wine_if(bitmap_format_tests[i].hr == WINCODEC_ERR_UNSUPPORTEDPIXELFORMAT) ok(hr == bitmap_format_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(bitmap_format_tests[i].hr)) @@ -8716,8 +8709,7 @@ static void test_device_context(BOOL d3d11) ok(options == (D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW), "Unexpected bitmap options %#x.\n", options); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); -todo_wine - ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + todo_wine ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ID2D1Bitmap1_Release(bitmap); ID2D1DeviceContext_SetTarget(device_context, NULL); @@ -8982,8 +8974,7 @@ static void test_command_list(BOOL d3d11) ok(device_context != NULL, "Failed to create device context.\n"); hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); -todo_wine - ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); if (FAILED(hr)) { -- 2.30.2

Jan. 26, 2022

[PATCH 09/10] wined3d: Use wined3d_bit_scan() in context_update_stream_info().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ed7fa32f74c..6aa5ae4e997 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -266,20 +266,19 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi const struct wined3d_d3d_info *d3d_info = context->d3d_info; DWORD prev_all_vbo = stream_info->all_vbo; unsigned int i; - WORD map; + uint32_t map; wined3d_stream_info_from_declaration(stream_info, state, d3d_info); stream_info->all_vbo = 1; - for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) + map = stream_info->use_map; + while (map) { struct wined3d_stream_info_element *element; struct wined3d_bo_address data; struct wined3d_buffer *buffer; - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); element = &stream_info->elements[i]; buffer = state->streams[element->stream_idx].buffer; -- 2.30.2

Jan. 26, 2022

[PATCH 08/10] wined3d: Use wined3d_bit_scan() in wined3d_device_process_vertices().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71b5aaa5742..b5bf7c86740 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3509,8 +3509,8 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_box box = {0}; struct wined3d_shader *vs; unsigned int i, j; + uint32_t map; HRESULT hr; - WORD map; TRACE("device %p, src_start_idx %u, dst_idx %u, vertex_count %u, " "dst_buffer %p, declaration %p, flags %#x, dst_fvf %#x.\n", @@ -3530,14 +3530,13 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, * VBOs in those buffers and fix up the stream_info structure. * * Also apply the start index. */ - for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) + map = stream_info.use_map; + while (map) { struct wined3d_stream_info_element *e; struct wined3d_map_desc map_desc; - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); e = &stream_info.elements[i]; resource = &state->streams[e->stream_idx].buffer->resource; box.left = src_start_idx * e->stride; @@ -3545,10 +3544,12 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READ))) { ERR("Failed to map resource.\n"); - for (j = 0, map = stream_info.use_map; map && j < i; map >>= 1, ++j) + map = stream_info.use_map; + while (map) { - if (!(map & 1)) - continue; + j = wined3d_bit_scan(&map); + if (j >= i) + break; e = &stream_info.elements[j]; resource = &state->streams[e->stream_idx].buffer->resource; @@ -3564,11 +3565,10 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, hr = process_vertices_strided(device, dst_idx, vertex_count, &stream_info, dst_buffer, flags, dst_fvf); - for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) + map = stream_info.use_map; + while (map) { - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); resource = &state->streams[stream_info.elements[i].stream_idx].buffer->resource; if (FAILED(wined3d_resource_unmap(resource, 0))) ERR("Failed to unmap resource.\n"); -- 2.30.2

Jan. 26, 2022

[PATCH 07/10] wined3d: Use wined3d_bit_scan() in vshader_get_input().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/shader.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 43c6bb402c0..2731639d554 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3578,24 +3578,24 @@ static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_id return FALSE; } -BOOL vshader_get_input(const struct wined3d_shader *shader, - BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) +bool vshader_get_input(const struct wined3d_shader *shader, + uint8_t usage_req, uint8_t usage_idx_req, unsigned int *regnum) { - WORD map = shader->reg_maps.input_registers; + uint32_t map = shader->reg_maps.input_registers & 0xffff; unsigned int i; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; - + i = wined3d_bit_scan(&map); if (match_usage(shader->u.vs.attributes[i].usage, shader->u.vs.attributes[i].usage_idx, usage_req, usage_idx_req)) { *regnum = i; - return TRUE; + return true; } } - return FALSE; + + return false; } static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e45b61c61e..e28fc3b880d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5759,8 +5759,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL vshader_get_input(const struct wined3d_shader *shader, - BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; +bool vshader_get_input(const struct wined3d_shader *shader, + uint8_t usage_req, uint8_t usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct vs_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN; -- 2.30.2

Jan. 26, 2022

[PATCH 06/10] wined3d: Use wined3d_uint32_compare() in glsl_program_key_compare().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6381265def..e33cd5d5fe0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10978,24 +10978,20 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry const struct glsl_program_key *k = key; const struct glsl_shader_prog_link *prog = WINE_RB_ENTRY_VALUE(entry, const struct glsl_shader_prog_link, program_lookup_entry); + int ret; - if (k->vs_id > prog->vs.id) return 1; - else if (k->vs_id < prog->vs.id) return -1; - - if (k->gs_id > prog->gs.id) return 1; - else if (k->gs_id < prog->gs.id) return -1; - - if (k->ps_id > prog->ps.id) return 1; - else if (k->ps_id < prog->ps.id) return -1; - - if (k->hs_id > prog->hs.id) return 1; - else if (k->hs_id < prog->hs.id) return -1; - - if (k->ds_id > prog->ds.id) return 1; - else if (k->ds_id < prog->ds.id) return -1; - - if (k->cs_id > prog->cs.id) return 1; - else if (k->cs_id < prog->cs.id) return -1; + if ((ret = wined3d_uint32_compare(k->vs_id, prog->vs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->gs_id, prog->gs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->ps_id, prog->ps.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->hs_id, prog->hs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->ds_id, prog->ds.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->cs_id, prog->cs.id))) + return ret; return 0; } -- 2.30.2

Jan. 26, 2022

[PATCH 05/10] wined3d: Use wined3d_uint32_compare() in compare_sig().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1abc64ccdd1..820ba0199e8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3855,16 +3855,16 @@ static int compare_sig(const struct wined3d_shader_signature *sig1, const struct if ((ret = strcmp(e1->semantic_name, e2->semantic_name))) return ret; - if (e1->semantic_idx != e2->semantic_idx) - return e1->semantic_idx < e2->semantic_idx ? -1 : 1; - if (e1->sysval_semantic != e2->sysval_semantic) - return e1->sysval_semantic < e2->sysval_semantic ? -1 : 1; - if (e1->component_type != e2->component_type) - return e1->component_type < e2->component_type ? -1 : 1; - if (e1->register_idx != e2->register_idx) - return e1->register_idx < e2->register_idx ? -1 : 1; - if (e1->mask != e2->mask) - return e1->mask < e2->mask ? -1 : 1; + if ((ret = wined3d_uint32_compare(e1->semantic_idx, e2->semantic_idx))) + return ret; + if ((ret = wined3d_uint32_compare(e1->sysval_semantic, e2->sysval_semantic))) + return ret; + if ((ret = wined3d_uint32_compare(e1->component_type, e2->component_type))) + return ret; + if ((ret = wined3d_uint32_compare(e1->register_idx, e2->register_idx))) + return ret; + if ((ret = wined3d_uint32_compare(e1->mask, e2->mask))) + return ret; } return 0; } -- 2.30.2

Jan. 26, 2022

[PATCH 04/10] wined3d: Acquire references to mip-map generation shader resource views for command lists by inspecting CS packets.

by Henri Verbeet

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e272bef14e1..e8eb8f313e3 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3714,6 +3714,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_GENERATE_MIPMAPS: + { + struct wined3d_cs_generate_mipmaps *op; + + op = (struct wined3d_cs_generate_mipmaps *)packet->data; + wined3d_shader_resource_view_decref(op->view); + break; + } + default: break; } @@ -3946,6 +3955,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_GENERATE_MIPMAPS: + { + struct wined3d_cs_generate_mipmaps *op; + + op = (struct wined3d_cs_generate_mipmaps *)packet->data; + wined3d_shader_resource_view_incref(op->view); + break; + } + default: break; } -- 2.30.2

Jan. 26, 2022

[PATCH 03/10] wined3d: Acquire references to unordered-access view counter buffers for command lists by inspecting CS packets.

by Henri Verbeet

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 408f9e97a25..e272bef14e1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3704,6 +3704,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_COPY_UAV_COUNTER: + { + struct wined3d_cs_copy_uav_counter *op; + + op = (struct wined3d_cs_copy_uav_counter *)packet->data; + wined3d_buffer_decref(op->buffer); + wined3d_unordered_access_view_decref(op->view); + break; + } + default: break; } @@ -3926,6 +3936,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_COPY_UAV_COUNTER: + { + struct wined3d_cs_copy_uav_counter *op; + + op = (struct wined3d_cs_copy_uav_counter *)packet->data; + wined3d_buffer_incref(op->buffer); + wined3d_unordered_access_view_incref(op->view); + break; + } + default: break; } -- 2.30.2

Jan. 26, 2022