February 2019 - Wine-Commits

Józef Kucia : tests: Test GPU virtual address with readback buffer.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: vkd3d Branch: master Commit: b186645ccbd80abcd4537ebe48c411818b19bd98 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b186645ccbd80abcd4537eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 13 10:07:27 2019 +0100 tests: Test GPU virtual address with readback buffer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b80cc7b..70d7362 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1624,12 +1624,12 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 2, "Got unexpected refcount %u.\n", (unsigned int)refcount); hr = ID3D12Resource_GetDevice(resource, &IID_ID3D12Device, (void **)&tmp_device); - ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get device, hr %#x.\n", hr); refcount = get_refcount(device); ok(refcount == 3, "Got unexpected refcount %u.\n", (unsigned int)refcount); refcount = ID3D12Device_Release(tmp_device); @@ -1650,7 +1650,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(resource); ok(resource_desc.MipLevels == 6, "Got unexpected miplevels %u.\n", resource_desc.MipLevels); ID3D12Resource_Release(resource); @@ -1658,7 +1658,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); resource_desc = ID3D12Resource_GetDesc(resource); ok(resource_desc.MipLevels == 10, "Got unexpected miplevels %u.\n", resource_desc.MipLevels); ID3D12Resource_Release(resource); @@ -1738,7 +1738,7 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_GENERIC_READ, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); check_interface(resource, &IID_ID3D12Object, TRUE); check_interface(resource, &IID_ID3D12DeviceChild, TRUE); @@ -1779,7 +1779,11 @@ static void test_create_committed_resource(void) hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, &IID_ID3D12Resource, (void **)&resource); - ok(SUCCEEDED(hr), "Failed to create committed resource, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create committed resource, hr %#x.\n", hr); + + gpu_address = ID3D12Resource_GetGPUVirtualAddress(resource); + ok(gpu_address, "Got unexpected GPU virtual address %#"PRIx64".\n", gpu_address); + refcount = ID3D12Resource_Release(resource); ok(!refcount, "ID3D12Resource has %u references left.\n", (unsigned int)refcount);

1 0

Nikolay Sivov : d2d1: Add ID2D1GeometryGroup stub.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: a777fd85cb51698580ee26921f04e551d4b82d8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a777fd85cb51698580ee2692… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 12 18:06:42 2019 +0300 d2d1: Add ID2D1GeometryGroup stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 8 ++ dlls/d2d1/factory.c | 20 +++- dlls/d2d1/geometry.c | 265 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 290 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a777fd85cb51698580ee…

1 0

Matteo Bruni : d3d9: Keep track of D3DUSAGE_AUTOGENMIPMAP textures in the d3d9 device.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 4a6cf99a63547627b07ece5e44bcc734f4e27045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a6cf99a63547627b07ece5e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 11 18:21:04 2019 +0100 d3d9: Keep track of D3DUSAGE_AUTOGENMIPMAP textures in the d3d9 device. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 21 +++++++++++++++++++-- dlls/d3d9/stateblock.c | 16 +++++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 1032f8e..3fe0376 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -111,6 +111,8 @@ struct d3d9_device DWORD recording : 1; DWORD padding : 11; + DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ + unsigned int max_user_clip_planes; UINT implicit_swapchain_count; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 98ada03..6cc3f18 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -991,6 +991,7 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, if (!extended) { device->recording = FALSE; + device->auto_mipmaps = 0; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ZENABLE, !!swapchain_desc.enable_auto_depth_stencil); } @@ -2456,6 +2457,19 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, texture_impl ? texture_impl->wined3d_texture : NULL); + if (SUCCEEDED(hr) && !device->recording) + { + unsigned int i = stage < 16 || (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) + ? stage < 16 ? stage : stage - D3DVERTEXTEXTURESAMPLER0 + 16 : ~0u; + + if (i < D3D9_MAX_TEXTURE_UNITS) + { + if (texture_impl && texture_impl->usage & D3DUSAGE_AUTOGENMIPMAP) + device->auto_mipmaps |= 1u << i; + else + device->auto_mipmaps &= ~(1u << i); + } + } wined3d_mutex_unlock(); return hr; @@ -2700,10 +2714,13 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { struct wined3d_texture *texture; - unsigned int i, stage; + unsigned int i, stage, map; - for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + map = device->auto_mipmaps; + while (map) { + i = wined3d_bit_scan(&map); + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 8431ef7..14f47d9 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -109,10 +109,12 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + struct wined3d_texture *wined3d_texture; + unsigned int i, offset, stride, stage; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; - unsigned int i, offset, stride; enum wined3d_format_id format; + struct d3d9_texture *texture; struct d3d9_device *device; HRESULT hr; @@ -134,6 +136,18 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) } device->sysmem_ib = (wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)) && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; + device->auto_mipmaps = 0; + for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + { + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; + + if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage)) + && (texture = wined3d_texture_get_parent(wined3d_texture)) + && texture->usage & D3DUSAGE_AUTOGENMIPMAP) + device->auto_mipmaps |= 1u << i; + else + device->auto_mipmaps &= ~(1u << i); + } wined3d_mutex_unlock(); return D3D_OK;

