system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 19:24:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source 
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

16
dlls/wined3d/device.c
View file

@ -2493,18 +2493,22 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device,
|| count > d3d_info->limits.vs_uniform_count - start_idx)
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))
{
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.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;
}

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];
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. */
@ -1008,8 +1008,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
/* Vertex Shader Constants. */
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],
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)
{

1
dlls/wined3d/wined3d_private.h
View file

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