[PATCH] WineD3D: Alpha states -> misc pipeline states=0A=
Stefan Doesinger
stefan at codeweavers.com
Wed Jul 2 20:18:55 CDT 2008
=0A=
---=0A=
dlls/wined3d/state.c | 12 ++++++++----=0A=
1 files changed, 8 insertions(+), 4 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index d8111b3..71dd382 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -3837,7 +3837,7 @@ const struct StateEntry FFPStateTable[] =3D=0A=
{ /* 12, WINED3DRS_ROP2 */ =
STATE_RENDER(WINED3DRS_ROP2), NULL =
},=0A=
{ /* 13, WINED3DRS_PLANEMASK */ =
STATE_RENDER(WINED3DRS_PLANEMASK), NULL =
},=0A=
{ /* 14, WINED3DRS_ZWRITEENABLE */ =
STATE_RENDER(WINED3DRS_ZWRITEENABLE), NULL =
},=0A=
- { /* 15, WINED3DRS_ALPHATESTENABLE */ =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha =
},=0A=
+ { /* 15, WINED3DRS_ALPHATESTENABLE */ =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL =
},=0A=
{ /* 16, WINED3DRS_LASTPIXEL */ =
STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel =
},=0A=
{ /* 17, WINED3DRS_TEXTUREMAG */ 0 /* =
Handled in ddraw */, state_undefined },=0A=
{ /* 18, WINED3DRS_TEXTUREMIN */ 0 /* =
Handled in ddraw */, state_undefined },=0A=
@@ -3846,8 +3846,8 @@ const struct StateEntry FFPStateTable[] =3D=0A=
{ /* 21, WINED3DRS_TEXTUREMAPBLEND */ 0 /* =
Handled in ddraw */, state_undefined },=0A=
{ /* 22, WINED3DRS_CULLMODE */ =
STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode =
},=0A=
{ /* 23, WINED3DRS_ZFUNC */ =
STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc =
},=0A=
- { /* 24, WINED3DRS_ALPHAREF */ =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha =
},=0A=
- { /* 25, WINED3DRS_ALPHAFUNC */ =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha =
},=0A=
+ { /* 24, WINED3DRS_ALPHAREF */ =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL =
},=0A=
+ { /* 25, WINED3DRS_ALPHAFUNC */ =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL =
},=0A=
{ /* 26, WINED3DRS_DITHERENABLE */ =
STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable =
},=0A=
{ /* 27, WINED3DRS_ALPHABLENDENABLE */ =
STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL =
},=0A=
{ /* 28, WINED3DRS_FOGENABLE */ =
STATE_RENDER(WINED3DRS_FOGENABLE), state_fog =
},=0A=
@@ -3863,7 +3863,7 @@ const struct StateEntry FFPStateTable[] =3D=0A=
{ /* 38, WINED3DRS_FOGDENSITY */ =
STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity =
},=0A=
{ /* 39, WINED3DRS_STIPPLEENABLE */ =
STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable =
},=0A=
{ /* 40, WINED3DRS_EDGEANTIALIAS */ =
STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL =
},=0A=
- { /* 41, WINED3DRS_COLORKEYENABLE */ =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha =
},=0A=
+ { /* 41, WINED3DRS_COLORKEYENABLE */ =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL =
},=0A=
{ /* 42, undefined */ 0, =
state_undefined },=0A=
{ /* 43, WINED3DRS_BORDERCOLOR */ =
STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor =
},=0A=
{ /* 44, WINED3DRS_TEXTUREADDRESSU */ 0, /* =
Handled in ddraw */ state_undefined },=0A=
@@ -4927,6 +4927,10 @@ const struct StateEntryTemplate =
misc_state_template[] =3D {=0A=
{ STATE_RENDER(WINED3DRS_ROP2), { =
STATE_RENDER(WINED3DRS_ROP2), state_rop2 =
}},=0A=
{ STATE_RENDER(WINED3DRS_PLANEMASK), { =
STATE_RENDER(WINED3DRS_PLANEMASK), state_planemask =
}},=0A=
{ STATE_RENDER(WINED3DRS_ZWRITEENABLE), { =
STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable =
}},=0A=
+ { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), { =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha =
}},=0A=
+ { STATE_RENDER(WINED3DRS_ALPHAREF), { =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha =
}},=0A=
+ { STATE_RENDER(WINED3DRS_ALPHAFUNC), { =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha =
}},=0A=
+ { STATE_RENDER(WINED3DRS_COLORKEYENABLE), { =
STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha =
}},=0A=
{0 /* Terminate */, { 0, =
0 }},=0A=
};=0A=
=0A=
-- =0A=
1.5.4.5=0A=
=0A=
------=_NextPart_000_0010_01C8E154.6EEB5C80--
More information about the wine-patches
mailing list