April 2019 - Wine-devel - list.winehq.org

[PATCH 1/6] ddraw/tests: Add some tests for calling stateblock methods while recording.
by Zebediah Figura 05 Apr '19

05 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/tests/ddraw7.c | 72 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 423dba57c9..168253e468 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15822,6 +15822,77 @@ static void test_clipper_refcount(void) DestroyWindow(window); } +static void test_begin_end_state_block(void) +{ + DWORD stateblock, stateblock2; + IDirect3DDevice7 *device; + ULONG refcount; + DWORD value; + HWND window; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + stateblock = 0xdeadbeef; + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!!stateblock && stateblock != 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); + + stateblock2 = 0xdeadbeef; + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock2); + todo_wine ok(hr == D3DERR_NOTINBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(stateblock2 == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock2); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice7_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginStateBlock(device); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_CaptureStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); + todo_wine ok(hr == D3DERR_INBEGINSTATEBLOCK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice7_EndStateBlock(device, &stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_ApplyStateBlock(device, stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); + + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15966,4 +16037,5 @@ START_TEST(ddraw7) test_multiply_transform(); test_alphatest(); test_clipper_refcount(); + test_begin_end_state_block(); } -- 2.20.1

3 17

[PATCH] d3d8: Keep previous stream source stride only when setting NULL buffer.
by Paul Gofman 05 Apr '19

05 Apr '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d8/device.c | 11 ++++----- dlls/d3d8/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5016ac4f17..40b5c86027 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3264,16 +3264,13 @@ static HRESULT WINAPI d3d8_device_SetStreamSource(IDirect3DDevice8 *iface, iface, stream_idx, buffer, stride); wined3d_mutex_lock(); - if (!stride) - { - unsigned int cur_offset; - - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - &cur_offset, &stride); - } if (!buffer_impl) + { + wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, + NULL, &stride); wined3d_buffer = NULL; + } else if (buffer_impl->draw_buffer) wined3d_buffer = buffer_impl->draw_buffer; else diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c5ec9aa736..b602ebe3bb 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2310,6 +2310,55 @@ cleanup: DestroyWindow(window); } +static void test_set_stream_source(void) +{ + IDirect3DVertexBuffer8 *vb, *current_vb; + IDirect3DDevice8 *device; + unsigned int stride; + IDirect3D8 *d3d8; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d8, window, NULL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + goto cleanup; + } + + hr = IDirect3DDevice8_CreateVertexBuffer(device, 512, 0, 0, D3DPOOL_DEFAULT, &vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, 32); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, NULL, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!current_vb, "Got unexpected vb %p.\n", current_vb); + ok(stride == 32, "Got unexpected stride %u.\n", stride); + + hr = IDirect3DDevice8_SetStreamSource(device, 0, vb, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(current_vb == vb, "Got unexpected vb %p.\n", current_vb); + IDirect3DVertexBuffer8_Release(current_vb); + ok(!stride, "Got unexpected stride %u.\n", stride); + + IDirect3DVertexBuffer8_Release(vb); + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +cleanup: + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + static void test_render_zero_triangles(void) { IDirect3DDevice8 *device; @@ -9747,6 +9796,7 @@ START_TEST(device) test_shader(); test_limits(); test_lights(); + test_set_stream_source(); test_ApplyStateBlock(); test_render_zero_triangles(); test_depth_stencil_reset(); -- 2.20.1

3 2

[PATCH v2 2/2] wined3d: Store and use stream offset in state block.
by Paul Gofman 05 Apr '19

05 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=21161 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- v2 changes: - use store_stream_offset bit field instead of stream_offset_ignore boolean; - removed an unused variable; - use array size in execute_test_chain_all(); - fixed test expected data reference in capture_reapply_stateblock_events[] and put exact comparison in light_check_data() back. dlls/d3d9/tests/stateblock.c | 79 ++++++++++++++++++++++++++-------- dlls/wined3d/device.c | 1 + dlls/wined3d/stateblock.c | 30 ++++++++++--- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 87 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 0983cf7b4f..5de5d4fcc6 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -67,6 +67,7 @@ struct state_test /* Apparently recorded stateblocks record and apply vertex declarations, * but don't capture them */ #define SB_QUIRK_RECORDED_VDECL_CAPTURE 0x00000001 +#define SB_QUIRK_STREAM_OFFSET_NOT_UPDATED 0x00000002 struct event_data { @@ -135,6 +136,7 @@ static void execute_test_chain(IDirect3DDevice9 *device, struct state_test *test { const void *data; + trace("event %u.\n", j); /* Execute the next event handler (if available). */ if (event[j].event_fn) { @@ -349,16 +351,17 @@ static void execute_test_chain_all(IDirect3DDevice9 *device, struct state_test * struct event capture_reapply_stateblock_events[] = { {begin_stateblock, SB_DATA_NONE, SB_DATA_TEST_IN}, - {end_stateblock, SB_DATA_NONE, SB_DATA_NONE}, + {end_stateblock, SB_DATA_NONE, SB_DATA_DEFAULT}, {capture_stateblock, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, - {apply_stateblock, SB_DATA_DEFAULT, SB_DATA_NONE, SB_QUIRK_RECORDED_VDECL_CAPTURE}, + {capture_stateblock, SB_DATA_TEST_ALL, SB_DATA_DEFAULT}, + {apply_stateblock, SB_DATA_TEST_ALL, SB_DATA_DEFAULT, SB_QUIRK_RECORDED_VDECL_CAPTURE}, }; struct event create_stateblock_capture_apply_all_events[] = { {create_stateblock_all, SB_DATA_DEFAULT, SB_DATA_TEST_IN}, {capture_stateblock, SB_DATA_TEST_ALL, SB_DATA_DEFAULT}, - {apply_stateblock, SB_DATA_TEST_ALL, SB_DATA_NONE}, + {apply_stateblock, SB_DATA_TEST_ALL, SB_DATA_NONE, SB_QUIRK_STREAM_OFFSET_NOT_UPDATED}, }; struct event create_stateblock_apply_all_events[] = @@ -421,43 +424,52 @@ static void execute_test_chain_all(IDirect3DDevice9 *device, struct state_test * } trace("Running initial read state tests\n"); - execute_test_chain(device, test, ntests, read_events, 1, NULL); + execute_test_chain(device, test, ntests, read_events, ARRAY_SIZE(read_events), NULL); trace("Running write-read state tests\n"); - execute_test_chain(device, test, ntests, write_read_events, 2, NULL); + execute_test_chain(device, test, ntests, write_read_events, ARRAY_SIZE(write_read_events), NULL); trace("Running stateblock abort state tests\n"); - execute_test_chain(device, test, ntests, abort_stateblock_events, 3, &arg); + execute_test_chain(device, test, ntests, abort_stateblock_events, ARRAY_SIZE(abort_stateblock_events), &arg); trace("Running stateblock apply state tests\n"); - execute_test_chain(device, test, ntests, apply_stateblock_events, 3, &arg); + execute_test_chain(device, test, ntests, apply_stateblock_events, ARRAY_SIZE(apply_stateblock_events), &arg); trace("Running stateblock capture/reapply state tests\n"); - execute_test_chain(device, test, ntests, capture_reapply_stateblock_events, 4, &arg); + execute_test_chain(device, test, ntests, capture_reapply_stateblock_events, + ARRAY_SIZE(capture_reapply_stateblock_events), &arg); trace("Running create stateblock capture/apply all state tests\n"); - execute_test_chain(device, test, ntests, create_stateblock_capture_apply_all_events, 3, &arg); + execute_test_chain(device, test, ntests, create_stateblock_capture_apply_all_events, + ARRAY_SIZE(create_stateblock_capture_apply_all_events), &arg); trace("Running create stateblock apply state all tests\n"); - execute_test_chain(device, test, ntests, create_stateblock_apply_all_events, 3, &arg); + execute_test_chain(device, test, ntests, create_stateblock_apply_all_events, + ARRAY_SIZE(create_stateblock_apply_all_events), &arg); trace("Running create stateblock capture/apply vertex state tests\n"); - execute_test_chain(device, test, ntests, create_stateblock_capture_apply_vertex_events, 3, &arg); + execute_test_chain(device, test, ntests, create_stateblock_capture_apply_vertex_events, + ARRAY_SIZE(create_stateblock_capture_apply_vertex_events), &arg); trace("Running create stateblock apply vertex state tests\n"); - execute_test_chain(device, test, ntests, create_stateblock_apply_vertex_events, 3, &arg); + execute_test_chain(device, test, ntests, create_stateblock_apply_vertex_events, + ARRAY_SIZE(create_stateblock_apply_vertex_events), &arg); trace("Running create stateblock capture/apply pixel state tests\n"); - execute_test_chain(device, test, ntests, create_stateblock_capture_apply_pixel_events, 3, &arg); + execute_test_chain(device, test, ntests, create_stateblock_capture_apply_pixel_events, + ARRAY_SIZE(create_stateblock_capture_apply_pixel_events), &arg); trace("Running create stateblock apply pixel state tests\n"); - execute_test_chain(device, test, ntests, create_stateblock_apply_pixel_events, 3, &arg); + execute_test_chain(device, test, ntests, create_stateblock_apply_pixel_events, + ARRAY_SIZE(create_stateblock_apply_pixel_events), &arg); trace("Running rendertarget switch state tests\n"); - execute_test_chain(device, test, ntests, rendertarget_switch_events, 3, &arg); + execute_test_chain(device, test, ntests, rendertarget_switch_events, + ARRAY_SIZE(rendertarget_switch_events), &arg); trace("Running stateblock apply over rendertarget switch interrupt tests\n"); - execute_test_chain(device, test, ntests, rendertarget_stateblock_events, 5, &arg); + execute_test_chain(device, test, ntests, rendertarget_stateblock_events, + ARRAY_SIZE(rendertarget_stateblock_events), &arg); /* Cleanup resources */ for (i = 0; i < ntests; ++i) @@ -649,6 +661,7 @@ static const struct light_data light_poison_data = 0x1337c0de, }; + static const struct light_data light_default_data = { { @@ -1666,6 +1679,7 @@ struct resource_test_data IDirect3DPixelShader9 *ps; IDirect3DIndexBuffer9 *ib; IDirect3DVertexBuffer9 **vb; + unsigned int stream_offset, stream_stride; IDirect3DTexture9 **tex; }; @@ -1682,6 +1696,7 @@ static void resource_apply_data(IDirect3DDevice9 *device, const struct state_tes { const struct resource_test_arg *arg = test->test_arg; const struct resource_test_data *d = data; + IDirect3DVertexBuffer9 *temp_vb = NULL; unsigned int i; HRESULT hr; @@ -1699,10 +1714,26 @@ static void resource_apply_data(IDirect3DDevice9 *device, const struct state_tes for (i = 0; i < arg->stream_count; ++i) { - hr = IDirect3DDevice9_SetStreamSource(device, i, d->vb[i], 0, 64); - ok(SUCCEEDED(hr), "SetStreamSource (%u, %p, 0, 64) returned %#x.\n", - i, d->vb[i], hr); + if (!d->vb[i]) + { + /* Use a non NULL vertex buffer to really set offset and stride and avoid leftover values. */ + if (!temp_vb) + { + hr = IDirect3DDevice9_CreateVertexBuffer(device, 64, D3DUSAGE_DYNAMIC, + 0, D3DPOOL_DEFAULT, &temp_vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + hr = IDirect3DDevice9_SetStreamSource(device, i, temp_vb, d->stream_offset, d->stream_stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetStreamSource(device, i, d->vb[i], d->stream_offset, d->stream_stride); + ok(hr == D3D_OK, "Unexpected SetStreamSource result, i %u, vb %p, " + "stream_offset %u, stream_stride %u), hr %#x.\n", + i, d->vb[i], d->stream_offset, d->stream_stride, hr); } + if (temp_vb) + IDirect3DVertexBuffer9_Release(temp_vb); for (i = 0; i < arg->tex_count; ++i) { @@ -1718,6 +1749,7 @@ static void resource_check_data(IDirect3DDevice9 *device, const struct state_tes const struct resource_test_data *poison = &ctx->poison_data; const struct resource_test_arg *arg = test->test_arg; const struct resource_test_data *d = expected_data; + unsigned int expected_offset; unsigned int i; HRESULT hr; void *ptr; @@ -1771,6 +1803,7 @@ static void resource_check_data(IDirect3DDevice9 *device, const struct state_tes IDirect3DIndexBuffer9_Release((IDirect3DIndexBuffer9 *)ptr); } + expected_offset = quirk & SB_QUIRK_STREAM_OFFSET_NOT_UPDATED ? 0 : d->stream_offset; for (i = 0; i < arg->stream_count; ++i) { ptr = poison->vb[i]; @@ -1778,6 +1811,8 @@ static void resource_check_data(IDirect3DDevice9 *device, const struct state_tes ok(SUCCEEDED(hr), "GetStreamSource (%u) returned %#x.\n", i, hr); ok(ptr == d->vb[i], "Chain stage %u, stream %u, expected vertex buffer %p, received %p.\n", chain_stage, i, d->vb[i], ptr); + ok(v == expected_offset, "Stream source offset %u, expected %u, stride %u.\n", v, expected_offset, w); + ok(w == d->stream_stride, "Stream source stride %u, expected %u.\n", w, d->stream_stride); if (SUCCEEDED(hr) && ptr) { IDirect3DIndexBuffer9_Release((IDirect3DVertexBuffer9 *)ptr); @@ -1811,6 +1846,8 @@ static void resource_default_data_init(struct resource_test_data *data, const st { data->vb[i] = NULL; } + data->stream_offset = 0; + data->stream_stride = 0; data->tex = HeapAlloc(GetProcessHeap(), 0, arg->tex_count * sizeof(*data->tex)); for (i = 0; i < arg->tex_count; ++i) { @@ -1885,6 +1922,8 @@ static void resource_test_data_init(IDirect3DDevice9 *device, 0, D3DPOOL_DEFAULT, &data->vb[i], NULL); ok(SUCCEEDED(hr), "CreateVertexBuffer (%u) returned %#x.\n", i, hr); } + data->stream_offset = 4; + data->stream_stride = 64; data->tex = HeapAlloc(GetProcessHeap(), 0, arg->tex_count * sizeof(*data->tex)); for (i = 0; i < arg->tex_count; ++i) { @@ -1908,6 +1947,8 @@ static void resource_poison_data_init(struct resource_test_data *data, const str { data->vb[i] = (IDirect3DVertexBuffer9 *)poison++; } + data->stream_offset = 16; + data->stream_stride = 128; data->tex = HeapAlloc(GetProcessHeap(), 0, arg->tex_count * sizeof(*data->tex)); for (i = 0; i < arg->tex_count; ++i) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9556aeef83..517fd55c8c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1388,6 +1388,7 @@ HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UI wined3d_buffer_decref(device->update_stateblock_state->streams[stream_idx].buffer); device->update_stateblock_state->streams[stream_idx].buffer = buffer; device->update_stateblock_state->streams[stream_idx].stride = stride; + device->update_stateblock_state->streams[stream_idx].offset = offset; if (device->recording) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 36239207ae..05149ad1af 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -916,13 +916,17 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) if (!(map & 1)) continue; if (stateblock->stateblock_state.streams[i].stride != state->streams[i].stride + || stateblock->stateblock_state.streams[i].offset != state->streams[i].offset || stateblock->stateblock_state.streams[i].buffer != state->streams[i].buffer) { - TRACE("Updating stream source %u to %p, stride to %u.\n", - i, state->streams[i].buffer, - state->streams[i].stride); + TRACE("stateblock %p, stream source %u, buffer %p, stride %u, offset %u.\n", + stateblock, i, state->streams[i].buffer, state->streams[i].stride, + state->streams[i].offset); stateblock->stateblock_state.streams[i].stride = state->streams[i].stride; + if (stateblock->changed.store_stream_offset) + stateblock->stateblock_state.streams[i].offset = state->streams[i].offset; + if (state->streams[i].buffer) wined3d_buffer_incref(state->streams[i].buffer); if (stateblock->stateblock_state.streams[i].buffer) @@ -1211,18 +1215,23 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { + unsigned int offset, stride; + if (!(map & 1)) continue; - state->streams[i].stride = stateblock->stateblock_state.streams[i].stride; if (stateblock->stateblock_state.streams[i].buffer) wined3d_buffer_incref(stateblock->stateblock_state.streams[i].buffer); if (state->streams[i].buffer) wined3d_buffer_decref(state->streams[i].buffer); state->streams[i].buffer = stateblock->stateblock_state.streams[i].buffer; + offset = stateblock->stateblock_state.streams[i].offset; + stride = stateblock->stateblock_state.streams[i].stride; + + state->streams[i].stride = stride; + state->streams[i].offset = offset; wined3d_device_set_stream_source(device, i, - stateblock->stateblock_state.streams[i].buffer, - 0, stateblock->stateblock_state.streams[i].stride); + stateblock->stateblock_state.streams[i].buffer, offset, stride); } map = stateblock->changed.streamFreq; @@ -1554,6 +1563,7 @@ void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, if (flags & WINED3D_STATE_INIT_DEFAULT) stateblock_state_init_default(state, &device->adapter->d3d_info); + } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, @@ -1565,6 +1575,8 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->device = device; wined3d_stateblock_state_init(&stateblock->stateblock_state, device, 0); + stateblock->changed.store_stream_offset = 1; + if (type == WINED3D_SBT_RECORDED) return WINED3D_OK; @@ -1599,6 +1611,12 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock_init_contained_states(stateblock); wined3d_stateblock_capture(stateblock); + /* According to the tests, stream offset is not updated in the captured state if + * the state was captured on state block creation. This is not the case for + * state blocks initialized with BeginStateBlock / EndStateBlock, multiple + * captures get stream offsets updated. */ + stateblock->changed.store_stream_offset = 0; + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3243d07e17..0e984ae1bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3666,7 +3666,8 @@ struct wined3d_saved_states DWORD vertexShader : 1; DWORD scissorRect : 1; DWORD blend_state : 1; - DWORD padding : 4; + DWORD store_stream_offset : 1; + DWORD padding : 3; }; struct StageState { -- 2.20.1

2 1

[PATCH] wineps: Include the meta region in the clip region.
by Huw Davies 05 Apr '19

05 Apr '19

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineps.drv/clipping.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/clipping.c b/dlls/wineps.drv/clipping.c index 59c8817bc2..62022c97c0 100644 --- a/dlls/wineps.drv/clipping.c +++ b/dlls/wineps.drv/clipping.c @@ -88,8 +88,8 @@ void PSDRV_SetClip( PHYSDEV dev ) return; } - hrgn = CreateRectRgn(0,0,0,0); - if (GetClipRgn(dev->hdc, hrgn)) + hrgn = CreateRectRgn(0, 0, 0, 0); + if (GetRandomRgn(dev->hdc, hrgn, 3) == 1) /* clip && meta */ { PSDRV_WriteGSave(dev); PSDRV_AddClip( dev, hrgn ); @@ -104,11 +104,12 @@ void PSDRV_SetClip( PHYSDEV dev ) void PSDRV_ResetClip( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - HRGN hrgn = CreateRectRgn(0,0,0,0); - BOOL empty; + HRGN hrgn; + + if (physDev->pathdepth) return; - empty = !GetClipRgn(dev->hdc, hrgn); - if(!empty && !physDev->pathdepth) + hrgn = CreateRectRgn(0, 0, 0, 0); + if (GetRandomRgn(dev->hdc, hrgn, 3) == 1) /* clip && meta */ PSDRV_WriteGRestore(dev); DeleteObject(hrgn); } -- 2.18.0

1 0

[PATCH 4/6] wined3d: Initialise driver and device UUID for Vulkan adapters.
by Józef Kucia 05 Apr '19

05 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 47 +++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_vk.h | 8 ++++++- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 23d9a448624b..787e407f6104 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -29,6 +29,12 @@ static inline const struct wined3d_adapter_vk *wined3d_adapter_vk_const(const st return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); } +static const char *debug_vk_version(uint32_t version) +{ + return wine_dbg_sprintf("%u.%u.%u", + VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version), VK_VERSION_PATCH(version)); +} + #ifdef USE_WIN32_VULKAN static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { @@ -226,10 +232,12 @@ static unsigned int wined3d_get_wine_vk_version(void) static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { + PFN_vkEnumerateInstanceVersion pfn_vkEnumerateInstanceVersion; struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; VkApplicationInfo app_info; + uint32_t api_version = 0; char app_name[MAX_PATH]; VkResult vr; @@ -242,13 +250,23 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) goto fail; } + vk_info->api_version = VK_API_VERSION_1_0; + if ((pfn_vkEnumerateInstanceVersion = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"))) + && pfn_vkEnumerateInstanceVersion(&api_version) == VK_SUCCESS) + { + TRACE("Vulkan instance API version %s.\n", debug_vk_version(api_version)); + + if (api_version >= VK_API_VERSION_1_1) + vk_info->api_version = VK_API_VERSION_1_1; + } + memset(&app_info, 0, sizeof(app_info)); app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; if (wined3d_get_app_name(app_name, ARRAY_SIZE(app_name))) app_info.pApplicationName = app_name; app_info.pEngineName = "Damavand"; app_info.engineVersion = wined3d_get_wine_vk_version(); - app_info.apiVersion = VK_API_VERSION_1_0; + app_info.apiVersion = vk_info->api_version; memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -267,11 +285,15 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) WARN("Could not get instance proc addr for '" #name "'.\n"); \ goto fail; \ } +#define LOAD_INSTANCE_OPT_PFN(name) \ + vk_ops->name = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #name)); #define VK_INSTANCE_PFN LOAD_INSTANCE_PFN +#define VK_INSTANCE_EXT_PFN LOAD_INSTANCE_OPT_PFN #define VK_DEVICE_PFN LOAD_INSTANCE_PFN VK_INSTANCE_FUNCS() VK_DEVICE_FUNCS() #undef VK_INSTANCE_PFN +#undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN vk_info->instance = instance; @@ -324,8 +346,7 @@ const struct wined3d_gpu_description *get_vulkan_gpu_description(const VkPhysica TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); TRACE("Vendor ID: 0x%04x, Device ID: 0x%04x.\n", properties->vendorID, properties->deviceID); TRACE("Driver version: %#x.\n", properties->driverVersion); - TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(properties->apiVersion), - VK_VERSION_MINOR(properties->apiVersion), VK_VERSION_PATCH(properties->apiVersion)); + TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); if ((description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID))) return description; @@ -342,7 +363,8 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; const struct wined3d_gpu_description *gpu_description; struct wined3d_adapter *adapter = &adapter_vk->a; - VkPhysicalDeviceProperties properties; + VkPhysicalDeviceIDProperties id_properties; + VkPhysicalDeviceProperties2 properties2; TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); @@ -359,16 +381,27 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) goto fail_vulkan; - VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties)); - adapter_vk->device_limits = properties.limits; + memset(&id_properties, 0, sizeof(id_properties)); + id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id_properties; - if (!(gpu_description = get_vulkan_gpu_description(&properties))) + if (vk_info->api_version >= VK_API_VERSION_1_1) + VK_CALL(vkGetPhysicalDeviceProperties2(adapter_vk->physical_device, &properties2)); + else + VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); + adapter_vk->device_limits = properties2.properties.limits; + + if (!(gpu_description = get_vulkan_gpu_description(&properties2.properties))) { ERR("Failed to get GPU description.\n"); goto fail_vulkan; } wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); + memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid)); + if (!wined3d_adapter_vk_init_format_info(adapter_vk, vk_info)) goto fail_vulkan; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 784dd0c310c5..10c706a10331 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -38,7 +38,9 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) \ - VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) + VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) \ + /* Vulkan 1.1 */ \ + VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2) #define VK_DEVICE_FUNCS() \ VK_DEVICE_PFN(vkAllocateCommandBuffers) \ @@ -167,10 +169,12 @@ struct vulkan_ops { #define VK_INSTANCE_PFN DECLARE_VK_PFN +#define VK_INSTANCE_EXT_PFN DECLARE_VK_PFN #define VK_DEVICE_PFN DECLARE_VK_PFN VK_DEVICE_FUNCS() VK_INSTANCE_FUNCS() #undef VK_INSTANCE_PFN +#undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN PFN_vkCreateInstance vkCreateInstance; @@ -182,6 +186,8 @@ struct wined3d_vk_info VkInstance instance; struct vulkan_ops vk_ops; + unsigned int api_version; + #ifdef USE_WIN32_VULKAN HMODULE vulkan_lib; #endif -- 2.19.2

