June 2021 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in glsl_blitter_blit().
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: d5fa539749213fbc43f596ef483617c9084c854f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5fa539749213fbc43f596ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:30 2021 +0200 wined3d: Use wined3d_mask_from_size() in glsl_blitter_blit(). 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 ccfd5f3f28e..5d0e7b13bd4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13215,7 +13215,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli const struct wined3d_format *f = src_texture->resource.format; alpha_test_key.color_space_low_value = 0; - alpha_test_key.color_space_high_value = ~(((1u << f->alpha_size) - 1) << f->alpha_offset); + alpha_test_key.color_space_high_value = ~(wined3d_mask_from_size(f->alpha_size) << f->alpha_offset); colour_key = &alpha_test_key; } else if (op != WINED3D_BLIT_OP_COLOR_BLIT_CKEY)

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in arbfp_blitter_blit().
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 260b11a193b3f7b69722369ca26d2f7268c1f2c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=260b11a193b3f7b69722369c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:29 2021 +0200 wined3d: Use wined3d_mask_from_size() in arbfp_blitter_blit(). 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 e297c724412..1b533107f64 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7922,7 +7922,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl { const struct wined3d_format *fmt = src_texture->resource.format; alpha_test_key.color_space_low_value = 0; - alpha_test_key.color_space_high_value = ~(((1u << fmt->alpha_size) - 1) << fmt->alpha_offset); + alpha_test_key.color_space_high_value = ~(wined3d_mask_from_size(fmt->alpha_size) << fmt->alpha_offset); color_key = &alpha_test_key; }

1 0

Hugh McMaster : reg/tests: Remove duplicate test from test_registry_view_wow64().
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 8ad9c21b056d9f3119c363e0f7e56198985d5b08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ad9c21b056d9f3119c363e0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 25 22:58:11 2021 +1000 reg/tests: Remove duplicate test from test_registry_view_wow64(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index bb72c4a3737..36fa634796d 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -961,10 +961,6 @@ static void test_registry_view_wow64(void) run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); - close_key(hkey); - open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); close_key(hkey);

1 0

Akihiro Sagawa : ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: c94ac2e0619ab31bc3138f17786e7cac00a95bcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c94ac2e0619ab31bc3138f17… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jun 25 18:47:00 2021 +0900 ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index cacb95853ad..58983aca194 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -231,7 +231,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U goto out; } - if (*file_part) *file_part = NULL; + if (file_part) *file_part = NULL; sz = LOWORD(dosdev);

1 0

Zebediah Figura : wined3d: Return the map pitch in wined3d_device_context_map().
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 61024aa12f7752014924f30657e2adb80148f312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61024aa12f7752014924f306… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 15:29:06 2021 -0500 wined3d: Return the map pitch in wined3d_device_context_map(). 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/wined3d/buffer.c | 19 ++++++++++------ dlls/wined3d/cs.c | 18 +++++++-------- dlls/wined3d/device.c | 6 ++++- dlls/wined3d/texture.c | 50 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 13 ++++++++--- 5 files changed, 65 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61024aa12f7752014924…

1 0

