Mesa (10.4): Revert use of Mesa IR optimizer for ARB_fragment_programs

Emil Velikov evelikov at kemper.freedesktop.org
Wed Feb 18 22:22:17 UTC 2015


Module: Mesa
Branch: 10.4
Commit: c0ce908a90e23f0ebb9a2861c25bdd38a242134a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c0ce908a90e23f0ebb9a2861c25bdd38a242134a

Author: Carl Worth <cworth at cworth.org>
Date:   Thu Feb 12 10:14:24 2015 -0800

Revert use of Mesa IR optimizer for ARB_fragment_programs

Commit f82f2fb3dc770902f1657ab1c22e6004faa3afab added use of the Mesa
IR optimizer for both ARB_fragment_program and ARB_vertex_program, but
only justified the vertex-program portions with measured performance
improvements.

Meanwhile, the optimizer was seen to generate hundreds of unused
immediates without discarding them, causing failures.

Discard the use of the optimizer for now to fix the regression. (In
the future, we anticpate things moving from Mesa IR to NIR for better
optimization anyway.)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82477

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

CC: "10.3 10.4 10.5" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 55a57834bf912916a5e07486b32f1778b35657f6)

---

 src/mesa/program/arbprogparse.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/mesa/program/arbprogparse.c b/src/mesa/program/arbprogparse.c
index 7dec399..53a6f37 100644
--- a/src/mesa/program/arbprogparse.c
+++ b/src/mesa/program/arbprogparse.c
@@ -85,9 +85,6 @@ _mesa_parse_arb_fragment_program(struct gl_context* ctx, GLenum target,
       return;
    }
 
-   if ((ctx->_Shader->Flags & GLSL_NO_OPT) == 0)
-      _mesa_optimize_program(ctx, &prog);
-
    free(program->Base.String);
 
    /* Copy the relevant contents of the arb_program struct into the




More information about the mesa-commit mailing list