AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/blorp: Include nir_format_convert.h in blorp_blit.c

Browse Source 
nir_mask_shift_or is now defined in nir_format_convert.h so we can
delete the copy in blorp_blit.c.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
Jason Ekstrand
2018-01-25 23:01:40 -08:00
parent 9981709d8f
commit 9e492bb92e
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/blorp/blorp_blit.c
+1 -19
View File
@@ -22,6 +22,7 @@
*/
#include "blorp_nir_builder.h"
#include "compiler/nir/nir_format_convert.h"
#include "blorp_priv.h"
@@ -282,25 +283,6 @@ blorp_blit_txf_ms_mcs(nir_builder *b, struct brw_blorp_blit_vars *v,
return &tex->dest.ssa;
}
static nir_ssa_def *
nir_mask_shift_or(struct nir_builder *b, nir_ssa_def *dst, nir_ssa_def *src,
uint32_t src_mask, int src_left_shift)
{
nir_ssa_def *masked = nir_iand(b, src, nir_imm_int(b, src_mask));
nir_ssa_def *shifted;
if (src_left_shift > 0) {
shifted = nir_ishl(b, masked, nir_imm_int(b, src_left_shift));
} else if (src_left_shift < 0) {
shifted = nir_ushr(b, masked, nir_imm_int(b, -src_left_shift));
} else {
assert(src_left_shift == 0);
shifted = masked;
}
return nir_ior(b, dst, shifted);
}
/**
* Emit code to compensate for the difference between Y and W tiling.
*