wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Matteo Bruni : d3d9: Fix RTV refcounting in d3d9_texture_cube_AddRef().
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: d7eba2a9cbcd7106a10018bb6e15b524ea0445b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7eba2a9cbcd7106a10018bb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 14:01:24 2020 +0100 d3d9: Fix RTV refcounting in d3d9_texture_cube_AddRef(). 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/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 0d36c02aaa..9be9d450ba 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -543,7 +543,7 @@ static ULONG WINAPI d3d9_texture_cube_AddRef(IDirect3DCubeTexture9 *iface) wined3d_mutex_lock(); LIST_FOR_EACH_ENTRY(surface, &texture->rtv_list, struct d3d9_surface, rtv_entry) { - wined3d_rendertarget_view_decref(surface->wined3d_rtv); + wined3d_rendertarget_view_incref(surface->wined3d_rtv); } wined3d_texture_incref(texture->wined3d_texture); wined3d_mutex_unlock();

1 0

Matteo Bruni : ddraw: Store primary stateblock state pointer in the device.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 140186b0c3911e092d91005231f7adb3297d2928 URL: https://source.winehq.org/git/wine.git/?a=commit;h=140186b0c3911e092d910052… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 14:01:23 2020 +0100 ddraw: Store primary stateblock state pointer in the 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/ddraw/ddraw.c | 1 + dlls/ddraw/ddraw_private.h | 2 ++ dlls/ddraw/device.c | 23 ++++++++++++----------- dlls/ddraw/vertexbuffer.c | 4 ++-- dlls/ddraw/viewport.c | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index de45751159..050f625f71 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5048,6 +5048,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, DWORD flags, enum wined3d_device_type de wined3d_decref(ddraw->wined3d); return hr; } + ddraw->stateblock_state = wined3d_stateblock_get_state(ddraw->state); return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 515a622e37..f4fe970a61 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -132,6 +132,7 @@ struct ddraw UINT numConvertedDecls, declArraySize; struct wined3d_stateblock *state; + const struct wined3d_stateblock_state *stateblock_state; }; #define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd" @@ -356,6 +357,7 @@ struct d3d_device struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; struct wined3d_stateblock *recording, *state, *update_state; + const struct wined3d_stateblock_state *stateblock_state; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3c0ae71196..048ba7fba6 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2302,7 +2302,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - device_state = wined3d_stateblock_get_state(device->state); + device_state = device->stateblock_state; switch (state) { case D3DRENDERSTATE_TEXTUREMAG: @@ -2451,7 +2451,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, *value = 0; wined3d_mutex_lock(); - if ((tex = wined3d_stateblock_get_state(device->state)->textures[0])) + if ((tex = device->stateblock_state->textures[0])) { /* The parent of the texture is the IDirectDrawSurface7 * interface of the ddraw surface. */ @@ -2673,7 +2673,7 @@ static void fixup_texture_alpha_op(struct d3d_device *device) if (!(device->legacyTextureBlending && device->texture_map_blend == D3DTBLEND_MODULATE)) return; - if ((tex = wined3d_stateblock_get_state(device->state)->textures[0])) + if ((tex = device->stateblock_state->textures[0])) { struct wined3d_resource_desc desc; @@ -3233,7 +3233,7 @@ static HRESULT d3d_device7_GetTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - memcpy(matrix, &wined3d_stateblock_get_state(device->state)->transforms[wined3d_state], sizeof(*matrix)); + memcpy(matrix, &device->stateblock_state->transforms[wined3d_state], sizeof(*matrix)); wined3d_mutex_unlock(); return D3D_OK; @@ -3886,7 +3886,7 @@ static HRESULT WINAPI d3d_device7_GetClipStatus(IDirect3DDevice7 *iface, D3DCLIP FIXME("iface %p, clip_status %p stub.\n", iface, clip_status); - vp = wined3d_stateblock_get_state(device->state)->viewport; + vp = device->stateblock_state->viewport; clip_status->minx = vp.x; clip_status->maxx = vp.x + vp.width; clip_status->miny = vp.y; @@ -4566,7 +4566,7 @@ static void prepare_clip_space_planes(struct d3d_device *device, struct wined3d_ /* We want the wined3d matrices since those include the legacy viewport * transformation. */ wined3d_mutex_lock(); - state = wined3d_stateblock_get_state(device->state); + state = device->stateblock_state; multiply_matrix(&m, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD]); multiply_matrix(&m, &state->transforms[WINED3D_TS_PROJECTION], &m); wined3d_mutex_unlock(); @@ -4725,7 +4725,7 @@ static HRESULT d3d_device7_GetTexture(IDirect3DDevice7 *iface, } wined3d_mutex_lock(); - if (!(wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[stage])) + if (!(wined3d_texture = device->stateblock_state->textures[stage])) { *texture = NULL; wined3d_mutex_unlock(); @@ -4936,7 +4936,7 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, wined3d_mutex_lock(); - device_state = wined3d_stateblock_get_state(device->state); + device_state = device->stateblock_state; if (l->sampler_state) { @@ -5391,7 +5391,7 @@ static HRESULT d3d_device7_GetViewport(IDirect3DDevice7 *iface, D3DVIEWPORT7 *vi return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); - wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; + wined3d_viewport = device->stateblock_state->viewport; wined3d_mutex_unlock(); viewport->dwX = wined3d_viewport.x; @@ -5493,7 +5493,7 @@ static HRESULT d3d_device7_GetMaterial(IDirect3DDevice7 *iface, D3DMATERIAL7 *ma wined3d_mutex_lock(); /* Note: D3DMATERIAL7 is compatible with struct wined3d_material. */ - memcpy(material, &wined3d_stateblock_get_state(device->state)->material, sizeof(*material)); + memcpy(material, &device->stateblock_state->material, sizeof(*material)); wined3d_mutex_unlock(); return D3D_OK; @@ -6577,7 +6577,7 @@ static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV wined3d_mutex_lock(); if (idx < WINED3D_MAX_CLIP_DISTANCES) - memcpy(plane, &wined3d_stateblock_get_state(device->state)->clip_planes[idx], sizeof(struct wined3d_vec4)); + memcpy(plane, &device->stateblock_state->clip_planes[idx], sizeof(struct wined3d_vec4)); else { WARN("Clip plane %u is not supported.\n", idx); @@ -6997,6 +6997,7 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->wined3d_device = ddraw->wined3d_device; wined3d_device_incref(ddraw->wined3d_device); device->update_state = device->state = ddraw->state; + device->stateblock_state = ddraw->stateblock_state; wined3d_stateblock_incref(ddraw->state); /* Render to the back buffer */ diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index afd798cb9f..584d9d162b 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -85,7 +85,7 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface) * stream source in wined3d and they should get unset there before * they are destroyed. */ wined3d_mutex_lock(); - if (wined3d_stateblock_get_state(buffer->ddraw->state)->streams[0].buffer == buffer->wined3d_buffer) + if (buffer->ddraw->stateblock_state->streams[0].buffer == buffer->wined3d_buffer) wined3d_stateblock_set_stream_source(buffer->ddraw->state, 0, NULL, 0, 0); wined3d_vertex_declaration_decref(buffer->wined3d_declaration); @@ -275,7 +275,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 wined3d_mutex_lock(); - state = wined3d_stateblock_get_state(device_impl->state); + state = device_impl->stateblock_state; /* WineD3D doesn't know d3d7 vertex operation, it uses * render states instead. Set the render states according to diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index ac56928e4f..4a415c4daf 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -520,7 +520,7 @@ static HRESULT WINAPI d3d_viewport_TransformVertices(IDirect3DViewport3 *iface, if (activate) viewport_activate(viewport, TRUE); - state = wined3d_stateblock_get_state(device->state); + state = device->stateblock_state; multiply_matrix(&mat, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD_MATRIX(0)]); multiply_matrix(&mat, &state->transforms[WINED3D_TS_PROJECTION], &mat);

