summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2015-06-28 22:17:09 -0700
committerKenneth Graunke <[email protected]>2015-06-28 22:17:09 -0700
commitcae701fc8ed0faeaaaafd1cf57f6143031edcab2 (patch)
treebf7fe7baa111ec3d27ca991e22970d43e466e2ff /src/mesa
parent61912036d1cb67e52b1cc191bdff8ebded439e8c (diff)
Revert "i965: Delete linked GLSL IR when using NIR."
This reverts commit 104c8fc2c2aa5621261f80aa6b4f76c3163078f1.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_shader.cpp5
1 files changed, 1 insertions, 4 deletions
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);
}