summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/brw_context.c
diff options
context:
space:
mode:
authorMarcin Ślusarz <marcin.slusarz@intel.com>2021-05-14 18:04:46 +0200
committerMarge Bot <eric+marge@anholt.net>2021-05-17 09:46:45 +0000
commit3340d5ee02deb8c6784eb4d5e0bce9681257cc37 (patch)
treeed8f92dc5e4527c31249cf289cd07211dcfb8c5e /src/mesa/drivers/dri/i965/brw_context.c
parent3a29e45a9084c1ade5b3975bcb29a23290160fcd (diff)
intel: simplify is_haswell checks, part 1
Generated with: files=`git grep is_haswell | cut -d: -f1 | sort | uniq` for file in $files; do cat $file | \ sed "s/devinfo->ver <= 7 && !devinfo->is_haswell/devinfo->verx10 <= 70/g" | \ sed "s/devinfo->ver >= 8 || devinfo->is_haswell/devinfo->verx10 >= 75/g" | \ sed "s/devinfo->is_haswell || devinfo->ver >= 8/devinfo->verx10 >= 75/g" | \ sed "s/devinfo.is_haswell || devinfo.ver >= 8/devinfo.verx10 >= 75/g" | \ sed "s/devinfo->ver > 7 || devinfo->is_haswell/devinfo->verx10 >= 75/g" | \ sed "s/devinfo->ver == 7 && !devinfo->is_haswell/devinfo->verx10 == 70/g" | \ sed "s/devinfo.ver == 7 && !devinfo.is_haswell/devinfo.verx10 == 70/g" | \ sed "s/devinfo->ver < 8 && !devinfo->is_haswell/devinfo->verx10 <= 70/g" | \ sed "s/device->info.ver == 7 && !device->info.is_haswell/device->info.verx10 == 70/g" \ > tmpXXX mv tmpXXX $file done Signed-off-by: Marcin Ślusarz <marcin.slusarz@intel.com> Acked-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/dri/i965/brw_context.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index dc5a5ea3d8e..c2ab5c06cfa 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -409,7 +409,7 @@ brw_init_driver_functions(struct brw_context *brw,
brw_init_frag_prog_functions(functions);
brw_init_common_queryobj_functions(functions);
- if (devinfo->ver >= 8 || devinfo->is_haswell)
+ if (devinfo->verx10 >= 75)
hsw_init_queryobj_functions(functions);
else if (devinfo->ver >= 6)
gfx6_init_queryobj_functions(functions);
@@ -518,7 +518,7 @@ brw_initialize_context_constants(struct brw_context *brw)
}
unsigned max_samplers =
- devinfo->ver >= 8 || devinfo->is_haswell ? BRW_MAX_TEX_UNIT : 16;
+ devinfo->verx10 >= 75 ? BRW_MAX_TEX_UNIT : 16;
ctx->Const.MaxDualSourceDrawBuffers = 1;
ctx->Const.MaxDrawBuffers = BRW_MAX_DRAW_BUFFERS;