Mesa (master): Revert "i965: Delete linked GLSL IR when using NIR."
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Jun 29 05:21:05 UTC 2015
Module: Mesa
Branch: master
Commit: cae701fc8ed0faeaaaafd1cf57f6143031edcab2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cae701fc8ed0faeaaaafd1cf57f6143031edcab2
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sun Jun 28 22:17:09 2015 -0700
Revert "i965: Delete linked GLSL IR when using NIR."
This reverts commit 104c8fc2c2aa5621261f80aa6b4f76c3163078f1.
---
src/mesa/drivers/dri/i965/brw_shader.cpp | 5 +----
1 file changed, 1 insertion(+), 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);
}
More information about the mesa-commit
mailing list