wined3d: Simplify the fragment pipeline selection.

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

wined3d: Simplify the fragment pipeline selection.
7c216b8a · Stefan Dösinger · Alexandre Julliard · 51e64b3f · 7c216b8a
Commit 7c216b8a authored Jul 04, 2008 by Stefan Dösinger Committed by Alexandre Julliard Jul 14, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

directx.c dlls/wined3d/directx.c +2 -5

No files found.
--- 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