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

wined3d: Store pixel shader floating point constants in the wined3d_stateblock_state structure. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-01-28 23:09:11 -06:00 committed by Alexandre Julliard
parent 759a3bf34d
commit 3a5d7487d5
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/wined3d/device.c
View File

@ -2708,18 +2708,22 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device,
|| count > d3d_info->limits.ps_uniform_count - start_idx)
return WINED3DERR_INVALIDCALL;
memcpy(&device->update_state->ps_consts_f[start_idx], constants, count * sizeof(*constants));
memcpy(&device->update_stateblock_state->ps_consts_f[start_idx], constants, count * sizeof(*constants));
if (device->recording)
{
memset(&device->recording->changed.ps_consts_f[start_idx], 1,
count * sizeof(*device->recording->changed.ps_consts_f));
return WINED3D_OK;
}
memcpy(&device->state.ps_consts_f[start_idx], constants, count * sizeof(*constants));
if (TRACE_ON(d3d))
{
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.ps_consts_f[start_idx], 1,
count * sizeof(*device->recording->changed.ps_consts_f));
else
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants);
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants);
return WINED3D_OK;
}

7
dlls/wined3d/stateblock.c
View File

@ -743,9 +743,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock)
{
unsigned int idx = stateblock->contained_ps_consts_f[i];
TRACE("Setting ps_consts_f[%u] to %s.\n", idx, debug_vec4(&src_state->ps_consts_f[idx]));
TRACE("Setting ps_consts_f[%u] to %s.\n", idx, debug_vec4(&state->ps_consts_f[idx]));
stateblock->state.ps_consts_f[idx] = src_state->ps_consts_f[idx];
stateblock->stateblock_state.ps_consts_f[idx] = state->ps_consts_f[idx];
}
/* Pixel shader integer constants. */
@ -1045,8 +1045,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
/* Pixel Shader Constants. */
for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i)
{
state->ps_consts_f[i] = stateblock->stateblock_state.ps_consts_f[i];
wined3d_device_set_ps_consts_f(device, stateblock->contained_ps_consts_f[i],
1, &stateblock->state.ps_consts_f[stateblock->contained_ps_consts_f[i]]);
1, &stateblock->stateblock_state.ps_consts_f[stateblock->contained_ps_consts_f[i]]);
}
for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i)
{

1
dlls/wined3d/wined3d_private.h
View File

@ -2976,6 +2976,7 @@ struct wined3d_stateblock_state
BOOL vs_consts_b[WINED3D_MAX_CONSTS_B];
struct wined3d_shader *ps;
struct wined3d_vec4 ps_consts_f[WINED3D_MAX_PS_CONSTS_F];
};
struct wined3d_device