Module: wine Branch: master Commit: 1fe83c0d7e4af20a50132aabedc570c5f4f2babe URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe83c0d7e4af20a50132aabed...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Apr 26 17:56:01 2016 +0200
wined3d: Pass wined3d_vec4 structures to wined3d_device_get_ps_consts_f().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 21de2d6..ed953fe 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2746,7 +2746,7 @@ static HRESULT WINAPI d3d8_device_GetPixelShaderConstant(IDirect3DDevice8 *iface iface, start_register, data, count);
wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, start_register, data, count); + hr = wined3d_device_get_ps_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock();
return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index ce67292..b0ef724 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3124,7 +3124,8 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantF(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_f(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_ps_consts_f(device->wined3d_device, + reg_idx, count, (struct wined3d_vec4 *)data); wined3d_mutex_unlock();
return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9af2b70..e0a7370 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2722,18 +2722,18 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, }
HRESULT CDECL wined3d_device_get_ps_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count) + unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants) { const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; - int count = min(vector4f_count, d3d_info->limits.ps_uniform_count - start_register);
- TRACE("device %p, start_register %u, constants %p, vector4f_count %u.\n", - device, start_register, constants, vector4f_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants);
- if (!constants || count < 0) + if (!constants || start_idx >= d3d_info->limits.ps_uniform_count + || count > d3d_info->limits.ps_uniform_count - start_idx) return WINED3DERR_INVALIDCALL;
- memcpy(constants, &device->state.ps_consts_f[start_register], count * sizeof(float) * 4); + memcpy(constants, &device->state.ps_consts_f[start_idx], count * sizeof(*constants));
return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 42039f6..4eb2470 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -71,7 +71,7 @@ @ cdecl wined3d_device_get_primitive_type(ptr ptr) @ cdecl wined3d_device_get_ps_cb(ptr long) @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) -@ cdecl wined3d_device_get_ps_consts_f(ptr long ptr long) +@ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) @ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5eea884..4cfe1e0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2117,7 +2117,7 @@ struct wined3d_buffer * __cdecl wined3d_device_get_ps_cb(const struct wined3d_de HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, - UINT start_register, float *constants, UINT vector4f_count); + unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device,