diff options
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_wm.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index db632ed15e1..139ca910f9f 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -40,6 +40,7 @@ #include "brw_program.h" #include "util/ralloc.h" +#include "util/u_math.h" static void assign_fs_binding_table_offsets(const struct gen_device_info *devinfo, @@ -559,7 +560,7 @@ brw_wm_populate_key(struct brw_context *brw, struct brw_wm_prog_key *key) } /* BRW_NEW_VUE_MAP_GEOM_OUT */ - if (devinfo->gen < 6 || _mesa_bitcount_64(prog->info.inputs_read & + if (devinfo->gen < 6 || util_bitcount64(prog->info.inputs_read & BRW_FS_VARYING_INPUT_MASK) > 16) { key->input_slots_valid = brw->vue_map_geom_out.slots_valid; } @@ -632,14 +633,14 @@ brw_wm_populate_default_key(const struct gen_device_info *devinfo, key->iz_lookup |= BRW_WM_IZ_DEPTH_WRITE_ENABLE_BIT; } - if (devinfo->gen < 6 || _mesa_bitcount_64(prog->info.inputs_read & + if (devinfo->gen < 6 || util_bitcount64(prog->info.inputs_read & BRW_FS_VARYING_INPUT_MASK) > 16) { key->input_slots_valid = prog->info.inputs_read | VARYING_BIT_POS; } brw_setup_tex_for_precompile(devinfo, &key->tex, prog); - key->nr_color_regions = _mesa_bitcount_64(outputs_written & + key->nr_color_regions = util_bitcount64(outputs_written & ~(BITFIELD64_BIT(FRAG_RESULT_DEPTH) | BITFIELD64_BIT(FRAG_RESULT_STENCIL) | BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK))); |