From 401d594c0af804d432fd42f9eea38b146f7e2bb9 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 6 Oct 2020 21:29:05 -0400 Subject: [PATCH] panfrost: Add missing XML for Bifrost samplers This is now complete and mostly canonical. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon Part-of: --- src/gallium/drivers/panfrost/pan_cmdstream.c | 4 ++-- src/panfrost/lib/midgard.xml | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index 7e68c10..c9000a2 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -221,8 +221,8 @@ void panfrost_sampler_desc_init_bifrost(const struct pipe_sampler_state *cso, struct mali_bifrost_sampler_packed *hw) { pan_pack(hw, BIFROST_SAMPLER, cfg) { - cfg.magnify_linear = cso->mag_img_filter == PIPE_TEX_FILTER_LINEAR; - cfg.minify_linear = cso->min_img_filter == PIPE_TEX_FILTER_LINEAR; + cfg.point_sample_magnify = cso->mag_img_filter == PIPE_TEX_FILTER_LINEAR; + cfg.point_sample_minify = cso->min_img_filter == PIPE_TEX_FILTER_LINEAR; cfg.mipmap_mode = pan_pipe_to_mipmode(cso->min_mip_filter); cfg.normalized_coordinates = cso->normalized_coords; diff --git a/src/panfrost/lib/midgard.xml b/src/panfrost/lib/midgard.xml index 6dc7472..6c1f65a 100644 --- a/src/panfrost/lib/midgard.xml +++ b/src/panfrost/lib/midgard.xml @@ -573,15 +573,28 @@ + + + + - - + + + + + + + + + + + -- 2.7.4