- Wine-Devel - list.winehq.org

[PATCH 1/6] wined3d: Reference vertex buffer objects only after calling context_update_stream_info().
by Zebediah Figura Nov. 9, 2021

Nov. 9, 2021

It may load buffers into a different location. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/context_gl.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index d2dd9e0bd09..09c871efcd4 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3963,12 +3963,23 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, device_invalidate_state(device, STATE_STREAMSRC); else wined3d_buffer_load(&buffer_gl->b, context, state); - wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); } /* Loading the buffers above may have invalidated the stream info. */ if (wined3d_context_is_graphics_state_dirty(context, STATE_STREAMSRC)) context_update_stream_info(context, state); + map = context->stream_info.use_map; + while (map) + { + const struct wined3d_stream_info_element *e; + struct wined3d_buffer_gl *buffer_gl; + + e = &context->stream_info.elements[wined3d_bit_scan(&map)]; + buffer_gl = wined3d_buffer_gl(state->streams[e->stream_idx].buffer); + + wined3d_context_gl_reference_bo(context_gl, &buffer_gl->bo); + } + if (indexed && state->index_buffer) { struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(state->index_buffer); -- 2.33.0

3 11

[PATCH] wined3d: Parse ISG1, PSG1 and OSG1 signatures.
by Zebediah Figura Nov. 9, 2021

Nov. 9, 2021

These signatures extend the OSG5 format by a minimum precision hint, which gets ignored for now but could be implemented using 16-bit floats in the future. Fixes some shader parsing errors in Resident Evil 2. Based on a vkd3d patch by Philip Rebohle. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/shader_sm4.c | 21 ++++++++++++++++++--- include/wine/wined3d.h | 1 + 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4635910269f..005be96a51f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1820,10 +1820,13 @@ const struct wined3d_shader_frontend sm4_shader_frontend = #define TAG_AON9 WINEMAKEFOURCC('A', 'o', 'n', '9') #define TAG_DXBC WINEMAKEFOURCC('D', 'X', 'B', 'C') +#define TAG_ISG1 WINEMAKEFOURCC('I', 'S', 'G', '1') #define TAG_ISGN WINEMAKEFOURCC('I', 'S', 'G', 'N') +#define TAG_OSG1 WINEMAKEFOURCC('O', 'S', 'G', '1') #define TAG_OSG5 WINEMAKEFOURCC('O', 'S', 'G', '5') #define TAG_OSGN WINEMAKEFOURCC('O', 'S', 'G', 'N') #define TAG_PCSG WINEMAKEFOURCC('P', 'C', 'S', 'G') +#define TAG_PSG1 WINEMAKEFOURCC('P', 'S', 'G', '1') #define TAG_SHDR WINEMAKEFOURCC('S', 'H', 'D', 'R') #define TAG_SHEX WINEMAKEFOURCC('S', 'H', 'E', 'X') @@ -1955,6 +1958,7 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si struct wined3d_shader_signature *s) { struct wined3d_shader_signature_element *e; + bool has_stream_index, has_min_precision; const char *ptr = data; unsigned int i; DWORD count; @@ -1982,11 +1986,14 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si return E_OUTOFMEMORY; } + has_min_precision = tag == TAG_OSG1 || tag == TAG_PSG1 || tag == TAG_ISG1; + has_stream_index = tag == TAG_OSG5 || has_min_precision; + for (i = 0; i < count; ++i) { DWORD name_offset; - if (tag == TAG_OSG5) + if (has_stream_index) read_dword(&ptr, &e[i].stream_idx); else e[i].stream_idx = 0; @@ -2003,10 +2010,15 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_si read_dword(&ptr, &e[i].register_idx); read_dword(&ptr, &e[i].mask); + if (has_min_precision) + read_dword(&ptr, &e[i].min_precision); + else + e[i].min_precision = 0; + TRACE("Stream: %u, semantic: %s, semantic idx: %u, sysval_semantic %#x, " - "type %u, register idx: %u, use_mask %#x, input_mask %#x.\n", + "type %u, register idx: %u, use_mask %#x, input_mask %#x, min_precision %u.\n", e[i].stream_idx, debugstr_a(e[i].semantic_name), e[i].semantic_idx, e[i].sysval_semantic, - e[i].component_type, e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff); + e[i].component_type, e[i].register_idx, (e[i].mask >> 8) & 0xff, e[i].mask & 0xff, e[i].min_precision); } s->elements = e; @@ -2024,6 +2036,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWOR switch (tag) { case TAG_ISGN: + case TAG_ISG1: if (ctx->max_version < 4) { TRACE("Skipping shader input signature.\n"); @@ -2039,6 +2052,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWOR break; case TAG_OSGN: + case TAG_OSG1: case TAG_OSG5: if (ctx->max_version < 4) { @@ -2055,6 +2069,7 @@ static HRESULT shader_dxbc_chunk_handler(const char *data, DWORD data_size, DWOR break; case TAG_PCSG: + case TAG_PSG1: if (shader->patch_constant_signature.elements) { FIXME("Multiple patch constant signatures.\n"); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7a6588ea4f4..1fdbd105cc4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2107,6 +2107,7 @@ struct wined3d_shader_signature_element enum wined3d_component_type component_type; unsigned int register_idx; DWORD mask; + unsigned int min_precision; }; struct wined3d_shader_signature -- 2.33.0

2 1

[PATCH 1/4] d3d8/tests: Port the filling convention test to d3d8.
by Stefan Dösinger Nov. 9, 2021

Nov. 9, 2021

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 483 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 483 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index df4dd0029a6..29baf07398c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11292,6 +11292,488 @@ static void test_dynamic_map_synchronization(void) DestroyWindow(window); } +static void test_filling_convention(void) +{ + static const DWORD colour_bottom = 0x00ffff00; + static const DWORD colour_clear = 0x000000ff; + static const DWORD colour_right = 0x00000000; + static const DWORD colour_left = 0x00ff0000; + static const DWORD colour_top = 0x0000ff00; + IDirect3DSurface8 *rt, *backbuffer, *cur; + struct surface_readback rb; + IDirect3DDevice8 *device; + unsigned int i, j, x, y; + DWORD colour, expected; + DWORD shader = 0; + IDirect3D8 *d3d; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + BOOL todo; + + static const unsigned int vp_size = 8; + const D3DVIEWPORT8 vp = { 0, 0, vp_size, vp_size, 0.0, 1.0 }; + static const DWORD vs_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40005, /* mov oD0, v5 */ + 0x0000ffff /* end */ + }; + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_REG(D3DVSDE_DIFFUSE, D3DVSDT_D3DCOLOR), + D3DVSD_END() + }; + + /* This test data follows the examples in MSDN's + * "Rasterization Rules (Direct3D 9)" article. */ + static const float eps = 1.0f / 512.0f; + const struct + { + struct vec3 position; + DWORD diffuse; + } + center_tris[] = + { + /* left */ + {{-2.5f / 4.0f, -1.5f / 4.0f, 0.0f}, colour_left}, + {{-2.5f / 4.0f, 2.5f / 4.0f, 0.0f}, colour_left}, + {{-1.5f / 4.0f, 0.5f / 4.0f, 0.0f}, colour_left}, + + /* top */ + {{-1.5f / 4.0f, 0.5f / 4.0f, 0.0f}, colour_top}, + {{-2.5f / 4.0f, 2.5f / 4.0f, 0.0f}, colour_top}, + {{-0.5f / 4.0f, 2.5f / 4.0f, 0.0f}, colour_top}, + + /* right */ + {{-0.5f / 4.0f, -1.5f / 4.0f, 0.0f}, colour_right}, + {{-1.5f / 4.0f, 0.5f / 4.0f, 0.0f}, colour_right}, + {{-0.5f / 4.0f, 2.5f / 4.0f, 0.0f}, colour_right}, + + /* bottom */ + {{-2.5f / 4.0f, -1.5f / 4.0f, 0.0f}, colour_bottom}, + {{-1.5f / 4.0f, 0.5f / 4.0f, 0.0f}, colour_bottom}, + {{-0.5f / 4.0f, -1.5f / 4.0f, 0.0f}, colour_bottom}, + + }, + edge_tris[] = + { + /* left */ + {{-2.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_left}, + {{-2.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_left}, + {{-1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_left}, + + /* top */ + {{-1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_top}, + {{-2.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_top}, + {{ 0.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_top}, + + /* right */ + {{ 0.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_right}, + {{-1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_right}, + {{ 0.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_right}, + + /* bottom */ + {{-2.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_bottom}, + {{-1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_bottom}, + {{ 0.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_bottom}, + }, + nudge_right_tris[] = + { + /* left */ + {{eps - 2.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_left}, + {{eps - 2.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_left}, + {{eps - 1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_left}, + + /* top */ + {{eps - 1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_top}, + {{eps - 2.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_top}, + {{eps - 0.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_top}, + + /* right */ + {{eps - 0.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_right}, + {{eps - 1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_right}, + {{eps - 0.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_right}, + + /* bottom */ + {{eps - 2.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_bottom}, + {{eps - 1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_bottom}, + {{eps - 0.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_bottom}, + }, + nudge_left_tris[] = + { + {{-eps - 2.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_left}, + {{-eps - 2.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_left}, + {{-eps - 1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_left}, + + /* top */ + {{-eps - 1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_top}, + {{-eps - 2.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_top}, + {{-eps - 0.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_top}, + + /* right */ + {{-eps - 0.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_right}, + {{-eps - 1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_right}, + {{-eps - 0.0f / 4.0f, 3.0f / 4.0f, 0.0f}, colour_right}, + + /* bottom */ + {{-eps - 2.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_bottom}, + {{-eps - 1.0f / 4.0f, 1.0f / 4.0f, 0.0f}, colour_bottom}, + {{-eps - 0.0f / 4.0f, -1.0f / 4.0f, 0.0f}, colour_bottom}, + }, + nudge_top_tris[] = + { + /* left */ + {{-2.0f / 4.0f, eps - 1.0f / 4.0f, 0.0f}, colour_left}, + {{-2.0f / 4.0f, eps + 3.0f / 4.0f, 0.0f}, colour_left}, + {{-1.0f / 4.0f, eps + 1.0f / 4.0f, 0.0f}, colour_left}, + + /* top */ + {{-1.0f / 4.0f, eps + 1.0f / 4.0f, 0.0f}, colour_top}, + {{-2.0f / 4.0f, eps + 3.0f / 4.0f, 0.0f}, colour_top}, + {{ 0.0f / 4.0f, eps + 3.0f / 4.0f, 0.0f}, colour_top}, + + /* right */ + {{ 0.0f / 4.0f, eps - 1.0f / 4.0f, 0.0f}, colour_right}, + {{-1.0f / 4.0f, eps + 1.0f / 4.0f, 0.0f}, colour_right}, + {{ 0.0f / 4.0f, eps + 3.0f / 4.0f, 0.0f}, colour_right}, + + /* bottom */ + {{-2.0f / 4.0f, eps - 1.0f / 4.0f, 0.0f}, colour_bottom}, + {{-1.0f / 4.0f, eps + 1.0f / 4.0f, 0.0f}, colour_bottom}, + {{ 0.0f / 4.0f, eps - 1.0f / 4.0f, 0.0f}, colour_bottom}, + }, + nudge_bottom_tris[] = + { + /* left */ + {{-2.0f / 4.0f, -eps - 1.0f / 4.0f, 0.0f}, colour_left}, + {{-2.0f / 4.0f, -eps + 3.0f / 4.0f, 0.0f}, colour_left}, + {{-1.0f / 4.0f, -eps + 1.0f / 4.0f, 0.0f}, colour_left}, + + /* top */ + {{-1.0f / 4.0f, -eps + 1.0f / 4.0f, 0.0f}, colour_top}, + {{-2.0f / 4.0f, -eps + 3.0f / 4.0f, 0.0f}, colour_top}, + {{ 0.0f / 4.0f, -eps + 3.0f / 4.0f, 0.0f}, colour_top}, + + /* right */ + {{ 0.0f / 4.0f, -eps - 1.0f / 4.0f, 0.0f}, colour_right}, + {{-1.0f / 4.0f, -eps + 1.0f / 4.0f, 0.0f}, colour_right}, + {{ 0.0f / 4.0f, -eps + 3.0f / 4.0f, 0.0f}, colour_right}, + + /* bottom */ + {{-2.0f / 4.0f, -eps - 1.0f / 4.0f, 0.0f}, colour_bottom}, + {{-1.0f / 4.0f, -eps + 1.0f / 4.0f, 0.0f}, colour_bottom}, + {{ 0.0f / 4.0f, -eps - 1.0f / 4.0f, 0.0f}, colour_bottom}, + }; + + const struct + { + struct vec4 position; + DWORD diffuse; + } + center_tris_t[] = + { + /* left */ + {{ 1.5f, 1.5f, 0.0f, 1.0f}, colour_left}, + {{ 2.5f, 3.5f, 0.0f, 1.0f}, colour_left}, + {{ 1.5f, 5.5f, 0.0f, 1.0f}, colour_left}, + + /* top */ + {{ 1.5f, 1.5f, 0.0f, 1.0f}, colour_top}, + {{ 3.5f, 1.5f, 0.0f, 1.0f}, colour_top}, + {{ 2.5f, 3.5f, 0.0f, 1.0f}, colour_top}, + + /* right */ + {{ 3.5f, 1.5f, 0.0f, 1.0f}, colour_right}, + {{ 3.5f, 5.5f, 0.0f, 1.0f}, colour_right}, + {{ 2.5f, 3.5f, 0.0f, 1.0f}, colour_right}, + + /* bottom */ + {{ 2.5f, 3.5f, 0.0f, 1.0f}, colour_bottom}, + {{ 3.5f, 5.5f, 0.0f, 1.0f}, colour_bottom}, + {{ 1.5f, 5.5f, 0.0f, 1.0f}, colour_bottom}, + }, + edge_tris_t[] = + { + /* left */ + {{ 2.0f, 1.0f, 0.0f, 1.0f}, colour_left}, + {{ 3.0f, 3.0f, 0.0f, 1.0f}, colour_left}, + {{ 2.0f, 5.0f, 0.0f, 1.0f}, colour_left}, + + /* top */ + {{ 2.0f, 1.0f, 0.0f, 1.0f}, colour_top}, + {{ 4.0f, 1.0f, 0.0f, 1.0f}, colour_top}, + {{ 3.0f, 3.0f, 0.0f, 1.0f}, colour_top}, + + /* right */ + {{ 4.0f, 1.0f, 0.0f, 1.0f}, colour_right}, + {{ 4.0f, 5.0f, 0.0f, 1.0f}, colour_right}, + {{ 3.0f, 3.0f, 0.0f, 1.0f}, colour_right}, + + /* bottom */ + {{ 3.0f, 3.0f, 0.0f, 1.0f}, colour_bottom}, + {{ 4.0f, 5.0f, 0.0f, 1.0f}, colour_bottom}, + {{ 2.0f, 5.0f, 0.0f, 1.0f}, colour_bottom}, + }; + + const struct + { + const void *geometry; + size_t stride; + DWORD fvf; + const char *expected[8]; + } + tests[] = + { + { + center_tris, + sizeof(center_tris[0]), + D3DFVF_XYZ | D3DFVF_DIFFUSE, + { + " ", + " ", + " TT ", + " LR ", + " LR ", + " BB ", + " ", + " " + } + }, + { + edge_tris, + sizeof(edge_tris[0]), + D3DFVF_XYZ | D3DFVF_DIFFUSE, + { + " ", + " TT ", + " LT ", + " LR ", + " LB ", + " ", + " ", + " " + } + }, + { + nudge_right_tris, + sizeof(nudge_right_tris[0]), + D3DFVF_XYZ | D3DFVF_DIFFUSE, + { + " ", + " TT ", + " TR ", + " LR ", + " BR ", + " ", + " ", + " " + } + }, + { + nudge_left_tris, + sizeof(nudge_left_tris[0]), + D3DFVF_XYZ | D3DFVF_DIFFUSE, + { + " ", + " TT ", + " LT ", + " LR ", + " LB ", + " ", + " ", + " " + } + }, + { + nudge_top_tris, + sizeof(nudge_top_tris[0]), + D3DFVF_XYZ | D3DFVF_DIFFUSE, + { + " ", + " LT ", + " LT ", + " LB ", + " LB ", + " ", + " ", + " " + } + }, + { + nudge_bottom_tris, + sizeof(nudge_bottom_tris[0]), + D3DFVF_XYZ | D3DFVF_DIFFUSE, + { + " ", + " ", + " LT ", + " Lt ", + " LB ", + " lB ", + " ", + " " + } + }, + { + center_tris_t, + sizeof(center_tris_t[0]), + D3DFVF_XYZRHW | D3DFVF_DIFFUSE, + { + " ", + " ", + " TT ", + " LR ", + " LR ", + " BB ", + " ", + " " + } + }, + { + edge_tris_t, + sizeof(edge_tris_t[0]), + D3DFVF_XYZRHW | D3DFVF_DIFFUSE, + { + " ", + " TT ", + " LT ", + " LR ", + " LB ", + " ", + " ", + " " + } + }, + }; + + window = create_window(); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a 3D device.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_CreateRenderTarget(device, vp_size, vp_size, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, FALSE, &rt); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_GetBackBuffer(device, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_code, &shader, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + else + skip("Skipping vertex shader codepath in filling convention test.\n"); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + /* Run tests with shader and fixed function vertex processing if shaders are + * supported. There's no point in running the XYZRHW tests with a VS though. */ + if (shader && ((tests[i].fvf & D3DFVF_POSITION_MASK) == D3DFVF_XYZ)) + j = 0; + else + j = 2; + + for (; j < 4; ++j) + { + cur = (j & 1) ? rt : backbuffer; + + hr = IDirect3DDevice8_SetVertexShader(device, (j & 2) ? tests[i].fvf : shader); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, cur, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, colour_clear, 0.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetViewport(device, &vp); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLELIST, 4, tests[i].geometry, tests[i].stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + get_rt_readback(cur, &rb); + for (y = 0; y < 8; y++) + { + for (x = 0; x < 8; x++) + { + todo = FALSE; + switch (tests[i].expected[y][x]) + { + case 'l': todo = TRUE; + case 'L': + expected = colour_left; + break; + case 't': todo = TRUE; + case 'T': + expected = colour_top; + break; + case 'r': todo = TRUE; + case 'R': + expected = colour_right; + break; + case 'b': todo = TRUE; + case 'B': + expected = colour_bottom; + break; + case ' ': + expected = colour_clear; + break; + default: + ok(0, "Unexpected entry in expected test char\n"); + expected = 0xdeadbeef; + } + colour = get_readback_color(&rb, x, y); + /* The nudge-to-bottom test fails on cards that give us a bottom-left + * filling convention. The cause isn't the bottom part of the filling + * convention, but because wined3d will nudge geometry to the left to + * keep diagonals (the 'R' in test case 'edge_tris') intact. */ + todo_wine_if(todo && !color_match(colour, expected, 1)) + ok(color_match(colour, expected, 1), "Got unexpected colour %08x, %ux%u, case %u, j %u.\n", + colour, x, y, i, j); + } + } + release_surface_readback(&rb); + + /* IDirect3DDevice8::CopyRects can't stretch, so don't bother making the offscreen surface + * visible. Use the d3d9 test if you need to see visual output. */ + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + } + + if (shader) + IDirect3DDevice8_DeleteVertexShader(device, shader); + IDirect3DSurface8_Release(backbuffer); + IDirect3DSurface8_Release(rt); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -11371,4 +11853,5 @@ START_TEST(visual) test_desktop_window(); test_sample_mask(); test_dynamic_map_synchronization(); + test_filling_convention(); } -- 2.32.0

3 6

[PATCH 1/3] dinput: Fix HID joystick GetEffectInfo / GetCapabilities flags.
by Rémi Bernon Nov. 9, 2021

Nov. 9, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 37 ++++++++++--------------------------- dlls/dinput8/tests/hid.c | 7 ------- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 541aa26e73b..b061fe30bcd 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -859,8 +859,6 @@ static HRESULT hid_joystick_get_effect_info( IDirectInputDevice8W *iface, DIEFFE type |= DIEFT_STARTDELAY; info->dwDynamicParams |= DIEP_STARTDELAY; } - if (effect_update->trigger_button_caps) info->dwDynamicParams |= DIEP_TRIGGERBUTTON; - if (effect_update->trigger_repeat_interval_caps) info->dwDynamicParams |= DIEP_TRIGGERREPEATINTERVAL; if (effect_update->direction_coll) info->dwDynamicParams |= DIEP_DIRECTION; if (effect_update->axes_coll) info->dwDynamicParams |= DIEP_AXES; @@ -882,7 +880,7 @@ static HRESULT hid_joystick_get_effect_info( IDirectInputDevice8W *iface, DIEFFE } } - if ((type == DIEFT_PERIODIC) && (collection = set_periodic->collection)) + if ((type & DIEFT_PERIODIC) && (collection = set_periodic->collection)) { if (set_periodic->magnitude_caps) info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; if (set_periodic->offset_caps) info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; @@ -890,39 +888,27 @@ static HRESULT hid_joystick_get_effect_info( IDirectInputDevice8W *iface, DIEFFE if (set_periodic->phase_caps) info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; } - if ((type == DIEFT_PERIODIC || type == DIEFT_RAMPFORCE || type == DIEFT_CONSTANTFORCE) && - (collection = set_envelope->collection)) + if ((type & (DIEFT_PERIODIC | DIEFT_RAMPFORCE | DIEFT_CONSTANTFORCE)) && (collection = set_envelope->collection)) { info->dwDynamicParams |= DIEP_ENVELOPE; if (set_envelope->attack_level_caps) type |= DIEFT_FFATTACK; if (set_envelope->attack_time_caps) type |= DIEFT_FFATTACK; if (set_envelope->fade_level_caps) type |= DIEFT_FFFADE; if (set_envelope->fade_time_caps) type |= DIEFT_FFFADE; + if (effect_update->trigger_button_caps) info->dwDynamicParams |= DIEP_TRIGGERBUTTON; + if (effect_update->trigger_repeat_interval_caps) info->dwDynamicParams |= DIEP_TRIGGERREPEATINTERVAL; } - if ((collection = set_condition->collection) && (type == DIEFT_CONDITION)) + if ((type & DIEFT_CONDITION) && (collection = set_condition->collection)) { if (set_condition->center_point_offset_caps) info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - if (set_condition->positive_coefficient_caps) + if (set_condition->positive_coefficient_caps || set_condition->negative_coefficient_caps) + info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; + if (set_condition->positive_saturation_caps || set_condition->negative_saturation_caps) { info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - type |= DIEFT_POSNEGCOEFFICIENTS; - } - if (set_condition->negative_coefficient_caps) - { - info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - type |= DIEFT_POSNEGCOEFFICIENTS; - } - if (set_condition->positive_saturation_caps) - { - info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - type |= DIEFT_SATURATION | DIEFT_POSNEGSATURATION; - } - if (set_condition->negative_saturation_caps) - { - info->dwDynamicParams |= DIEP_TYPESPECIFICPARAMS; - type |= DIEFT_SATURATION | DIEFT_POSNEGSATURATION; + type |= DIEFT_SATURATION; } if (set_condition->dead_band_caps) { @@ -1841,12 +1827,9 @@ HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID *guid, if (impl->pid_set_envelope.fade_level_caps || impl->pid_set_envelope.fade_time_caps) impl->base.caps.dwFlags |= DIDC_FFFADE; - if (impl->pid_set_condition.positive_coefficient_caps || - impl->pid_set_condition.negative_coefficient_caps) - impl->base.caps.dwFlags |= DIDC_POSNEGCOEFFICIENTS; if (impl->pid_set_condition.positive_saturation_caps || impl->pid_set_condition.negative_saturation_caps) - impl->base.caps.dwFlags |= DIDC_SATURATION|DIDC_POSNEGSATURATION; + impl->base.caps.dwFlags |= DIDC_SATURATION; if (impl->pid_set_condition.dead_band_caps) impl->base.caps.dwFlags |= DIDC_DEADBAND; impl->base.caps.dwFFSamplePeriod = 1000000; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index a0e202ba804..57fc7272369 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3388,11 +3388,8 @@ static BOOL CALLBACK check_effects( const DIEFFECTINFOW *effect, void *args ) check_member( *effect, *exp, "%u", dwSize ); check_member_guid( *effect, *exp, guid ); - todo_wine check_member( *effect, *exp, "%#x", dwEffType ); - todo_wine check_member( *effect, *exp, "%#x", dwStaticParams ); - todo_wine check_member( *effect, *exp, "%#x", dwDynamicParams ); check_member_wstr( *effect, *exp, tszName ); @@ -7289,7 +7286,6 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetCapabilities( device, &caps ); ok( hr == DI_OK, "GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps, "%d", dwSize ); - todo_wine check_member( caps, expect_caps, "%#x", dwFlags ); check_member( caps, expect_caps, "%#x", dwDevType ); check_member( caps, expect_caps, "%d", dwAxes ); @@ -7332,11 +7328,8 @@ static void test_force_feedback_joystick( void ) hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); ok( hr == DI_OK, "GetEffectInfo returned %#x\n", hr ); check_member_guid( effectinfo, expect_effects[1], guid ); - todo_wine check_member( effectinfo, expect_effects[1], "%#x", dwEffType ); - todo_wine check_member( effectinfo, expect_effects[1], "%#x", dwStaticParams ); - todo_wine check_member( effectinfo, expect_effects[1], "%#x", dwDynamicParams ); check_member_wstr( effectinfo, expect_effects[1], tszName ); -- 2.33.1

2 3

[PATCH] winex11.drv: Check if the surface is in list in wine_vk_surface_release().
by Paul Gofman Nov. 9, 2021

Nov. 9, 2021

Fixes a regression introduced by 6dcaff421f87a93efe18b2efe0ec64d94ed1d483. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The surface might have not been added to the list if it gets released from error path in X11DRV_vkCreateWin32SurfaceKHR(). dlls/winex11.drv/vulkan.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 4f6624b3db8..6f67d9a8a19 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -211,9 +211,12 @@ static void wine_vk_surface_release(struct wine_vk_surface *surface) if (InterlockedDecrement(&surface->ref)) return; - EnterCriticalSection(&context_section); - list_remove(&surface->entry); - LeaveCriticalSection(&context_section); + if (surface->entry.next) + { + EnterCriticalSection(&context_section); + list_remove(&surface->entry); + LeaveCriticalSection(&context_section); + } if (surface->window) XDestroyWindow(gdi_display, surface->window); -- 2.33.1

1 0

[PATCH] win32u: Use the replacement name in otmpFamilyName and GetTextFace().
by Akihiro Sagawa Nov. 9, 2021

Nov. 9, 2021

Some visual novel games verify that otmpFamilyName matches the desired font name. That prevents us from using replacement fonts. This commit allows to make otmpFamilyName from the replacement name. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/win32u/font.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)

1 0

[PATCH] win32u: Make elfFullName from family name in the font replacement.
by Akihiro Sagawa Nov. 9, 2021

Nov. 9, 2021

The original Kusanagi code, commit eab02574929d, was implemented in this way. However, commit abc8f2c6c270 and f360057e2f99 made it from face->full_name. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/win32u/font.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)

1 0

[PATCH 5/5] win32u: Move NtUserCountClipboardFormats implementation from user32.
by Jacek Caban Nov. 9, 2021

Nov. 9, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/clipboard.c | 23 +-------------- dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/clipboard.c | 55 ++++++++++++++++++++++++++++++++++++ dlls/win32u/driver.c | 34 +++++++++++++++++++--- dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 ++ dlls/win32u/wrappers.c | 5 ++++ include/ntuser.h | 1 + 10 files changed, 99 insertions(+), 28 deletions(-) create mode 100644 dlls/win32u/clipboard.c

2 1

[PATCH 01/18] ntdll: tests: Remove an accidental, unused macro in arm64 exception tests.
by Martin Storsjö Nov. 9, 2021

Nov. 9, 2021

Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/tests/exception.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 6af68317732..c57d7c01d86 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -5320,8 +5320,6 @@ static const char * const reg_names[48] = #define ORIG_LR 0xCCCCCCCC -#define UWOP(code,info) (UWOP_##code | ((info) << 4)) - static void call_virtual_unwind( int testnum, const struct unwind_test *test ) { static const int code_offset = 1024; -- 2.25.1

1 17

[PATCH vkd3d] vkd3d-shader/hlsl: Unify texture and sampler allocation functions.
by Matteo Bruni Nov. 9, 2021

Nov. 9, 2021

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Hacking a bit on the compiler helped. Register reservation / allocation is actually in a much better shape than I thought, functionality-wise. I still dislike the way object allocation is done but there is no ground or reason for blocking patches on that account. What do you think about this patch instead? Ugly? Based on top of 219079. libs/vkd3d-shader/hlsl_codegen.c | 102 +++++++++++-------------------- 1 file changed, 36 insertions(+), 66 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index b802f3a2..7c0b0f95 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1202,118 +1202,88 @@ static void allocate_buffers(struct hlsl_ctx *ctx) } } -static const struct hlsl_ir_var *get_reserved_sampler(struct hlsl_ctx *ctx, uint32_t index) +static const struct hlsl_ir_var *get_reserved_object(struct hlsl_ctx *ctx, char type, uint32_t index) { const struct hlsl_ir_var *var; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) { - if (var->last_read && var->reg_reservation.type == 's' && var->reg_reservation.index == index) + if (var->last_read && var->reg_reservation.type == type && var->reg_reservation.index == index) return var; } return NULL; } -static void allocate_samplers(struct hlsl_ctx *ctx) +static const struct object_type_info { - struct hlsl_ir_var *var; - uint32_t index = 0; - - LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) - { - if (!var->last_read || var->data_type->type != HLSL_CLASS_OBJECT - || var->data_type->base_type != HLSL_TYPE_SAMPLER) - continue; - - if (var->reg_reservation.type == 's') - { - const struct hlsl_ir_var *reserved_sampler = get_reserved_sampler(ctx, var->reg_reservation.index); - - if (reserved_sampler && reserved_sampler != var) - { - hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, - "Multiple samplers bound to s%u.", var->reg_reservation.index); - hlsl_note(ctx, reserved_sampler->loc, VKD3D_SHADER_LOG_ERROR, - "Sampler '%s' is already bound to s%u.", reserved_sampler->name, - var->reg_reservation.index); - } - - var->reg.id = var->reg_reservation.index; - var->reg.allocated = true; - TRACE("Allocated reserved %s to s%u.\n", var->name, index); - } - else if (!var->reg_reservation.type) - { - while (get_reserved_sampler(ctx, index)) - ++index; - - var->reg.id = index; - var->reg.allocated = true; - TRACE("Allocated %s to s%u.\n", var->name, index); - ++index; - } - else - { - hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, - "Samplers must be bound to register type 's'."); - } - } + enum hlsl_base_type type; + char *name; + char reg_name; } +object_types[] = +{ + { HLSL_TYPE_SAMPLER, "sampler", 's' }, + { HLSL_TYPE_TEXTURE, "texture", 't' }, +}; -static const struct hlsl_ir_var *get_reserved_texture(struct hlsl_ctx *ctx, uint32_t index) +static const struct object_type_info *get_object_type_info(enum hlsl_base_type type) { - const struct hlsl_ir_var *var; + unsigned int i; - LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, const struct hlsl_ir_var, extern_entry) - { - if (var->last_read && var->reg_reservation.type == 't' && var->reg_reservation.index == index) - return var; - } + for (i = 0; i < ARRAY_SIZE(object_types); ++i) + if (type == object_types[i].type) + return &object_types[i]; + + WARN("No type info for object type %u.\n", type); return NULL; } -static void allocate_textures(struct hlsl_ctx *ctx) +static void allocate_objects(struct hlsl_ctx *ctx, enum hlsl_base_type type) { + const struct object_type_info *type_info = get_object_type_info(type); struct hlsl_ir_var *var; uint32_t index = 0; LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) { if (!var->last_read || var->data_type->type != HLSL_CLASS_OBJECT - || var->data_type->base_type != HLSL_TYPE_TEXTURE) + || var->data_type->base_type != type) continue; - if (var->reg_reservation.type == 't') + if (var->reg_reservation.type == type_info->reg_name) { - const struct hlsl_ir_var *reserved_texture = get_reserved_texture(ctx, var->reg_reservation.index); + const struct hlsl_ir_var *reserved_object = get_reserved_object(ctx, type_info->reg_name, + var->reg_reservation.index); - if (reserved_texture && reserved_texture != var) + if (reserved_object && reserved_object != var) { hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_OVERLAPPING_RESERVATIONS, - "Multiple textures bound to t%u.", var->reg_reservation.index); - hlsl_note(ctx, reserved_texture->loc, VKD3D_SHADER_LOG_ERROR, - "Texture '%s' is already bound to t%u.", reserved_texture->name, + "Multiple %ss bound to %c%u.", type_info->name, type_info->reg_name, var->reg_reservation.index); + hlsl_note(ctx, reserved_object->loc, VKD3D_SHADER_LOG_ERROR, + "Object '%s' is already bound to %c%u.", reserved_object->name, + type_info->reg_name, var->reg_reservation.index); } var->reg.id = var->reg_reservation.index; var->reg.allocated = true; - TRACE("Allocated reserved %s to t%u.\n", var->name, var->reg_reservation.index); + TRACE("Allocated reserved %s to %c%u.\n", var->name, type_info->reg_name, var->reg_reservation.index); } else if (!var->reg_reservation.type) { - while (get_reserved_texture(ctx, index)) + while (get_reserved_object(ctx, type_info->reg_name, index)) ++index; var->reg.id = index; var->reg.allocated = true; - TRACE("Allocated %s to t%u.\n", var->name, index); + TRACE("Allocated %s to %c%u.\n", var->name, type_info->reg_name, index); ++index; } else { hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_RESERVATION, - "Textures must be bound to register type 't'."); + "Object of type '%s' must be bound to register type '%c'.", + type_info->name, type_info->reg_name); } } } @@ -1434,10 +1404,10 @@ int hlsl_emit_dxbc(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_fun else { allocate_buffers(ctx); - allocate_textures(ctx); + allocate_objects(ctx, HLSL_TYPE_TEXTURE); } allocate_semantic_registers(ctx); - allocate_samplers(ctx); + allocate_objects(ctx, HLSL_TYPE_SAMPLER); if (ctx->result) return ctx->result; -- 2.26.3

2 1