1 0

[PATCH] kernel32: Add DECLSPEC_HOTPATCH to FindClose().
by Paul Gofman 05 Apr '19

05 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28140 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/kernel32/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3214d724cb..c66073b820 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2236,7 +2236,7 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) /************************************************************************* * FindClose (KERNEL32.@) */ -BOOL WINAPI FindClose( HANDLE handle ) +BOOL WINAPI DECLSPEC_HOTPATCH FindClose( HANDLE handle ) { FIND_FIRST_INFO *info = handle; -- 2.20.1

1 0

[PATCH] wineps.drv: Don't use strcasecmp.
by Piotr Caban 05 Apr '19

05 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/builtin.c | 3 ++- dlls/wineps.drv/font.c | 5 +++-- dlls/wineps.drv/mkagl.c | 4 ++-- dlls/wineps.drv/ppd.c | 21 +++++++++++---------- dlls/wineps.drv/type1afm.c | 7 ++++--- 5 files changed, 22 insertions(+), 18 deletions(-)

2 1

[PATCH v2] msi: Use case sensitive compare in handle_msi_break.
by Piotr Caban 05 Apr '19

05 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/custom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 1/4] quartz/tests: Fix some VMR9 test failures.
by Zebediah Figura 05 Apr '19

05 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 43 ++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index f8e6f21586..88b0562e38 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -36,7 +36,7 @@ static IBaseFilter *create_vmr9(DWORD mode) hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, mode); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); IVMRFilterConfig9_Release(config); } return filter; @@ -65,7 +65,7 @@ static void test_filter_config(void) ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -82,7 +82,7 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -134,7 +134,7 @@ static void test_filter_config(void) /* Despite MSDN, you can still change the rendering mode after setting the * stream count. */ hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -150,19 +150,30 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +#define check_interface_broken(a, b, c) check_interface_(__LINE__, a, b, c, TRUE) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported, BOOL is_broken) { - IUnknown *iface = iface_ptr; - HRESULT hr, expected_hr; - IUnknown *unk; + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; - expected_hr = supported ? S_OK : E_NOINTERFACE; + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } - hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + hr = IUnknown_QueryInterface(unknown, riid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(out); + return hr; } static void test_interfaces(void) @@ -188,7 +199,9 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + /* IVMRMonitorConfig9 may not be available if the d3d9 device has + * insufficient support. */ + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); @@ -210,7 +223,7 @@ static void test_interfaces(void) IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IVMRWindowlessControl9, TRUE); todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); -- 2.20.1

2 5

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 05 Apr '19

05 Apr '19

1 0