X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Flima%2Flima_texture.h;h=0a4afd9ed5a5767425481d0a7929e601073af3bf;hb=47dacf3867194fd456f015bc2a54d2ee4af30f4c;hp=c1bc34f874087967454802632a2aacb797aa423d;hpb=5ff41b9fc5ed2298b70772666573ad47418d12fd;p=mesa.git

diff --git a/src/gallium/drivers/lima/lima_texture.h b/src/gallium/drivers/lima/lima_texture.h
index c1bc34f8740..0a4afd9ed5a 100644
--- a/src/gallium/drivers/lima/lima_texture.h
+++ b/src/gallium/drivers/lima/lima_texture.h
@@ -27,27 +27,29 @@
 
 #define lima_min_tex_desc_size 64
 
+#define LIMA_TEXTURE_TYPE_2D   2
+#define LIMA_TEXTURE_TYPE_CUBE 5
+
 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: 10;
-   uint32_t stride: 13;
+   uint32_t unknown_0_1: 8;
+   uint32_t stride: 15;
    uint32_t unknown_0_2: 1;
 
-   /* Word 1*/
-   uint32_t unknown_1_1: 10;
-   uint32_t texture_2d: 1;
-   uint32_t unknown_1_2: 13;
-   uint32_t miplevels: 4;
-   uint32_t unknown_1_3: 3;
-   uint32_t disable_mipmap: 1;
-
-   /* Word 2-3 */
-   uint32_t unknown_2_1: 8;
+   /* Word 1-3 */
+   uint32_t unknown_1_1: 7;
+   uint32_t unnorm_coords: 1;
+   uint32_t unknown_1_2: 1;
+   uint32_t texture_type: 3;
+   uint32_t min_lod: 8; /* Fixed point, 4.4, unsigned */
+   uint32_t max_lod: 8; /* Fixed point, 4.4, unsigned */
+   uint32_t lod_bias: 9; /* Fixed point, signed, 1.4.4 */
+   uint32_t unknown_2_1: 3;
    uint32_t has_stride: 1;
-   uint32_t min_mipfilter: 2; /* 0x3 for linear, 0x0 for neares */
+   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;
@@ -75,9 +77,9 @@ typedef struct __attribute__((__packed__)) {
    union {
       uint32_t va[0];
       struct __attribute__((__packed__)) {
-         uint32_t unknown_6_1: 12;
+         uint32_t unknown_6_1: 13;
          uint32_t layout: 2;
-         uint32_t unknown_6_2: 10;
+         uint32_t unknown_6_2: 9;
          uint32_t unknown_6_3: 6;
 #define VA_BIT_OFFSET 30
 #define VA_BIT_SIZE 26
@@ -93,4 +95,22 @@ void lima_texture_desc_set_res(struct lima_context *ctx, lima_tex_desc *desc,
                                unsigned first_level, unsigned last_level);
 void lima_update_textures(struct lima_context *ctx);
 
+
+static inline int16_t lima_float_to_fixed8(float f)
+{
+   return (int)(f * 16.0);
+}
+
+static inline float lima_fixed8_to_float(int16_t i)
+{
+   float sign = 1.0;
+
+   if (i > 0xff) {
+      i = 0x200 - i;
+      sign = -1;
+   }
+
+   return sign * (float)(i / 16.0);
+}
+
 #endif