From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Wed, 31 Jul 2019 14:20:29 +0000 (-0700)
Subject: panfrost: Flip texture/sampler fields
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=194b49ee28131cea9ab5af947d0fb12873125bfc;p=mesa.git

panfrost: Flip texture/sampler fields

We had them backwards in both the command stream and the Midgard stack.
In OpenGL ES 2.0, they're always the same, but in Vulkan/later-GL/CL
they diverge so we can fix this.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---

diff --git a/src/panfrost/include/panfrost-job.h b/src/panfrost/include/panfrost-job.h
index 1f9fbafbe08..7766a00ca2c 100644
--- a/src/panfrost/include/panfrost-job.h
+++ b/src/panfrost/include/panfrost-job.h
@@ -531,8 +531,8 @@ struct bifrost_blend_rt {
 
 struct mali_shader_meta {
         mali_ptr shader;
-        u16 texture_count;
         u16 sampler_count;
+        u16 texture_count;
         u16 attribute_count;
         u16 varying_count;
 
diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h
index 04257a737bd..aa8b1793c99 100644
--- a/src/panfrost/midgard/midgard.h
+++ b/src/panfrost/midgard/midgard.h
@@ -652,8 +652,8 @@ __attribute__((__packed__))
         unsigned bias : 8;
         signed bias_int  : 8;
 
-        unsigned texture_handle : 16;
         unsigned sampler_handle : 16;
+        unsigned texture_handle : 16;
 }
 midgard_texture_word;