Skip to content

W
wine-cw
Commit 2b485933 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

wined3d: Factor out init_default_texture_state().

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d929a1fa
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 17 deletions
dlls/wined3d/stateblock.c
View file @ 2b485933
......@@ -1300,6 +1300,27 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c
rs[WINED3D_RS_BLENDOPALPHA] = WINED3D_BLEND_OP_ADD;
}
static void init_default_texture_state(unsigned int i, DWORD stage[WINED3D_HIGHEST_TEXTURE_STATE + 1])
{
stage[WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE;
stage[WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE;
stage[WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT;
stage[WINED3D_TSS_ALPHA_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_SELECT_ARG1;
stage[WINED3D_TSS_ALPHA_ARG1] = WINED3DTA_TEXTURE;
stage[WINED3D_TSS_ALPHA_ARG2] = WINED3DTA_CURRENT;
stage[WINED3D_TSS_BUMPENV_MAT00] = 0;
stage[WINED3D_TSS_BUMPENV_MAT01] = 0;
stage[WINED3D_TSS_BUMPENV_MAT10] = 0;
stage[WINED3D_TSS_BUMPENV_MAT11] = 0;
stage[WINED3D_TSS_TEXCOORD_INDEX] = i;
stage[WINED3D_TSS_BUMPENV_LSCALE] = 0;
stage[WINED3D_TSS_BUMPENV_LOFFSET] = 0;
stage[WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS] = WINED3D_TTFF_DISABLE;
stage[WINED3D_TSS_COLOR_ARG0] = WINED3DTA_CURRENT;
stage[WINED3D_TSS_ALPHA_ARG0] = WINED3DTA_CURRENT;
stage[WINED3D_TSS_RESULT_ARG] = WINED3DTA_CURRENT;
}
static void state_init_default(struct wined3d_state *state, const struct wined3d_d3d_info *d3d_info)
{
unsigned int i;
......@@ -1326,23 +1347,7 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d
{
TRACE("Setting up default texture states for texture Stage %u.\n", i);
state->transforms[WINED3D_TS_TEXTURE0 + i] = identity;
state->texture_states[i][WINED3D_TSS_COLOR_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_MODULATE;
state->texture_states[i][WINED3D_TSS_COLOR_ARG1] = WINED3DTA_TEXTURE;
state->texture_states[i][WINED3D_TSS_COLOR_ARG2] = WINED3DTA_CURRENT;
state->texture_states[i][WINED3D_TSS_ALPHA_OP] = i ? WINED3D_TOP_DISABLE : WINED3D_TOP_SELECT_ARG1;
state->texture_states[i][WINED3D_TSS_ALPHA_ARG1] = WINED3DTA_TEXTURE;
state->texture_states[i][WINED3D_TSS_ALPHA_ARG2] = WINED3DTA_CURRENT;
state->texture_states[i][WINED3D_TSS_BUMPENV_MAT00] = 0;
state->texture_states[i][WINED3D_TSS_BUMPENV_MAT01] = 0;
state->texture_states[i][WINED3D_TSS_BUMPENV_MAT10] = 0;
state->texture_states[i][WINED3D_TSS_BUMPENV_MAT11] = 0;
state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX] = i;
state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE] = 0;
state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET] = 0;
state->texture_states[i][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS] = WINED3D_TTFF_DISABLE;
state->texture_states[i][WINED3D_TSS_COLOR_ARG0] = WINED3DTA_CURRENT;
state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] = WINED3DTA_CURRENT;
state->texture_states[i][WINED3D_TSS_RESULT_ARG] = WINED3DTA_CURRENT;
init_default_texture_state(i, state->texture_states[i]);
}
for (i = 0 ; i < MAX_COMBINED_SAMPLERS; ++i)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment