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

wined3d: Store vertex 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-27 22:44:53 -06:00 committed by Alexandre Julliard
parent f2e7906d9c
commit 4de2da1d14
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/wined3d/device.c
View File

@ -2493,17 +2493,21 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device,
|| count > d3d_info->limits.vs_uniform_count - start_idx) || count > d3d_info->limits.vs_uniform_count - start_idx)
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
memcpy(&device->update_state->vs_consts_f[start_idx], constants, count * sizeof(*constants)); memcpy(&device->update_stateblock_state->vs_consts_f[start_idx], constants, count * sizeof(*constants));
if (device->recording)
{
memset(&device->recording->changed.vs_consts_f[start_idx], 1,
count * sizeof(*device->recording->changed.vs_consts_f));
return WINED3D_OK;
}
memcpy(&device->state.vs_consts_f[start_idx], constants, count * sizeof(*constants));
if (TRACE_ON(d3d)) if (TRACE_ON(d3d))
{ {
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i])); TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i]));
} }
if (device->recording)
memset(&device->recording->changed.vs_consts_f[start_idx], 1,
count * sizeof(*device->recording->changed.vs_consts_f));
else
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants);
return WINED3D_OK; return WINED3D_OK;

7
dlls/wined3d/stateblock.c
View File

@ -706,9 +706,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock)
{ {
unsigned int idx = stateblock->contained_vs_consts_f[i]; unsigned int idx = stateblock->contained_vs_consts_f[i];
TRACE("Setting vs_consts_f[%u] to %s.\n", idx, debug_vec4(&src_state->vs_consts_f[idx])); TRACE("Setting vs_consts_f[%u] to %s.\n", idx, debug_vec4(&state->vs_consts_f[idx]));
stateblock->state.vs_consts_f[idx] = src_state->vs_consts_f[idx]; stateblock->stateblock_state.vs_consts_f[idx] = state->vs_consts_f[idx];
} }
/* Vertex shader integer constants. */ /* Vertex shader integer constants. */
@ -1008,8 +1008,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
/* Vertex Shader Constants. */ /* Vertex Shader Constants. */
for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i) for (i = 0; i < stateblock->num_contained_vs_consts_f; ++i)
{ {
state->vs_consts_f[i] = stateblock->stateblock_state.vs_consts_f[i];
wined3d_device_set_vs_consts_f(device, stateblock->contained_vs_consts_f[i], wined3d_device_set_vs_consts_f(device, stateblock->contained_vs_consts_f[i],
1, &stateblock->state.vs_consts_f[stateblock->contained_vs_consts_f[i]]); 1, &stateblock->stateblock_state.vs_consts_f[stateblock->contained_vs_consts_f[i]]);
} }
for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i)
{ {

1
dlls/wined3d/wined3d_private.h
View File

@ -2971,6 +2971,7 @@ struct wined3d_dummy_textures
struct wined3d_stateblock_state struct wined3d_stateblock_state
{ {
struct wined3d_shader *vs; struct wined3d_shader *vs;
struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F];
}; };
struct wined3d_device struct wined3d_device