1 0

Józef Kucia : wined3d: Factor out shader_get_stream_output_register_info().
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 45deb5aa2412af676b3484f8fe6dbeca81b94dfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=45deb5aa2412af676b3484f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:14 2019 +0100 wined3d: Factor out shader_get_stream_output_register_info(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 52 +++++++++++------------------------------- dlls/wined3d/shader.c | 37 ++++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 5 ++-- 3 files changed, 43 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=45deb5aa2412af676b34…

1 0

Józef Kucia : wined3d: Export wined3d_extract_shader_input_signature_from_dxbc().
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: b7509345891d3f857673d8e5da6ec8edabcb078f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7509345891d3f857673d8e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:12 2019 +0100 wined3d: Export wined3d_extract_shader_input_signature_from_dxbc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 22 ---------- dlls/d3d11/inputlayout.c | 28 ++++++------ dlls/d3d11/shader.c | 104 --------------------------------------------- dlls/d3d11/utils.c | 83 ------------------------------------ dlls/wined3d/shader_sm4.c | 23 ++++++++++ dlls/wined3d/wined3d.spec | 2 + include/wine/wined3d.h | 3 ++ 7 files changed, 42 insertions(+), 223 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b7509345891d3f857673…

1 0

Józef Kucia : wined3d: Remove unnecessary src_format NULL check from ffp_blit_supported().
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 5fc64a30573164e8d15699c6ce3abe2fdd482f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fc64a30573164e8d15699c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:16 2019 +0100 wined3d: Remove unnecessary src_format NULL check from ffp_blit_supported(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0ee2f82..4d5b777 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1964,7 +1964,7 @@ static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 if (src_resource->type != WINED3D_RTYPE_TEXTURE_2D) return FALSE; - decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) {

1 0

Józef Kucia : wined3d: Remove unnecessary src_format NULL check from glsl_blitter_supported().
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: e778a210f845bf9891a94271571de2e63dd628e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e778a210f845bf9891a94271… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:17 2019 +0100 wined3d: Remove unnecessary src_format NULL check from glsl_blitter_supported(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 970fa4b..c83d5f6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13145,7 +13145,7 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi /* We don't necessarily want to blit from resources without * WINED3D_RESOURCE_ACCESS_GPU, but that may be the only way to decompress * compressed textures. */ - decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) {

1 0

Józef Kucia : wined3d: Remove unnecessary src_format NULL check from arbfp_blit_supported().
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: 433af4eed586fecb23e70910a6cc2ae5f5cc7aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=433af4eed586fecb23e70910… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:15 2019 +0100 wined3d: Remove unnecessary src_format NULL check from arbfp_blit_supported(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 37ec7e9..6b6df16 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7714,7 +7714,7 @@ static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wine return FALSE; } - decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) + decompress = (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE;

1 0

Józef Kucia : wined3d: Keep original component index in stream output elements.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: a2ea5a98ee47eb6bd38aeb65fe06390e1c9982b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2ea5a98ee47eb6bd38aeb65… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 16:32:13 2019 +0100 wined3d: Keep original component index in stream output elements. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 83 +++++++++++++++++++++++++++++------------- dlls/wined3d/shader.c | 18 +++------ dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 66 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a2ea5a98ee47eb6bd38a…

1 0

Matteo Bruni : wined3d: Cleanup stateblock state before enumerating resources.
by Alexandre Julliard Feb. 12, 2019

Feb. 12, 2019

Module: wine Branch: master Commit: c5f49c73f8cfd3bf8fb75b383fed456d1056e949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5f49c73f8cfd3bf8fb75b38… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 11 18:21:03 2019 +0100 wined3d: Cleanup stateblock state before enumerating resources. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46617 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46618 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b2f7e0..b823ada 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4894,6 +4894,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_texture_decref(device->cursor_texture); device->cursor_texture = NULL; } + wined3d_stateblock_state_cleanup(&device->stateblock_state); state_unbind_resources(&device->state); } @@ -5082,7 +5083,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); - wined3d_stateblock_state_cleanup(&device->stateblock_state); if (device->d3d_initialized) wined3d_device_delete_opengl_contexts(device);

1 0