i965: drop brw->is_cherryview in favor of devinfo->is_cherryview

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Lionel Landwerlin 2017-08-30 09:22:32 +01:00
parent 97e90113c6
commit b6e783300c
3 changed files with 4 additions and 4 deletions

View File

@ -704,7 +704,7 @@ brw_initialize_cs_context_constants(struct brw_context *brw)
struct gen_device_info *devinfo = &brw->screen->devinfo;
/* FINISHME: Do this for all platforms that the kernel supports */
if (brw->is_cherryview &&
if (devinfo->is_cherryview &&
screen->subslice_total > 0 && screen->eu_total > 0) {
/* Logical CS threads = EUs per subslice * 7 threads per EU */
uint32_t max_cs_threads = screen->eu_total / screen->subslice_total * 7;
@ -858,7 +858,6 @@ brwCreateContext(gl_api api,
brw->screen = screen;
brw->bufmgr = screen->bufmgr;
brw->is_cherryview = devinfo->is_cherryview;
brw->is_broxton = devinfo->is_broxton || devinfo->is_geminilake;
brw->has_llc = devinfo->has_llc;
brw->has_hiz = devinfo->has_hiz_and_separate_stencil;

View File

@ -746,7 +746,6 @@ struct brw_context
uint64_t max_gtt_map_object_size;
bool is_cherryview;
bool is_broxton;
bool has_hiz;

View File

@ -1591,7 +1591,9 @@ genX(upload_sf)(struct brw_context *brw)
/* _NEW_LINE */
#if GEN_GEN == 8
if (brw->is_cherryview)
const struct gen_device_info *devinfo = &brw->screen->devinfo;
if (devinfo->is_cherryview)
sf.CHVLineWidth = brw_get_line_width(brw);
else
sf.LineWidth = brw_get_line_width(brw);