diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2015-06-28 22:17:09 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2015-06-28 22:17:09 -0700 |
| commit | cae701fc8ed0faeaaaafd1cf57f6143031edcab2 (patch) | |
| tree | bf7fe7baa111ec3d27ca991e22970d43e466e2ff /src/mesa/drivers/dri/i965/brw_shader.cpp | |
| parent | 61912036d1cb67e52b1cc191bdff8ebded439e8c (diff) | |
| download | external_mesa3d-cae701fc8ed0faeaaaafd1cf57f6143031edcab2.zip external_mesa3d-cae701fc8ed0faeaaaafd1cf57f6143031edcab2.tar.gz external_mesa3d-cae701fc8ed0faeaaaafd1cf57f6143031edcab2.tar.bz2 | |
Revert "i965: Delete linked GLSL IR when using NIR."
This reverts commit 104c8fc2c2aa5621261f80aa6b4f76c3163078f1.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_shader.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_shader.cpp | 5 |
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 5653d6b..32c4013 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); } |