1 0

Matteo Bruni : wined3d: Optimize scanning for changed state in wined3d_stateblock_apply().
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 97e1c1414b314fda0840a92fc8e82a729ffbadf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97e1c1414b314fda0840a92f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 14:01:22 2020 +0100 wined3d: Optimize scanning for changed state in wined3d_stateblock_apply(). 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/stateblock.c | 81 +++++++++++++++++++++++------------------------ 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6d747f9731..b6c3169c4c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -985,6 +985,8 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, if (stateblock->changed.vertexShader) wined3d_stateblock_set_vertex_shader(device_state, state->vs); + if (stateblock->changed.pixelShader) + wined3d_stateblock_set_pixel_shader(device_state, state->ps); for (start = 0; ; start = range.offset + range.size) { @@ -1007,23 +1009,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_stateblock_set_vs_consts_b(device_state, range.offset, range.size, &state->vs_consts_b[range.offset]); } - if (stateblock->changed.lights) - { - for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) - { - const struct wined3d_light_info *light; - - LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) - { - wined3d_stateblock_set_light(device_state, light->OriginalIndex, &light->OriginalParms); - wined3d_stateblock_set_light_enable(device_state, light->OriginalIndex, light->glIndex != -1); - } - } - } - - if (stateblock->changed.pixelShader) - wined3d_stateblock_set_pixel_shader(device_state, state->ps); - for (start = 0; ; start = range.offset + range.size) { if (!wined3d_bitmap_get_range(stateblock->changed.ps_consts_f, WINED3D_MAX_PS_CONSTS_F, start, &range)) @@ -1045,6 +1030,30 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_stateblock_set_ps_consts_b(device_state, range.offset, range.size, &state->ps_consts_b[range.offset]); } + if (stateblock->changed.transforms) + { + for (i = 0; i < stateblock->num_contained_transform_states; ++i) + { + enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; + + wined3d_stateblock_set_transform(device_state, transform, &state->transforms[transform]); + } + } + + if (stateblock->changed.lights) + { + for (i = 0; i < ARRAY_SIZE(state->light_state->light_map); ++i) + { + const struct wined3d_light_info *light; + + LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) + { + wined3d_stateblock_set_light(device_state, light->OriginalIndex, &light->OriginalParms); + wined3d_stateblock_set_light_enable(device_state, light->OriginalIndex, light->glIndex != -1); + } + } + } + if (stateblock->changed.alpha_to_coverage) { device_state->stateblock_state.alpha_to_coverage = state->alpha_to_coverage; @@ -1079,16 +1088,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, state->sampler_states[stage][sampler_state]); } - if (stateblock->changed.transforms) - { - for (i = 0; i < stateblock->num_contained_transform_states; ++i) - { - enum wined3d_transform_state transform = stateblock->contained_transform_states[i]; - - wined3d_stateblock_set_transform(device_state, transform, &state->transforms[transform]); - } - } - if (stateblock->changed.indices) { wined3d_stateblock_set_index_buffer(device_state, state->index_buffer, state->index_format); @@ -1108,33 +1107,33 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_stateblock_set_scissor_rect(device_state, &state->scissor_rect); map = stateblock->changed.streamSource; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (map & 1) - wined3d_stateblock_set_stream_source(device_state, i, state->streams[i].buffer, - state->streams[i].offset, state->streams[i].stride); + i = wined3d_bit_scan(&map); + wined3d_stateblock_set_stream_source(device_state, i, state->streams[i].buffer, + state->streams[i].offset, state->streams[i].stride); } map = stateblock->changed.streamFreq; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (map & 1) - wined3d_stateblock_set_stream_source_freq(device_state, i, - state->streams[i].frequency | state->streams[i].flags); + i = wined3d_bit_scan(&map); + wined3d_stateblock_set_stream_source_freq(device_state, i, + state->streams[i].frequency | state->streams[i].flags); } map = stateblock->changed.textures; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (map & 1) - wined3d_stateblock_set_texture(device_state, i, state->textures[i]); + i = wined3d_bit_scan(&map); + wined3d_stateblock_set_texture(device_state, i, state->textures[i]); } map = stateblock->changed.clipplane; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (map & 1) - wined3d_stateblock_set_clip_plane(device_state, i, &state->clip_planes[i]); + i = wined3d_bit_scan(&map); + wined3d_stateblock_set_clip_plane(device_state, i, &state->clip_planes[i]); } TRACE("Applied stateblock %p.\n", stateblock);

