diff options
| author | Lionel Landwerlin <[email protected]> | 2017-08-30 09:22:32 +0100 |
|---|---|---|
| committer | Lionel Landwerlin <[email protected]> | 2017-08-30 17:59:17 +0100 |
| commit | b6e783300c660fd384a99eed045fad81fc7b6913 (patch) | |
| tree | ae864466763c39b5b47afbdede10e9579dfa9f5d /src/mesa/drivers/dri | |
| parent | 97e90113c662b73b0b2d37385df516dbaa937d19 (diff) | |
i965: drop brw->is_cherryview in favor of devinfo->is_cherryview
Signed-off-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_state_upload.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index e9a4aff093f..d6d538f1364 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -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; diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 5d44dac5414..3e49099b278 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -746,7 +746,6 @@ struct brw_context uint64_t max_gtt_map_object_size; - bool is_cherryview; bool is_broxton; bool has_hiz; diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c index ab8caf9dbd9..b15829fb57c 100644 --- a/src/mesa/drivers/dri/i965/genX_state_upload.c +++ b/src/mesa/drivers/dri/i965/genX_state_upload.c @@ -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); |