Module: wine Branch: master Commit: 9c8c391146b529b497101374269476cb6c6cff0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c8c391146b529b49710137426...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue May 17 19:41:58 2016 +0200
wined3d: Make wined3d_device_get_vs_consts_b() consistent with wined3d_device_get_vs_consts_f().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0d28826..25ed842 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2899,7 +2899,7 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantB(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock();
return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec489e9..1761829 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2407,17 +2407,17 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, }
HRESULT CDECL wined3d_device_get_vs_consts_b(const struct wined3d_device *device, - UINT start_register, BOOL *constants, UINT bool_count) + unsigned int start_idx, unsigned int count, BOOL *constants) { - UINT count = min(bool_count, WINED3D_MAX_CONSTS_B - start_register); - - TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", - device, start_register, constants, bool_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants);
- if (!constants || start_register >= WINED3D_MAX_CONSTS_B) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) return WINED3DERR_INVALIDCALL;
- memcpy(constants, &device->state.vs_consts_b[start_register], count * sizeof(BOOL)); + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + memcpy(constants, &device->state.vs_consts_b[start_idx], count * sizeof(*constants));
return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 2495120..e7f7ca2 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -93,7 +93,7 @@ @ cdecl wined3d_device_get_vertex_shader(ptr) @ cdecl wined3d_device_get_viewport(ptr ptr) @ cdecl wined3d_device_get_vs_cb(ptr long) -@ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) +@ cdecl wined3d_device_get_vs_consts_b(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_vs_resource_view(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2020475..9eb0f46 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2159,7 +2159,7 @@ struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wi void __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, struct wined3d_viewport *viewport); struct wined3d_buffer * __cdecl wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, - UINT start_register, BOOL *constants, UINT bool_count); + unsigned int start_idx, unsigned int count, BOOL *constants); HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device,