From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 30 Apr 2020 21:06:45 +0000 (-0400)
Subject: panfrost: Fix sampler wrap/filter field orders
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=401409eff31ed4a47b165806a28c870f63498916;p=mesa.git

panfrost: Fix sampler wrap/filter field orders

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4844>
---

diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h
index 0a2afc32685..7c570829ccd 100644
--- a/src/panfrost/include/panfrost-job.h
+++ b/src/panfrost/include/panfrost-job.h
@@ -1347,17 +1347,17 @@ struct mali_sampler_descriptor {
 struct bifrost_sampler_descriptor {
         uint8_t unk1;
 
-        enum mali_wrap_mode wrap_s : 4;
-        enum mali_wrap_mode wrap_t : 4;
         enum mali_wrap_mode wrap_r : 4;
+        enum mali_wrap_mode wrap_t : 4;
+        enum mali_wrap_mode wrap_s : 4;
         uint8_t unk8 : 4;
 
         uint8_t unk2 : 3;
         uint8_t min_filter : 1;
         uint8_t norm_coords : 1;
         uint8_t zero1 : 1;
-        uint8_t mip_filter : 1;
         uint8_t mag_filter : 1;
+        uint8_t mip_filter : 1;
 
         int16_t min_lod;
         int16_t max_lod;