fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 10:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/gen_macros: Map {TEXTURE,SAMPLER} to the arch-specific descriptor

Browse source 
This will ease the transition to per-arch XML files. While at it, patch
pan_cmdstream.c to use this new macro and avoid an #if section.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12551>
This commit is contained in:
Boris Brezillon 2021-07-28 11:13:39 +02:00
parent 2092f60ec1
commit f29b45f934
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -143,11 +143,7 @@ panfrost_create_sampler_state(
bool using_nearest = cso->min_img_filter == PIPE_TEX_MIPFILTER_NEAREST;
#if PAN_ARCH <= 5
pan_pack(&so->hw, MIDGARD_SAMPLER, cfg) {
#else
pan_pack(&so->hw, BIFROST_SAMPLER, cfg) {
#endif
pan_pack(&so->hw, SAMPLER, cfg) {
cfg.magnify_nearest = cso->mag_img_filter == PIPE_TEX_FILTER_NEAREST;
cfg.minify_nearest = cso->min_img_filter == PIPE_TEX_FILTER_NEAREST;

4
src/panfrost/lib/gen_macros.h
View file

@ -58,8 +58,12 @@
#if PAN_ARCH >= 6
#define TILER_JOB BIFROST_TILER_JOB
#define TEXTURE BIFROST_TEXTURE
#define SAMPLER BIFROST_SAMPLER
#else
#define TILER_JOB MIDGARD_TILER_JOB
#define TEXTURE MIDGARD_TEXTURE
#define SAMPLER MIDGARD_SAMPLER
#endif
/* Suffixing macros */