diff options
| author | Marcin Ślusarz <marcin.slusarz@intel.com> | 2021-05-14 18:12:28 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-05-17 09:46:45 +0000 |
| commit | b1933d769f3148cc9e214fa87a88728a226e4b4a (patch) | |
| tree | 3983ba725e2423f349dfc3a40b16d612f0db7f3c /src/mesa/drivers | |
| parent | 3340d5ee02deb8c6784eb4d5e0bce9681257cc37 (diff) | |
intel: simplify is_haswell checks, part 2
Few cases that were not handled by sed.
Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10810>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_batch.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw_upload.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_batch.c b/src/mesa/drivers/dri/i965/brw_batch.c index d4e27a95671..989aef01cd6 100644 --- a/src/mesa/drivers/dri/i965/brw_batch.c +++ b/src/mesa/drivers/dri/i965/brw_batch.c @@ -1257,7 +1257,7 @@ brw_load_register_imm64(struct brw_context *brw, uint32_t reg, uint64_t imm) void brw_load_register_reg(struct brw_context *brw, uint32_t dest, uint32_t src) { - assert(brw->screen->devinfo.ver >= 8 || brw->screen->devinfo.is_haswell); + assert(brw->screen->devinfo.verx10 >= 75); BEGIN_BATCH(3); OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); @@ -1272,7 +1272,7 @@ brw_load_register_reg(struct brw_context *brw, uint32_t dest, uint32_t src) void brw_load_register_reg64(struct brw_context *brw, uint32_t dest, uint32_t src) { - assert(brw->screen->devinfo.ver >= 8 || brw->screen->devinfo.is_haswell); + assert(brw->screen->devinfo.verx10 >= 75); BEGIN_BATCH(6); OUT_BATCH(MI_LOAD_REGISTER_REG | (3 - 2)); diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index a1f78796a3b..fb3ebc5e3b3 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -254,7 +254,7 @@ brw_get_vertex_surface_type(struct brw_context *brw, int size = glformat->Size; const struct intel_device_info *devinfo = &brw->screen->devinfo; const bool is_ivybridge_or_older = - devinfo->ver <= 7 && !devinfo->is_baytrail && !devinfo->is_haswell; + devinfo->verx10 <= 70 && !devinfo->is_baytrail; if (INTEL_DEBUG & DEBUG_VERTS) fprintf(stderr, "type %s size %d normalized %d\n", |