diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-05-20 10:03:50 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-05-28 17:07:00 -0700 |
| commit | 114497afff4e49139b8c7d61f11a7872b81398bf (patch) | |
| tree | 7eb1bd3676cab7d0dc811b1d231205459340ce60 /src/mesa/drivers/dri/i965/brw_fs.cpp | |
| parent | 8b9ecfff360711cffc41a0a062de5ad810f9cf2b (diff) | |
| download | external_mesa3d-114497afff4e49139b8c7d61f11a7872b81398bf.zip external_mesa3d-114497afff4e49139b8c7d61f11a7872b81398bf.tar.gz external_mesa3d-114497afff4e49139b8c7d61f11a7872b81398bf.tar.bz2 | |
i965: Make NIR non-optional for scalar shaders
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs.cpp')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs.cpp | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index aebde5d..cc76e4a 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -4255,16 +4255,7 @@ fs_visitor::run_vs() if (INTEL_DEBUG & DEBUG_SHADER_TIME) emit_shader_time_begin(); - if (brw->ctx.Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].NirOptions) { - emit_nir_code(); - } else { - foreach_in_list(ir_instruction, ir, shader->base.ir) { - base_ir = ir; - this->result = reg_undef; - ir->accept(this); - } - base_ir = NULL; - } + emit_nir_code(); if (failed) return false; @@ -4331,18 +4322,8 @@ fs_visitor::run_fs() /* Generate FS IR for main(). (the visitor only descends into * functions called "main"). */ - if (brw->ctx.Const.ShaderCompilerOptions[MESA_SHADER_FRAGMENT].NirOptions) { - emit_nir_code(); - } else if (shader) { - foreach_in_list(ir_instruction, ir, shader->base.ir) { - base_ir = ir; - this->result = reg_undef; - ir->accept(this); - } - } else { - emit_fragment_program_code(); - } - base_ir = NULL; + emit_nir_code(); + if (failed) return false; |