1 0

Matteo Bruni : wined3d: Optimize scanning for changed state in wined3d_stateblock_capture().
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: f4788c4b089e7cfd5ebfa0795e2255d0181b5986 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4788c4b089e7cfd5ebfa079… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 14:01:21 2020 +0100 wined3d: Optimize scanning for changed state in wined3d_stateblock_capture(). 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/stateblock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index db0019adbf..6d747f9731 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -852,9 +852,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, } map = stateblock->changed.streamSource; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); if (stateblock->stateblock_state.streams[i].stride != state->streams[i].stride || stateblock->stateblock_state.streams[i].offset != state->streams[i].offset @@ -877,9 +877,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, } map = stateblock->changed.streamFreq; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); if (stateblock->stateblock_state.streams[i].frequency != state->streams[i].frequency || stateblock->stateblock_state.streams[i].flags != state->streams[i].flags) @@ -893,9 +893,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, } map = stateblock->changed.clipplane; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); if (memcmp(&stateblock->stateblock_state.clip_planes[i], &state->clip_planes[i], sizeof(state->clip_planes[i]))) { @@ -929,9 +929,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, /* Samplers */ map = stateblock->changed.textures; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; + i = wined3d_bit_scan(&map); TRACE("Updating texture %u to %p (was %p).\n", i, state->textures[i], stateblock->stateblock_state.textures[i]);

1 0

Zhiyi Zhang : d3d9/tests: Fix a test failure with Win10 WARP.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 94c1f89e103211e63b599c958a1aabba66e9ae1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=94c1f89e103211e63b599c95… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:35:04 2020 +0800 d3d9/tests: Fix a test failure with Win10 WARP. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 62146d6932..16f42216cf 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -9653,6 +9653,7 @@ out: static void test_update_volumetexture(void) { + D3DADAPTER_IDENTIFIER9 identifier; IDirect3DDevice9 *device; IDirect3D9 *d3d9; HWND window; @@ -9662,6 +9663,7 @@ static void test_update_volumetexture(void) D3DLOCKED_BOX locked_box; ULONG refcount; D3DCAPS9 caps; + BOOL is_warp; static const struct { D3DPOOL src_pool, dst_pool; @@ -9710,6 +9712,9 @@ static void test_update_volumetexture(void) window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); + hr = IDirect3D9_GetAdapterIdentifier(d3d9, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + is_warp = adapter_is_warp(&identifier); if (!(device = create_device(d3d9, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -9780,7 +9785,8 @@ static void test_update_volumetexture(void) hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); todo_wine_if (FAILED(hr)) - ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + ok(SUCCEEDED(hr) || (is_warp && (i == 6 || i == 7)), /* Fails with Win10 WARP driver */ + "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture9_Release(src); IDirect3DVolumeTexture9_Release(dst);

1 0

Zhiyi Zhang : d3d8/tests: Fix a test failure with Win10 WARP.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 05dd1e1804e91eb71218a161885feae7632ac66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=05dd1e1804e91eb71218a161… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:34:54 2020 +0800 d3d8/tests: Fix a test failure with Win10 WARP. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index dd1e479cb2..42eee28217 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6497,6 +6497,7 @@ out: static void test_update_volumetexture(void) { + D3DADAPTER_IDENTIFIER8 identifier; IDirect3DDevice8 *device; IDirect3D8 *d3d8; HWND window; @@ -6506,6 +6507,7 @@ static void test_update_volumetexture(void) D3DLOCKED_BOX locked_box; ULONG refcount; D3DCAPS8 caps; + BOOL is_warp; static const struct { D3DPOOL src_pool, dst_pool; @@ -6554,6 +6556,9 @@ static void test_update_volumetexture(void) window = create_window(); d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); + hr = IDirect3D8_GetAdapterIdentifier(d3d8, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + is_warp = adapter_is_warp(&identifier); if (!(device = create_device(d3d8, window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -6624,7 +6629,8 @@ static void test_update_volumetexture(void) hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)src, (IDirect3DBaseTexture8 *)dst); todo_wine_if (FAILED(hr)) - ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); + ok(SUCCEEDED(hr) || (is_warp && (i == 6 || i == 7)), /* Fails with Win10 WARP driver */ + "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture8_Release(src); IDirect3DVolumeTexture8_Release(dst);

1 0

Zhiyi Zhang : d3d9/tests: Test device caps on multiple adapters.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 96f37f7af9cbfa5576d6d12d3b297b6b0b51ebda URL: https://source.winehq.org/git/wine.git/?a=commit;h=96f37f7af9cbfa5576d6d12d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:34:26 2020 +0800 d3d9/tests: Test device caps on multiple adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 312 +++++++++++++++++++++++++++++------------------ 1 file changed, 192 insertions(+), 120 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96f37f7af9cbfa5576d6…

1 0

Zhiyi Zhang : d3d8/tests: Test device caps on multiple adapters.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: e106a460f56a3e9d1d07c4cb169028611fef114f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e106a460f56a3e9d1d07c4cb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 18 11:34:14 2020 +0800 d3d8/tests: Test device caps on multiple adapters. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 235 ++++++++++++++++++++++++++++------------------- 1 file changed, 138 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e106a460f56a3e9d1d07…

1 0

Zebediah Figura : d3d11/tests: Add a test for dual source blending.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 31e60139d37d0c973c8e8dabdc8b86c30e96f292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31e60139d37d0c973c8e8dab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 17 19:30:40 2020 -0500 d3d11/tests: Add a test for dual source blending. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 12d805d88e..729f57f443 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29993,6 +29993,76 @@ static void test_independent_blend(void) release_test_context(&test_context); } +static void test_dual_source_blend(void) +{ + struct d3d11_test_context test_context; + ID3D11BlendState *blend_state; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out float4 t0 : SV_Target0, out float4 t1 : SV_Target1) + { + t0 = float4(0.5, 0.5, 0.0, 1.0); + t1 = float4(0.0, 0.5, 0.5, 0.0); + } +#endif + 0x43425844, 0x87120d01, 0xa0014738, 0x3a32d86c, 0x9d757441, 0x00000001, 0x00000118, 0x00000003, + 0x0000002c, 0x00000060, 0x000000ac, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x03000065, + 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000001, + 0x00004002, 0x00000000, 0x3f000000, 0x3f000000, 0x00000000, 0x0100003e + }; + + static const D3D11_BLEND_DESC blend_desc = + { + .RenderTarget[0].BlendEnable = TRUE, + .RenderTarget[0].SrcBlend = D3D11_BLEND_SRC1_COLOR, + .RenderTarget[0].DestBlend = D3D11_BLEND_SRC1_COLOR, + .RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD, + .RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE, + .RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ZERO, + .RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD, + .RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL, + }; + + static const float clear_color[] = {0.7f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState_Release(blend_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, clear_color); + draw_quad(&test_context); + + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(compare_color(color, 0x80804000, 1), "Got unexpected color 0x%08x.\n", color); + + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -30155,6 +30225,7 @@ START_TEST(d3d11) queue_test(test_sample_attached_rtv); queue_test(test_color_mask); queue_test(test_independent_blend); + queue_test(test_dual_source_blend); run_queued_tests(); }

1 0

Zebediah Figura : d3d10core/tests: Add a test for dual source blending.
by Alexandre Julliard 18 Mar '20

18 Mar '20

Module: wine Branch: master Commit: 0d6d104513a99bb9cf539a5e1a586a2fb0713864 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d6d104513a99bb9cf539a5e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 17 19:30:39 2020 -0500 d3d10core/tests: Add a test for dual source blending. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 3d35ed53c8..b5b5715282 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18286,6 +18286,73 @@ static void test_independent_blend(void) release_test_context(&test_context); } +static void test_dual_source_blend(void) +{ + struct d3d10core_test_context test_context; + ID3D10BlendState *blend_state; + D3D10_BLEND_DESC blend_desc; + ID3D10PixelShader *ps; + ID3D10Device *device; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(float4 position : SV_Position, + out float4 t0 : SV_Target0, out float4 t1 : SV_Target1) + { + t0 = float4(0.5, 0.5, 0.0, 1.0); + t1 = float4(0.0, 0.5, 0.5, 0.0); + } +#endif + 0x43425844, 0x87120d01, 0xa0014738, 0x3a32d86c, 0x9d757441, 0x00000001, 0x00000118, 0x00000003, + 0x0000002c, 0x00000060, 0x000000ac, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x00000044, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000038, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, 0x03000065, + 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x3f000000, 0x08000036, 0x001020f2, 0x00000001, + 0x00004002, 0x00000000, 0x3f000000, 0x3f000000, 0x00000000, 0x0100003e + }; + + static const float clear_color[] = {0.7f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.BlendEnable[0] = TRUE; + blend_desc.SrcBlend = D3D10_BLEND_SRC1_COLOR; + blend_desc.DestBlend = D3D10_BLEND_SRC1_COLOR; + blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; + blend_desc.DestBlendAlpha = D3D10_BLEND_ZERO; + blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(hr == S_OK, "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, clear_color); + draw_quad(&test_context); + + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(compare_color(color, 0x80804000, 1), "Got unexpected color 0x%08x.\n", color); + + ID3D10BlendState_Release(blend_state); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -18406,6 +18473,7 @@ START_TEST(d3d10core) queue_test(test_desktop_window); queue_test(test_color_mask); queue_test(test_independent_blend); + queue_test(test_dual_source_blend); run_queued_tests();

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020