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

wined3d: Store vertex shader boolean 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:55 -06:00 committed by Alexandre Julliard
parent 96d7437ada
commit 28b0f53f6e
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/wined3d/device.c
View File

@ -2396,22 +2396,23 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device,
if (count > WINED3D_MAX_CONSTS_B - start_idx) if (count > WINED3D_MAX_CONSTS_B - start_idx)
count = WINED3D_MAX_CONSTS_B - start_idx; count = WINED3D_MAX_CONSTS_B - start_idx;
memcpy(&device->update_state->vs_consts_b[start_idx], constants, count * sizeof(*constants));
memcpy(&device->update_stateblock_state->vs_consts_b[start_idx], constants, count * sizeof(*constants));
if (device->recording)
{
for (i = start_idx; i < count + start_idx; ++i)
device->recording->changed.vertexShaderConstantsB |= (1u << i);
return WINED3D_OK;
}
memcpy(&device->state.vs_consts_b[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 BOOL constant %u to %#x.\n", start_idx + i, constants[i]); TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]);
} }
if (device->recording)
{
for (i = start_idx; i < count + start_idx; ++i)
device->recording->changed.vertexShaderConstantsB |= (1u << i);
}
else
{
wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants);
}
return WINED3D_OK; return WINED3D_OK;
} }

7
dlls/wined3d/stateblock.c
View File

@ -727,9 +727,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock)
unsigned int idx = stateblock->contained_vs_consts_b[i]; unsigned int idx = stateblock->contained_vs_consts_b[i];
TRACE("Setting vs_consts_b[%u] to %s.\n", TRACE("Setting vs_consts_b[%u] to %s.\n",
idx, src_state->vs_consts_b[idx] ? "TRUE" : "FALSE"); idx, state->vs_consts_b[idx] ? "TRUE" : "FALSE");
stateblock->state.vs_consts_b[idx] = src_state->vs_consts_b[idx]; stateblock->stateblock_state.vs_consts_b[idx] = state->vs_consts_b[idx];
} }
/* Pixel shader float constants. */ /* Pixel shader float constants. */
@ -1020,8 +1020,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock)
} }
for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i)
{ {
state->vs_consts_b[i] = stateblock->stateblock_state.vs_consts_b[i];
wined3d_device_set_vs_consts_b(device, stateblock->contained_vs_consts_b[i], wined3d_device_set_vs_consts_b(device, stateblock->contained_vs_consts_b[i],
1, &stateblock->state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); 1, &stateblock->stateblock_state.vs_consts_b[stateblock->contained_vs_consts_b[i]]);
} }
apply_lights(device, &stateblock->state); apply_lights(device, &stateblock->state);

1
dlls/wined3d/wined3d_private.h
View File

@ -2973,6 +2973,7 @@ 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_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F];
struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I];
BOOL vs_consts_b[WINED3D_MAX_CONSTS_B];
}; };
struct wined3d_device struct wined3d_device