[PATCH 08/12] wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_ps_consts_i().
Henri Verbeet
hverbeet at codeweavers.com
Tue May 17 07:01:52 CDT 2016
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
dlls/d3d9/device.c | 3 ++-
dlls/wined3d/device.c | 26 ++++++++++++++------------
dlls/wined3d/stateblock.c | 2 +-
dlls/wined3d/wined3d.spec | 2 +-
include/wine/wined3d.h | 2 +-
5 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 8f46fcd..bfbee07 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3142,7 +3142,8 @@ 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, reg_idx, data, count);
+ hr = wined3d_device_set_ps_consts_i(device->wined3d_device,
+ reg_idx, count, (const struct wined3d_ivec4 *)data);
wined3d_mutex_unlock();
return hr;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 97defbc..345a8b5 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2648,26 +2648,28 @@ HRESULT CDECL wined3d_device_get_ps_consts_b(const struct wined3d_device *device
}
HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device,
- UINT start_register, const int *constants, UINT vector4i_count)
+ unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants)
{
- UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register);
- UINT i;
+ unsigned int i;
- TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n",
- device, start_register, constants, vector4i_count);
+ TRACE("device %p, start_idx %u, count %u, constants %p.\n",
+ device, start_idx, count, constants);
- if (!constants || start_register >= WINED3D_MAX_CONSTS_I)
+ if (!constants || start_idx >= WINED3D_MAX_CONSTS_I)
return WINED3DERR_INVALIDCALL;
- memcpy(&device->update_state->ps_consts_i[start_register], constants, count * sizeof(int) * 4);
- for (i = 0; i < count; ++i)
- TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i,
- constants[i * 4], constants[i * 4 + 1],
- constants[i * 4 + 2], constants[i * 4 + 3]);
+ if (count > WINED3D_MAX_CONSTS_I - start_idx)
+ count = WINED3D_MAX_CONSTS_I - start_idx;
+ memcpy(&device->update_state->ps_consts_i[start_idx], constants, count * sizeof(*constants));
+ if (TRACE_ON(d3d))
+ {
+ for (i = 0; i < count; ++i)
+ TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i]));
+ }
if (device->recording)
{
- for (i = start_register; i < count + start_register; ++i)
+ for (i = start_idx; i < count + start_idx; ++i)
device->recording->changed.pixelShaderConstantsI |= (1u << i);
}
else
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index b648034..b76a5c0 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -928,7 +928,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i)
{
wined3d_device_set_ps_consts_i(device, stateblock->contained_ps_consts_i[i],
- &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]].x, 1);
+ 1, &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]]);
}
for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i)
{
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index d81e065..4219b53 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -131,7 +131,7 @@
@ cdecl wined3d_device_set_ps_cb(ptr long ptr)
@ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long)
@ cdecl wined3d_device_set_ps_consts_f(ptr long long ptr)
-@ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long)
+@ cdecl wined3d_device_set_ps_consts_i(ptr long long ptr)
@ cdecl wined3d_device_set_ps_resource_view(ptr long ptr)
@ cdecl wined3d_device_set_ps_sampler(ptr long ptr)
@ cdecl wined3d_device_set_render_state(ptr long long)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 8ddf560..b01e8e4 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2219,7 +2219,7 @@ HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device,
HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device,
unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants);
HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device,
- UINT start_register, const int *constants, UINT vector4i_count);
+ unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants);
void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device,
UINT idx, struct wined3d_shader_resource_view *view);
void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);
--
2.1.4
More information about the wine-patches
mailing list