niansa-misc/wine
1
0
Fork 0
mirror of synced 2025-03-07 03:53:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

wined3d: Collapse some trivially nested ifs into a single condition.

Browse source
This commit is contained in:
Zebediah Figura 2024-01-22 17:07:04 -06:00 • committed by Alexandre Julliard
parent d219903c61
commit 34232874ad
1 changed files with 28 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
dlls/wined3d/utils.c
View file

@ -6477,35 +6477,37 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st
aarg0 = (args[aop] & ARG0) ? state->texture_states[i][WINED3D_TSS_ALPHA_ARG0] : ARG_UNUSED;
}
if (!i && texture && state->render_states[WINED3D_RS_COLORKEYENABLE])
if (!i && state->render_states[WINED3D_RS_COLORKEYENABLE]
&& texture && !(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP)
&& (texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT) && !texture->resource.format->alpha_size)
{
if (!(texture->resource.usage & WINED3DUSAGE_LEGACY_CUBEMAP))
if (aop == WINED3D_TOP_DISABLE)
{
if (texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT && !texture->resource.format->alpha_size)
aarg1 = WINED3DTA_TEXTURE;
aop = WINED3D_TOP_SELECT_ARG1;
}
else if (aop == WINED3D_TOP_SELECT_ARG1 && aarg1 != WINED3DTA_TEXTURE)
{
if (state->blend_state && state->blend_state->desc.rt[0].enable)
{
if (aop == WINED3D_TOP_DISABLE)
{
aarg1 = WINED3DTA_TEXTURE;
aop = WINED3D_TOP_SELECT_ARG1;
}
else if (aop == WINED3D_TOP_SELECT_ARG1 && aarg1 != WINED3DTA_TEXTURE)
{
if (state->blend_state && state->blend_state->desc.rt[0].enable)
{
aarg2 = WINED3DTA_TEXTURE;
aop = WINED3D_TOP_MODULATE;
}
else aarg1 = WINED3DTA_TEXTURE;
}
else if (aop == WINED3D_TOP_SELECT_ARG2 && aarg2 != WINED3DTA_TEXTURE)
{
if (state->blend_state && state->blend_state->desc.rt[0].enable)
{
aarg1 = WINED3DTA_TEXTURE;
aop = WINED3D_TOP_MODULATE;
}
else aarg2 = WINED3DTA_TEXTURE;
}
aarg2 = WINED3DTA_TEXTURE;
aop = WINED3D_TOP_MODULATE;
}
else
{
aarg1 = WINED3DTA_TEXTURE;
}
}
else if (aop == WINED3D_TOP_SELECT_ARG2 && aarg2 != WINED3DTA_TEXTURE)
{
if (state->blend_state && state->blend_state->desc.rt[0].enable)
{
aarg1 = WINED3DTA_TEXTURE;
aop = WINED3D_TOP_MODULATE;
}
else
{
aarg2 = WINED3DTA_TEXTURE;
}
}
}