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

wined3d: Store vertex shader integer 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:54 -06:00 committed by Alexandre Julliard
parent 4de2da1d14
commit 96d7437ada
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
dlls/wined3d/device.c
View file

@ -2445,22 +2445,23 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device,
if (count > WINED3D_MAX_CONSTS_I - start_idx)
count = WINED3D_MAX_CONSTS_I - start_idx;
memcpy(&device->update_state->vs_consts_i[start_idx], constants, count * sizeof(*constants));
memcpy(&device->update_stateblock_state->vs_consts_i[start_idx], constants, count * sizeof(*constants));
if (device->recording)
{
for (i = start_idx; i < count + start_idx; ++i)
device->recording->changed.vertexShaderConstantsI |= (1u << i);
return WINED3D_OK;
}
memcpy(&device->state.vs_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_idx; i < count + start_idx; ++i)
device->recording->changed.vertexShaderConstantsI |= (1u << i);
}
else
{
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants);
}
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants);
return WINED3D_OK;
}

7
dlls/wined3d/stateblock.c
View file

@ -716,9 +716,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock)
{
unsigned int idx = stateblock->contained_vs_consts_i[i];
TRACE("Setting vs_consts[%u] to %s.\n", idx, debug_ivec4(&src_state->vs_consts_i[idx]));
TRACE("Setting vs_consts_i[%u] to %s.\n", idx, debug_ivec4(&state->vs_consts_i[idx]));
stateblock->state.vs_consts_i[idx] = src_state->vs_consts_i[idx];
stateblock->stateblock_state.vs_consts_i[idx] = state->vs_consts_i[idx];
}
/* Vertex shader boolean constants. */
@ -1014,8 +1014,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
}
for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i)
{
state->vs_consts_i[i] = stateblock->stateblock_state.vs_consts_i[i];
wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i],
1, &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]]);
1, &stateblock->stateblock_state.vs_consts_i[stateblock->contained_vs_consts_i[i]]);
}
for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i)
{

1
dlls/wined3d/wined3d_private.h
View file

@ -2972,6 +2972,7 @@ struct wined3d_stateblock_state
{
struct wined3d_shader *vs;
struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F];
struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I];
};
struct wined3d_device