wined3d/arb: Always disable the fragment pipeline in shader_arb_select().

The original intent here seems to have been to avoid disabling GL_FRAGMENT_PROGRAM_ARB only to reënable it again. There is not actually any harm in this, however.

wined3d/arb: Always disable the fragment pipeline in shader_arb_select().
37d909e0 · Zebediah Figura · Alexandre Julliard · 4ed7bb35 · 37d909e0
Commit 37d909e0 authored Jan 05, 2023 by Zebediah Figura Committed by Alexandre Julliard Feb 06, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

arb_program_shader.c dlls/wined3d/arb_program_shader.c +3 -3

No files found.
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -4639,10 +4639,10 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context
        GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, compiled->prgId));
        checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, compiled->prgId);");
-        if (!priv->use_arbfp_fixed_func)
+        priv->fragment_pipe->fp_enable(context, FALSE);
-            priv->fragment_pipe->fp_enable(context, FALSE);
-        /* Enable OpenGL fragment programs. */
+        /* Enable OpenGL fragment programs. Note that we may have already
+         * disabled them when disabling the fragment pipeline. */
        gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB);
        checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);");