[PATCH] WineD3D: Simplify the fragment pipeline selection=0A=
Stefan Doesinger
stefan at codeweavers.com
Fri Jul 4 15:48:45 CDT 2008
=0A=
This should do the same as the existing code, but it is more obvious=0A=
---=0A=
dlls/wined3d/directx.c | 7 ++-----=0A=
1 files changed, 2 insertions(+), 5 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c=0A=
index a88f443..0a6cec3 100644=0A=
--- a/dlls/wined3d/directx.c=0A=
+++ b/dlls/wined3d/directx.c=0A=
@@ -2892,13 +2892,10 @@ static const struct fragment_pipeline =
*select_fragment_implementation(UINT Adapt=0A=
int ps_selected_mode;=0A=
=0A=
select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, =
&vs_selected_mode);=0A=
- if (ps_selected_mode =3D=3D SHADER_GLSL || ps_selected_mode =3D=3D =
SHADER_ARB) {=0A=
- return &ffp_fragment_pipeline;=0A=
- } else if (ps_selected_mode !=3D SHADER_NONE && =
!GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) {=0A=
+ if(ps_selected_mode =3D=3D SHADER_ATI) {=0A=
return &atifs_fragment_pipeline;=0A=
- } else {=0A=
- return &ffp_fragment_pipeline;=0A=
}=0A=
+ return &ffp_fragment_pipeline;=0A=
}=0A=
=0A=
/* Note: d3d8 passes in a pointer to a D3DCAPS8 structure, which is a =
true=0A=
-- =0A=
1.5.4.5=0A=
=0A=
------=_NextPart_000_0025_01C8E33C.854ABDB0--
More information about the wine-patches
mailing list