From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 29 Jun 2015 05:17:09 +0000 (-0700)
Subject: Revert "i965: Delete linked GLSL IR when using NIR."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cae701fc8ed0faeaaaafd1cf57f6143031edcab2;p=mesa.git

Revert "i965: Delete linked GLSL IR when using NIR."

This reverts commit 104c8fc2c2aa5621261f80aa6b4f76c3163078f1.
---

diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp
index 5653d6ba1e4..32c40131434 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.cpp
+++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
@@ -387,11 +387,8 @@ brw_link_shader(struct gl_context *ctx, struct gl_shader_program *shProg)
 
       brw_add_texrect_params(prog);
 
-      if (options->NirOptions) {
+      if (options->NirOptions)
          prog->nir = brw_create_nir(brw, shProg, prog, (gl_shader_stage) stage);
-         ralloc_free(shader->ir);
-         shader->ir = NULL;
-      }
 
       _mesa_reference_program(ctx, &prog, NULL);
    }