diff options
| author | Matt Turner <mattst88@gmail.com> | 2016-02-11 13:41:58 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2016-02-17 12:35:27 -0800 |
| commit | 0e9dc59a58e632979b3bdebb19d184bd22a0c182 (patch) | |
| tree | 6135454d9c9500cd163b5c7f7fdfc7d44e027425 /src/mesa/drivers/dri/i965/brw_vec4_builder.h | |
| parent | 2f2c00c7279e7c43e520e21de1781f8cec263e92 (diff) | |
| download | external_mesa3d-0e9dc59a58e632979b3bdebb19d184bd22a0c182.zip external_mesa3d-0e9dc59a58e632979b3bdebb19d184bd22a0c182.tar.gz external_mesa3d-0e9dc59a58e632979b3bdebb19d184bd22a0c182.tar.bz2 | |
i965: Make emit_minmax return an instruction*.
And use it in brw_fs_nir.cpp.
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_vec4_builder.h')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_builder.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4_builder.h b/src/mesa/drivers/dri/i965/brw_vec4_builder.h index a0b390b..3a8617e 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_builder.h +++ b/src/mesa/drivers/dri/i965/brw_vec4_builder.h @@ -299,12 +299,14 @@ namespace brw { * * Generally useful to get the minimum or maximum of two values. */ - void + instruction * emit_minmax(const dst_reg &dst, const src_reg &src0, const src_reg &src1, brw_conditional_mod mod) const { - set_condmod(mod, SEL(dst, fix_unsigned_negate(src0), - fix_unsigned_negate(src1))); + assert(mod == BRW_CONDITIONAL_GE || mod == BRW_CONDITIONAL_L); + + return set_condmod(mod, SEL(dst, fix_unsigned_negate(src0), + fix_unsigned_negate(src1))); } /** |