Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/wined3d/stateblock.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 64a900fbde4..0ff3199525f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1366,6 +1366,26 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stat return WINED3D_OK; }
+HRESULT CDECL wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) +{ + unsigned int i; + + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) + return WINED3DERR_INVALIDCALL; + + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + + memcpy(&stateblock->stateblock_state.ps_consts_i[start_idx], constants, count * sizeof(*constants)); + for (i = start_idx; i < count + start_idx; ++i) + stateblock->changed.pixelShaderConstantsI |= (1u << i); + return WINED3D_OK; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 016cf55c032..9772874c8be 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,7 @@ @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) +@ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long 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) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index c4c469d4fe4..215e50116cd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2663,6 +2663,8 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); +HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); 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);
Signed-off-by: Zebediah Figura z.figura12@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 539af97fbb5..daa0b1b5026 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3850,8 +3850,11 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_i(device->wined3d_device, + hr = wined3d_stateblock_set_ps_consts_i(device->update_state, reg_idx, count, (const struct wined3d_ivec4 *)data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock();
return hr;
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=57313
Your paranoid android.
=== debian10 (build log) ===
error: patch failed: dlls/wined3d/wined3d.spec:260 error: patch failed: include/wine/wined3d.h:2663 Task: Patch failed to apply
=== debian10 (build log) ===
error: patch failed: dlls/wined3d/wined3d.spec:260 error: patch failed: include/wine/wined3d.h:2663 Task: Patch failed to apply
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com
Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/wined3d/stateblock.c | 20 ++++++++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 23 insertions(+)
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0ff3199525f..dae95ae46e8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1386,6 +1386,26 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stat return WINED3D_OK; }
+HRESULT CDECL wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const BOOL *constants) +{ + unsigned int i; + + TRACE("stateblock %p, start_idx %u, count %u, constants %p.\n", + stateblock, start_idx, count, constants); + + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) + return WINED3DERR_INVALIDCALL; + + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + + memcpy(&stateblock->stateblock_state.ps_consts_b[start_idx], constants, count * sizeof(*constants)); + for (i = start_idx; i < count + start_idx; ++i) + stateblock->changed.pixelShaderConstantsB |= (1u << i); + return WINED3D_OK; +} + void CDECL wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9772874c8be..b65681f2108 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -259,6 +259,7 @@ @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) @ cdecl wined3d_stateblock_set_pixel_shader(ptr ptr) +@ cdecl wined3d_stateblock_set_ps_consts_b(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 215e50116cd..f79cd212a1e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2661,6 +2661,8 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_pixel_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader); +HRESULT __cdecl wined3d_stateblock_set_ps_consts_b(struct wined3d_stateblock *stateblock, + unsigned int start_idx, unsigned int count, const BOOL *constants); HRESULT __cdecl wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_stateblock_set_ps_consts_i(struct wined3d_stateblock *stateblock,
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=57314
Your paranoid android.
=== debian10 (build log) ===
error: patch failed: dlls/wined3d/wined3d.spec:260 error: patch failed: include/wine/wined3d.h:2663 error: patch failed: dlls/wined3d/wined3d.spec:259 error: patch failed: include/wine/wined3d.h:2661 Task: Patch failed to apply
=== debian10 (build log) ===
error: patch failed: dlls/wined3d/wined3d.spec:260 error: patch failed: include/wine/wined3d.h:2663 error: patch failed: dlls/wined3d/wined3d.spec:259 error: patch failed: include/wine/wined3d.h:2661 Task: Patch failed to apply
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com
Signed-off-by: Zebediah Figura z.figura12@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 daa0b1b5026..ee5de2f06fd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3885,7 +3885,9 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantB(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); + hr = wined3d_stateblock_set_ps_consts_b(device->update_state, reg_idx, count, data); + if (SUCCEEDED(hr) && !device->recording) + hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock();
return hr;
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=57315
Your paranoid android.
=== debian10 (build log) ===
error: patch failed: dlls/wined3d/wined3d.spec:260 error: patch failed: include/wine/wined3d.h:2663 error: patch failed: dlls/wined3d/wined3d.spec:259 error: patch failed: include/wine/wined3d.h:2661 Task: Patch failed to apply
=== debian10 (build log) ===
error: patch failed: dlls/wined3d/wined3d.spec:260 error: patch failed: include/wine/wined3d.h:2663 error: patch failed: dlls/wined3d/wined3d.spec:259 error: patch failed: include/wine/wined3d.h:2661 Task: Patch failed to apply
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com
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=57312
Your paranoid android.
=== debian10 (build log) ===
error: patch failed: dlls/wined3d/wined3d.spec:260 error: patch failed: include/wine/wined3d.h:2663 Task: Patch failed to apply
=== debian10 (build log) ===
error: patch failed: dlls/wined3d/wined3d.spec:260 error: patch failed: include/wine/wined3d.h:2663 Task: Patch failed to apply
-
Henri Verbeet -
Marvin -
Zebediah Figura