ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Make wined3d_device_get_ps_consts_b() consistent with wined3d_device_get_ps_consts_f().

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-05-17 19:42:00 +02:00 committed by Alexandre Julliard
parent 0a8951d99b
commit d701a76ca1
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d9/device.c
View File

@ -3189,7 +3189,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantB(IDirect3DDevice9Ex *if
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, data, count); hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, count, data);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;

14
dlls/wined3d/device.c
View File

@ -2640,17 +2640,17 @@ HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device,
} }
HRESULT CDECL wined3d_device_get_ps_consts_b(const struct wined3d_device *device, HRESULT CDECL wined3d_device_get_ps_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_idx %u, count %u,constants %p.\n",
device, start_idx, count, constants);
TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", if (!constants || start_idx >= WINED3D_MAX_CONSTS_B)
device, start_register, constants, bool_count);
if (!constants || start_register >= WINED3D_MAX_CONSTS_B)
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
memcpy(constants, &device->state.ps_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.ps_consts_b[start_idx], count * sizeof(*constants));
return WINED3D_OK; return WINED3D_OK;
} }

2
dlls/wined3d/wined3d.spec
View File

@ -70,7 +70,7 @@
@ cdecl wined3d_device_get_predication(ptr ptr) @ cdecl wined3d_device_get_predication(ptr ptr)
@ cdecl wined3d_device_get_primitive_type(ptr ptr) @ cdecl wined3d_device_get_primitive_type(ptr ptr)
@ cdecl wined3d_device_get_ps_cb(ptr long) @ 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_b(ptr long long ptr)
@ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr)
@ cdecl wined3d_device_get_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_ps_consts_i(ptr long long ptr)
@ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_resource_view(ptr long)

2
include/wine/wined3d.h
View File

@ -2123,7 +2123,7 @@ void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *devi
enum wined3d_primitive_type *primitive_topology); enum wined3d_primitive_type *primitive_topology);
struct wined3d_buffer * __cdecl wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx); struct wined3d_buffer * __cdecl wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx);
HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_ps_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_ps_consts_f(const struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device,
unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants);
HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device,