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

wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i(). 

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 14:01:53 +02:00 committed by Alexandre Julliard
parent 596f707797
commit f69cf783df
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3d9/device.c
View File

@ -3158,7 +3158,8 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantI(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_i(device->wined3d_device, reg_idx, data, count);
hr = wined3d_device_get_ps_consts_i(device->wined3d_device,
reg_idx, count, (struct wined3d_ivec4 *)data);
wined3d_mutex_unlock();
return hr;

14
dlls/wined3d/device.c
View File

@ -2681,17 +2681,17 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device,
}
HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device,
UINT start_register, int *constants, UINT vector4i_count)
unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants)
{
UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - 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, vector4i_count %u.\n",
device, start_register, constants, vector4i_count);
if (!constants || start_register >= WINED3D_MAX_CONSTS_I)
if (!constants || start_idx >= WINED3D_MAX_CONSTS_I)
return WINED3DERR_INVALIDCALL;
memcpy(constants, &device->state.ps_consts_i[start_register], count * sizeof(int) * 4);
if (count > WINED3D_MAX_CONSTS_I - start_idx)
count = WINED3D_MAX_CONSTS_I - start_idx;
memcpy(constants, &device->state.ps_consts_i[start_idx], count * sizeof(*constants));
return WINED3D_OK;
}

2
dlls/wined3d/wined3d.spec
View File

@ -72,7 +72,7 @@
@ 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 long ptr)
@ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long)
@ 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_sampler(ptr long)
@ cdecl wined3d_device_get_raster_status(ptr long ptr)

2
include/wine/wined3d.h
View File

@ -2127,7 +2127,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *devi
HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device,
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);
unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants);
struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device,
UINT idx);
struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx);