[MESA]

[reactos.git] / reactos / dll / opengl / mesa / src / mesa / swrast / s_texfetch.c

diff --git a/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c b/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c
index 27f6b71..aa4142a 100644 (file)
--- a/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c
+++ b/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c
@@ -39,17 +39,9 @@
 #include "main/texcompress_fxt1.h"
 #include "main/texcompress_s3tc.h"
 #include "main/texcompress_rgtc.h"
-#include "main/texcompress_etc.h"
 #include "main/teximage.h"
 #include "s_context.h"
 #include "s_texfetch.h"
-#if 0
-#include "../../gallium/auxiliary/util/u_format_rgb9e5.h"
-#include "../../gallium/auxiliary/util/u_format_r11g11b10f.h"
-#else
-#include "../main/u_format_rgb9e5.h"
-#include "../main/u_format_r11g11b10f.h"
-#endif
 
 
 /**
@@ -1026,12 +1018,6 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       _mesa_fetch_texel_2d_f_signed_la_latc2,
       NULL
    },
-   {
-      MESA_FORMAT_ETC1_RGB8,
-      NULL,
-      _mesa_fetch_texel_2d_f_etc1_rgb8,
-      NULL
-   },
    {
       MESA_FORMAT_SIGNED_A8,
       fetch_texel_1d_signed_a8,
@@ -1080,18 +1066,6 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
       fetch_texel_2d_signed_i16,
       fetch_texel_3d_signed_i16
    },
-   {
-      MESA_FORMAT_RGB9_E5_FLOAT,
-      fetch_texel_1d_rgb9_e5,
-      fetch_texel_2d_rgb9_e5,
-      fetch_texel_3d_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
-   },
    {
       MESA_FORMAT_Z32_FLOAT,
       fetch_texel_1d_f_r_f32, /* Reuse the R32F functions. */