lima: fix stride in texture descriptor

[mesa.git] / src / gallium / drivers / lima / lima_texture.h

diff --git a/src/gallium/drivers/lima/lima_texture.h b/src/gallium/drivers/lima/lima_texture.h
index 14cf466ecd611e507480816fe00e3e720d9516b6..e9b896763eae28af7a87ab62572c1f4aa9472694 100644 (file)
--- a/src/gallium/drivers/lima/lima_texture.h
+++ b/src/gallium/drivers/lima/lima_texture.h
@@ -25,12 +25,71 @@
 #ifndef H_LIMA_TEXTURE
 #define H_LIMA_TEXTURE
 
-#define lima_tex_desc_size 64
+#define lima_min_tex_desc_size 64
 
-void lima_texture_desc_set_res(struct lima_context *ctx, uint32_t *desc,
+typedef struct __attribute__((__packed__)) {
+   /* Word 0 */
+   uint32_t format : 6;
+   uint32_t flag1: 1;
+   uint32_t swap_r_b: 1;
+   uint32_t unknown_0_1: 8;
+   uint32_t stride: 15;
+   uint32_t unknown_0_2: 1;
+
+   /* Word 1-3 */
+   uint32_t unknown_1_1: 7;
+   uint32_t unnorm_coords: 1;
+   uint32_t unknown_1_2: 2;
+   uint32_t texture_2d: 1;
+   uint32_t unknown_1_3: 13;
+   uint32_t miplevels: 4;
+   uint32_t min_mipfilter_1: 9; /* 0x0 for linear, 0x1ff for nearest */
+   uint32_t unknown_2_1: 3;
+   uint32_t has_stride: 1;
+   uint32_t min_mipfilter_2: 2; /* 0x3 for linear, 0x0 for nearest */
+   uint32_t min_img_filter_nearest: 1;
+   uint32_t mag_img_filter_nearest: 1;
+   uint32_t wrap_s_clamp_to_edge: 1;
+   uint32_t wrap_s_clamp: 1;
+   uint32_t wrap_s_mirror_repeat: 1;
+   uint32_t wrap_t_clamp_to_edge: 1;
+   uint32_t wrap_t_clamp: 1;
+   uint32_t wrap_t_mirror_repeat: 1;
+   uint32_t unknown_2_2: 3;
+   uint32_t width: 13;
+   uint32_t height: 13;
+   uint32_t unknown_3_1: 1;
+   uint32_t unknown_3_2: 15;
+
+   /* Word 4 */
+   uint32_t unknown_4;
+
+   /* Word 5 */
+   uint32_t unknown_5;
+
+   /* Word 6-15 */
+   /* layout is in va[0] bit 13-14 */
+   /* VAs start in va[0] at bit 30, each VA is 26 bits (only MSBs are stored), stored
+    * linearly in memory */
+   union {
+      uint32_t va[0];
+      struct __attribute__((__packed__)) {
+         uint32_t unknown_6_1: 13;
+         uint32_t layout: 2;
+         uint32_t unknown_6_2: 9;
+         uint32_t unknown_6_3: 6;
+#define VA_BIT_OFFSET 30
+#define VA_BIT_SIZE 26
+         uint32_t va_0: VA_BIT_SIZE;
+         uint32_t va_0_1: 8;
+         uint32_t va_1_x[0];
+      } va_s;
+   };
+} lima_tex_desc;
+
+void lima_texture_desc_set_res(struct lima_context *ctx, lima_tex_desc *desc,
                                struct pipe_resource *prsc,
                                unsigned first_level, unsigned last_level);
 void lima_update_textures(struct lima_context *ctx);
-bool lima_texel_format_supported(enum pipe_format pformat);
 
 #endif