Alexandre Julliard : ntdll/tests: Move Wow64 tests to a separate file.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: d66bd3e8b1fdf9eacef3864a5c019323cff2c782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d66bd3e8b1fdf9eacef3864a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 25 17:41:16 2021 +0200 ntdll/tests: Move Wow64 tests to a separate file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/Makefile.in | 3 +- dlls/ntdll/tests/info.c | 414 -------------------------------------- dlls/ntdll/tests/wow64.c | 467 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 469 insertions(+), 415 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d66bd3e8b1fdf9eacef3…

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces to create buffers.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 63b7afb15473a4c12e6d9b208812efa902524445 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b7afb15473a4c12e6d9b20… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 09:34:01 2021 +0200 d2d1: Use D3D11 interfaces to create buffers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(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/device.c | 211 ++++++++++++++++++++++++++++++----------------- 2 files changed, 138 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=63b7afb15473a4c12e6d…

1 0

Henri Verbeet : wined3d: Use wined3d_mask_from_size() in find_draw_buffers_mask().
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 64ab905758e74f4214d27b85437fa1032472b7aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ab905758e74f4214d27b85… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 25 15:01:32 2021 +0200 wined3d: Use wined3d_mask_from_size() in find_draw_buffers_mask(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 742dc5f3042..474003d7553 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3310,7 +3310,7 @@ static uint32_t find_draw_buffers_mask(const struct wined3d_context_gl *context_ return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; - rt_mask &= (1u << gl_info->limits.buffers) - 1; + rt_mask &= wined3d_mask_from_size(gl_info->limits.buffers); if (state->blend_state && state->blend_state->dual_source) rt_mask = 1;

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces to create input layout.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 072d90b19f6ea1674c7a900aa1e1eb8afaf329c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=072d90b19f6ea1674c7a900a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 09:34:02 2021 +0200 d2d1: Use D3D11 interfaces to create input layout. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(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 | 2 +- dlls/d2d1/device.c | 50 ++++++++++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index e85c93ec277..0f4b52f4c3e 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -73,7 +73,7 @@ struct d2d_error_state struct d2d_shape_resources { - ID3D10InputLayout *il; + ID3D11InputLayout *il; ID3D10VertexShader *vs; }; diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 5242342c454..10b555c080f 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -125,6 +125,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device *device = render_target->d3d_device; ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; + ID3D10InputLayout *d3d10_il = NULL; D3D10_RECT scissor_rect; unsigned int offset; D3D10_VIEWPORT vp; @@ -161,6 +162,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en goto error; } + if (shape_resources->il && FAILED(hr = ID3D11InputLayout_QueryInterface(shape_resources->il, &IID_ID3D10InputLayout, (void **)&d3d10_il))) + { + ERR("Failed to query D3D10 input layout, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -169,7 +176,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device_ClearState(device); - ID3D10Device_IASetInputLayout(device, shape_resources->il); + ID3D10Device_IASetInputLayout(device, d3d10_il); ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST); ID3D10Device_IASetIndexBuffer(device, d3d10_ib, DXGI_FORMAT_R16_UINT, 0); offset = 0; @@ -216,6 +223,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); error: + if (d3d10_il) ID3D10InputLayout_Release(d3d10_il); if (d3d10_ib) ID3D10Buffer_Release(d3d10_ib); if (d3d10_vb) ID3D10Buffer_Release(d3d10_vb); if (d3d10_vs_cb) ID3D10Buffer_Release(d3d10_vs_cb); @@ -303,7 +311,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { ID3D10VertexShader_Release(context->shape_resources[i].vs); - ID3D10InputLayout_Release(context->shape_resources[i].il); + ID3D11InputLayout_Release(context->shape_resources[i].il); } for (i = 0; i < D2D_SAMPLER_INTERPOLATION_MODE_COUNT; ++i) { @@ -2840,29 +2848,29 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, unsigned int i; HRESULT hr; - static const D3D10_INPUT_ELEMENT_DESC il_desc_outline[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_outline[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_curve_outline[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_curve_outline[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"P", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"P", 1, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"P", 2, DXGI_FORMAT_R32G32_FLOAT, 0, 24, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 32, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 40, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"P", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"P", 1, DXGI_FORMAT_R32G32_FLOAT, 0, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"P", 2, DXGI_FORMAT_R32G32_FLOAT, 0, 24, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"PREV", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 32, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"NEXT", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 40, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_triangle[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_triangle[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const D3D10_INPUT_ELEMENT_DESC il_desc_curve[] = + static const D3D11_INPUT_ELEMENT_DESC il_desc_curve[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, - {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"TEXCOORD", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 8, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; static const DWORD vs_code_outline[] = { @@ -3856,7 +3864,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, static const struct shape_info { enum d2d_shape_type shape_type; - const D3D10_INPUT_ELEMENT_DESC *il_desc; + const D3D11_INPUT_ELEMENT_DESC *il_desc; unsigned int il_element_count; const void *vs_code; size_t vs_code_size; @@ -3931,7 +3939,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, { const struct shape_info *si = &shape_info[i]; - if (FAILED(hr = ID3D10Device_CreateInputLayout(render_target->d3d_device, si->il_desc, si->il_element_count, + if (FAILED(hr = ID3D11Device1_CreateInputLayout(render_target->d3d11_device, si->il_desc, si->il_element_count, si->vs_code, si->vs_code_size, &render_target->shape_resources[si->shape_type].il))) { WARN("Failed to create input layout for shape type %#x, hr %#x.\n", si->shape_type, hr); @@ -4074,7 +4082,7 @@ err: if (render_target->shape_resources[i].vs) ID3D10VertexShader_Release(render_target->shape_resources[i].vs); if (render_target->shape_resources[i].il) - ID3D10InputLayout_Release(render_target->shape_resources[i].il); + ID3D11InputLayout_Release(render_target->shape_resources[i].il); } if (render_target->stateblock) render_target->stateblock->lpVtbl->Release(render_target->stateblock);

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces to create vertex shader.
by Alexandre Julliard June 25, 2021

June 25, 2021

Module: wine Branch: master Commit: 629fa331bb55d5c9a3a565ec664dd63104175cc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=629fa331bb55d5c9a3a565ec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 09:34:03 2021 +0200 d2d1: Use D3D11 interfaces to create vertex shader. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(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 | 2 +- dlls/d2d1/device.c | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0f4b52f4c3e..565288bc71c 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -74,7 +74,7 @@ struct d2d_error_state struct d2d_shape_resources { ID3D11InputLayout *il; - ID3D10VertexShader *vs; + ID3D11VertexShader *vs; }; struct d2d_brush_cb diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 10b555c080f..acb01a35868 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -125,6 +125,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device *device = render_target->d3d_device; ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; + ID3D10VertexShader *d3d10_vs = NULL; ID3D10InputLayout *d3d10_il = NULL; D3D10_RECT scissor_rect; unsigned int offset; @@ -168,6 +169,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en goto error; } + if (shape_resources->vs && FAILED(hr = ID3D11VertexShader_QueryInterface(shape_resources->vs, &IID_ID3D10VertexShader, (void **)&d3d10_vs))) + { + ERR("Failed to query D3D10 vertex shader, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -182,7 +189,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en offset = 0; ID3D10Device_IASetVertexBuffers(device, 0, 1, &d3d10_vb, &vb_stride, &offset); ID3D10Device_VSSetConstantBuffers(device, 0, 1, &d3d10_vs_cb); - ID3D10Device_VSSetShader(device, shape_resources->vs); + ID3D10Device_VSSetShader(device, d3d10_vs); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &d3d10_ps_cb); ID3D10Device_PSSetShader(device, render_target->ps); ID3D10Device_RSSetViewports(device, 1, &vp); @@ -223,6 +230,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); error: + if (d3d10_vs) ID3D10VertexShader_Release(d3d10_vs); if (d3d10_il) ID3D10InputLayout_Release(d3d10_il); if (d3d10_ib) ID3D10Buffer_Release(d3d10_ib); if (d3d10_vb) ID3D10Buffer_Release(d3d10_vb); @@ -310,7 +318,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) ID3D11Buffer_Release(context->vs_cb); for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { - ID3D10VertexShader_Release(context->shape_resources[i].vs); + ID3D11VertexShader_Release(context->shape_resources[i].vs); ID3D11InputLayout_Release(context->shape_resources[i].il); } for (i = 0; i < D2D_SAMPLER_INTERPOLATION_MODE_COUNT; ++i) @@ -3946,8 +3954,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, goto err; } - if (FAILED(hr = ID3D10Device_CreateVertexShader(render_target->d3d_device, si->vs_code, - si->vs_code_size, &render_target->shape_resources[si->shape_type].vs))) + if (FAILED(hr = ID3D11Device1_CreateVertexShader(render_target->d3d11_device, si->vs_code, + si->vs_code_size, NULL, &render_target->shape_resources[si->shape_type].vs))) { WARN("Failed to create vertex shader for shape type %#x, hr %#x.\n", si->shape_type, hr); goto err; @@ -4080,7 +4088,7 @@ err: for (i = 0; i < D2D_SHAPE_TYPE_COUNT; ++i) { if (render_target->shape_resources[i].vs) - ID3D10VertexShader_Release(render_target->shape_resources[i].vs); + ID3D11VertexShader_Release(render_target->shape_resources[i].vs); if (render_target->shape_resources[i].il) ID3D11InputLayout_Release(render_target->shape_resources[i].il); }

1 0