Henri Verbeet : wined3d: Pass wined3d_vec4 structures to wined3d_device_set_ps_consts_f().
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Apr 27 10:45:42 CDT 2016
Module: wine
Branch: master
Commit: 574e29418184e530e96f2c121b265eef15453cba
URL: http://source.winehq.org/git/wine.git/?a=commit;h=574e29418184e530e96f2c121b265eef15453cba
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Apr 26 17:56:00 2016 +0200
wined3d: Pass wined3d_vec4 structures to wined3d_device_set_ps_consts_f().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d8/device.c | 2 +-
dlls/d3d9/device.c | 3 ++-
dlls/wined3d/device.c | 30 ++++++++++++------------------
dlls/wined3d/stateblock.c | 2 +-
dlls/wined3d/wined3d.spec | 2 +-
include/wine/wined3d.h | 2 +-
6 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index 1424342..21de2d6 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -2730,7 +2730,7 @@ static HRESULT WINAPI d3d8_device_SetPixelShaderConstant(IDirect3DDevice8 *iface
iface, start_register, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_set_ps_consts_f(device->wined3d_device, start_register, data, count);
+ hr = wined3d_device_set_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 be5e9f7..ce67292 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -3108,7 +3108,8 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantF(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_f(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_set_ps_consts_f(device->wined3d_device,
+ reg_idx, count, (const struct wined3d_vec4 *)data);
wined3d_mutex_unlock();
return hr;
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 76b7eaf..9af2b70 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -2693,36 +2693,30 @@ HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device
}
HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device,
- UINT start_register, const float *constants, UINT vector4f_count)
+ unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants)
{
- UINT i;
const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info;
+ unsigned int i;
- 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);
- /* Specifically test start_register > limit to catch MAX_UINT overflows
- * when adding start_register + vector4f_count. */
- if (!constants
- || start_register + vector4f_count > d3d_info->limits.ps_uniform_count
- || start_register > d3d_info->limits.ps_uniform_count)
+ if (!constants || start_idx >= d3d_info->limits.ps_uniform_count
+ || count > d3d_info->limits.ps_uniform_count - start_idx)
return WINED3DERR_INVALIDCALL;
- memcpy(&device->update_state->ps_consts_f[start_register],
- constants, vector4f_count * sizeof(float) * 4);
+ memcpy(&device->update_state->ps_consts_f[start_idx], constants, count * sizeof(*constants));
if (TRACE_ON(d3d))
{
- for (i = 0; i < vector4f_count; ++i)
- TRACE("Set FLOAT constant %u to {%.8e, %.8e, %.8e, %.8e}.\n", start_register + i,
- constants[i * 4], constants[i * 4 + 1],
- constants[i * 4 + 2], constants[i * 4 + 3]);
+ for (i = 0; i < count; ++i)
+ TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i]));
}
if (device->recording)
- memset(device->recording->changed.pixelShaderConstantsF + start_register, 1,
- sizeof(*device->recording->changed.pixelShaderConstantsF) * vector4f_count);
+ memset(&device->recording->changed.pixelShaderConstantsF[start_idx], 1,
+ count * sizeof(*device->recording->changed.pixelShaderConstantsF));
else
- device->shader_backend->shader_update_float_pixel_constants(device, start_register, vector4f_count);
+ device->shader_backend->shader_update_float_pixel_constants(device, start_idx, count);
return WINED3D_OK;
}
diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c
index 2672377..036d594 100644
--- a/dlls/wined3d/stateblock.c
+++ b/dlls/wined3d/stateblock.c
@@ -978,7 +978,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i)
{
wined3d_device_set_ps_consts_f(device, stateblock->contained_ps_consts_f[i],
- &stateblock->state.ps_consts_f[stateblock->contained_ps_consts_f[i]].x, 1);
+ 1, &stateblock->state.ps_consts_f[stateblock->contained_ps_consts_f[i]]);
}
for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i)
{
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index e23bb03..42039f6 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -130,7 +130,7 @@
@ cdecl wined3d_device_set_primitive_type(ptr long)
@ 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 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_resource_view(ptr long ptr)
@ cdecl wined3d_device_set_ps_sampler(ptr long ptr)
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index d0151c3..5eea884 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2209,7 +2209,7 @@ void __cdecl wined3d_device_set_ps_cb(struct wined3d_device *device, UINT idx, s
HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device,
UINT start_register, const BOOL *constants, UINT bool_count);
HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device,
- UINT start_register, const float *constants, UINT vector4f_count);
+ 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);
void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device,
More information about the wine-cvs
mailing list