fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Move lower_output_reads to brw_link_shader().

Browse source 
This makes it so emit_nir_code() doesn't modify the GLSL IR.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Kenneth Graunke 2015-04-07 15:05:12 -07:00
parent 8e414cbdec
commit f41f07f685
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/i965/brw_fs_nir.cpp
View file

@ -90,7 +90,6 @@ fs_visitor::emit_nir_code()
nir_shader *nir;
/* First, lower the GLSL IR or Mesa IR to NIR */
if (shader_prog) {
lower_output_reads(shader->base.ir);
nir = glsl_to_nir(&shader->base, options);
} else {
nir = prog_to_nir(prog, options);

3
src/mesa/drivers/dri/i965/brw_shader.cpp
View file

@ -199,6 +199,9 @@ process_glsl_ir(struct brw_context *brw,
options, ctx->Const.NativeIntegers) || progress;
} while (progress);
if (options->NirOptions != NULL)
lower_output_reads(shader->ir);
validate_ir_tree(shader->ir);
/* Now that we've finished altering the linked IR, reparent any live IR back