mesa: implement unpack_SIGNED_GR1616 in format_unpack.c

[mesa.git] / src / mesa / main / texfetch.c

diff --git a/src/mesa/main/texfetch.c b/src/mesa/main/texfetch.c
index 4acc938d093262ea08279cef1c2be7075bee59b6..11cc8e0479d1b2921a57e2bf9ed4fcf04a317863 100644 (file)
--- a/src/mesa/main/texfetch.c
+++ b/src/mesa/main/texfetch.c
@@ -41,7 +41,8 @@
 #include "texcompress_rgtc.h"
 #include "texfetch.h"
 #include "teximage.h"
-#include "rgb9e5.h"
+#include "../../gallium/auxiliary/util/u_format_rgb9e5.h"
+#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h"
 
 
 /**
@@ -323,13 +324,6 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       fetch_texel_3d_f_i16,
       store_texel_i16
    },
-   {
-      MESA_FORMAT_CI8,
-      fetch_texel_1d_f_ci8,
-      fetch_texel_2d_f_ci8,
-      fetch_texel_3d_f_ci8,
-      store_texel_ci8
-   },
    {
       MESA_FORMAT_YCBCR,
       fetch_texel_1d_f_ycbcr,
@@ -906,6 +900,27 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       fetch_texel_3d_rgb9_e5,
       store_texel_rgb9_e5
    },
+   {
+      MESA_FORMAT_R11_G11_B10_FLOAT,
+      fetch_texel_1d_r11_g11_b10f,
+      fetch_texel_2d_r11_g11_b10f,
+      fetch_texel_3d_r11_g11_b10f,
+      store_texel_r11_g11_b10f
+   },
+   {
+      MESA_FORMAT_Z32_FLOAT,
+      fetch_texel_1d_f_r_f32, /* Reuse the R32F functions. */
+      fetch_texel_2d_f_r_f32,
+      fetch_texel_3d_f_r_f32,
+      store_texel_r_f32
+   },
+   {
+      MESA_FORMAT_Z32_FLOAT_X24S8,
+      fetch_texel_1d_z32f_x24s8,
+      fetch_texel_2d_z32f_x24s8,
+      fetch_texel_3d_z32f_x24s8,
+      store_texel_z32f_x24s8
+   }
 };