[PATCH 1/6] wined3d: Introduce wined3d_stateblock_set_vertex_shader().
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 12 ++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dfe6ab47c76..83001253d33 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1274,6 +1274,18 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) TRACE("Applied stateblock %p.\n", stateblock); } +void CDECL wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader) +{ + TRACE("stateblock %p, shader %p.\n", stateblock, shader); + + if (shader) + wined3d_shader_incref(shader); + if (stateblock->stateblock_state.vs) + wined3d_shader_decref(stateblock->stateblock_state.vs); + stateblock->stateblock_state.vs = shader; + stateblock->changed.vertexShader = TRUE; +} + HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f88da75306a..1f75721792c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3a06f650aac..5bc33f82322 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, -- 2.23.0
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index faf4cb7ea6d..6917ad577c4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3422,8 +3422,11 @@ static HRESULT WINAPI d3d9_device_SetVertexShader(IDirect3DDevice9Ex *iface, IDi TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); - wined3d_device_set_vertex_shader(device->wined3d_device, + wined3d_stateblock_set_vertex_shader(device->update_state, shader_obj ? shader_obj->wined3d_shader : NULL); + if (!device->recording) + wined3d_device_set_vertex_shader(device->wined3d_device, + shader_obj ? shader_obj->wined3d_shader : NULL); wined3d_mutex_unlock(); return D3D_OK; -- 2.23.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57199 Your paranoid android. === debian10 (32 bit report) === d3d9: d3d9ex.c:3133: Test failed: Expected message 0x46 for window 0x1, but didn't receive it, i=0. === debian10 (32 bit WoW report) === d3d9: d3d9ex.c:3133: Test failed: Expected message 0x46 for window 0x1, but didn't receive it, i=0.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/stateblock.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 16 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 83001253d33..4268d085a75 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1340,6 +1340,19 @@ HRESULT CDECL wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stat return WINED3D_OK; } +void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, + struct wined3d_vertex_declaration *declaration) +{ + TRACE("stateblock %p, declaration %p.\n", stateblock, declaration); + + if (declaration) + wined3d_vertex_declaration_incref(declaration); + if (stateblock->stateblock_state.vertex_declaration) + wined3d_vertex_declaration_decref(stateblock->stateblock_state.vertex_declaration); + stateblock->stateblock_state.vertex_declaration = declaration; + stateblock->changed.vertexDecl = TRUE; +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 1f75721792c..975de561d0b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,6 +258,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5bc33f82322..1bf103c8a49 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2660,6 +2660,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, + struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_vs_consts_b(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const BOOL *constants); -- 2.23.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57200 Your paranoid android. === debian10 (32 bit report) === d3d9: d3d9ex.c:3133: Test failed: Expected message 0x46 for window 0x1, but didn't receive it, i=0. === debian10 (32 bit Chinese:China report) === d3d9: d3d9ex.c:3133: Test failed: Expected message 0x46 for window 0x1, but didn't receive it, i=0. === debian10 (32 bit WoW report) === d3d9: d3d9ex.c:3133: Test failed: Expected message 0x46 for window 0x1, but didn't receive it, i=0.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 6917ad577c4..7d24703795b 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3232,8 +3232,11 @@ static HRESULT WINAPI d3d9_device_SetVertexDeclaration(IDirect3DDevice9Ex *iface TRACE("iface %p, declaration %p.\n", iface, declaration); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->update_state, decl_impl ? decl_impl->wined3d_declaration : NULL); + if (!device->recording) + wined3d_device_set_vertex_declaration(device->wined3d_device, + decl_impl ? decl_impl->wined3d_declaration : NULL); device->has_vertex_declaration = !!decl_impl; wined3d_mutex_unlock(); -- 2.23.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57201 Your paranoid android. === debian10 (32 bit report) === d3d9: d3d9ex.c:3133: Test failed: Expected message 0x46 for window 0x1, but didn't receive it, i=0. === debian10 (32 bit Chinese:China report) === d3d9: d3d9ex.c:3133: Test failed: Expected message 0x46 for window 0x1, but didn't receive it, i=0.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7d24703795b..26b1b982f8d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3359,7 +3359,9 @@ static HRESULT WINAPI d3d9_device_SetFVF(IDirect3DDevice9Ex *iface, DWORD fvf) return D3DERR_DRIVERINTERNALERROR; } - wined3d_device_set_vertex_declaration(device->wined3d_device, decl); + wined3d_stateblock_set_vertex_declaration(device->update_state, decl); + if (!device->recording) + wined3d_device_set_vertex_declaration(device->wined3d_device, decl); device->has_vertex_declaration = TRUE; wined3d_mutex_unlock(); -- 2.23.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57202 Your paranoid android. === debian10 (32 bit WoW report) === d3d9: d3d9ex.c:3133: Test failed: Expected message 0x46 for window 0x1, but didn't receive it, i=0.
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/device.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index be43314d3c6..eabefd80433 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2814,9 +2814,15 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD TRACE("Setting FVF, %#x\n", shader); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->update_state, d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration); - wined3d_device_set_vertex_shader(device->wined3d_device, NULL); + wined3d_stateblock_set_vertex_shader(device->update_state, NULL); + if (!device->recording) + { + wined3d_device_set_vertex_declaration(device->wined3d_device, + d3d8_device_get_fvf_declaration(device, shader)->wined3d_vertex_declaration); + wined3d_device_set_vertex_shader(device->wined3d_device, NULL); + } wined3d_mutex_unlock(); return D3D_OK; @@ -2833,9 +2839,15 @@ static HRESULT WINAPI d3d8_device_SetVertexShader(IDirect3DDevice8 *iface, DWORD return D3DERR_INVALIDCALL; } - wined3d_device_set_vertex_declaration(device->wined3d_device, + wined3d_stateblock_set_vertex_declaration(device->update_state, shader_impl->vertex_declaration->wined3d_vertex_declaration); - wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); + wined3d_stateblock_set_vertex_shader(device->update_state, shader_impl->wined3d_shader); + if (!device->recording) + { + wined3d_device_set_vertex_declaration(device->wined3d_device, + shader_impl->vertex_declaration->wined3d_vertex_declaration); + wined3d_device_set_vertex_shader(device->wined3d_device, shader_impl->wined3d_shader); + } wined3d_mutex_unlock(); return D3D_OK; -- 2.23.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57203 Your paranoid android. === debian10 (32 bit report) === d3d8: device.c:3165: Test failed: Expected message 0x1c for window 0x1, but didn't receive it
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
participants (3)
-
Henri Verbeet -
Marvin -
Zebediah Figura