Stefan Dösinger : wined3d: Simplify the fragment pipeline selection.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7c216b8ab507e5658fe48ab68f46994903975e21
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7c216b8ab507e5658fe48ab68f...

Author: Stefan Dösinger 
Date:   Fri Jul  4 15:48:45 2008 -0500

wined3d: Simplify the fragment pipeline selection.

This should do the same as the existing code, but it is more obvious.

---

dlls/wined3d/directx.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index a88f443..0a6cec3 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -2892,13 +2892,10 @@ static const struct fragment_pipeline *select_fragment_implementation(UINT Adapt
     int ps_selected_mode;

select_shader_mode(&GLINFO_LOCATION, DeviceType, &ps_selected_mode, &vs_selected_mode);
-    if (ps_selected_mode == SHADER_GLSL || ps_selected_mode == SHADER_ARB) {
-        return &ffp_fragment_pipeline;
-    } else if (ps_selected_mode != SHADER_NONE && !GL_SUPPORT(ARB_FRAGMENT_PROGRAM)) {
+    if(ps_selected_mode == SHADER_ATI) {
         return &atifs_fragment_pipeline;
-    } else {
-        return &ffp_fragment_pipeline;
     }
+    return &ffp_fragment_pipeline;
 }

/* Note: d3d8 passes in a pointer to a D3DCAPS8 structure, which is a true