swrast: rename texture fetch functions (pt. 2)

Rename functions to match format names.

sed commands:
s/f_al1616_rev/A16L16_UNORM/g
s/f_al1616/L16A16_UNORM/g
s/f_rgb565_rev/R5G6B5_UNORM/g
s/f_rgb565/B5G6R5_UNORM/g
s/f_argb4444_rev/A4R4G4B4_UNORM/g
s/f_argb4444/B4G4R4A4_UNORM/g
s/f_rgba5551/A1B5G5R5_UNORM/g
s/f_argb1555_rev/A1R5G5B5_UNORM/g
s/f_al88_rev/A8L8_UNORM/g
s/f_al88/L8A8_UNORM/g
s/f_gr88/R8G8_UNORM/g
s/f_rg88/G8R8_UNORM/g
s/f_al44/L4A4_UNORM/g
s/f_rgb332/B2G3R3_UNORM/g

Reviewed-by: Ian Romanick <[email protected]>

1 files changed, 45 insertions, 45 deletions

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index e041dd5cc9b..b871116a738 100644
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -199,33 +199,33 @@ texfetch_funcs[] =
    },
    {
       MESA_FORMAT_L16A16_UNORM,
-      fetch_texel_1d_f_al1616,
-      fetch_texel_2d_f_al1616,
-      fetch_texel_3d_f_al1616
+      fetch_texel_1d_L16A16_UNORM,
+      fetch_texel_2d_L16A16_UNORM,
+      fetch_texel_3d_L16A16_UNORM
    },
    {
       MESA_FORMAT_A16L16_UNORM,
-      fetch_texel_1d_f_al1616_rev,
-      fetch_texel_2d_f_al1616_rev,
-      fetch_texel_3d_f_al1616_rev
+      fetch_texel_1d_A16L16_UNORM,
+      fetch_texel_2d_A16L16_UNORM,
+      fetch_texel_3d_A16L16_UNORM
    },
    {
       MESA_FORMAT_B5G6R5_UNORM,
-      fetch_texel_1d_f_rgb565,
-      fetch_texel_2d_f_rgb565,
-      fetch_texel_3d_f_rgb565
+      fetch_texel_1d_B5G6R5_UNORM,
+      fetch_texel_2d_B5G6R5_UNORM,
+      fetch_texel_3d_B5G6R5_UNORM
    },
    {
       MESA_FORMAT_R5G6B5_UNORM,
-      fetch_texel_1d_f_rgb565_rev,
-      fetch_texel_2d_f_rgb565_rev,
-      fetch_texel_3d_f_rgb565_rev
+      fetch_texel_1d_R5G6B5_UNORM,
+      fetch_texel_2d_R5G6B5_UNORM,
+      fetch_texel_3d_R5G6B5_UNORM
    },
    {
       MESA_FORMAT_B4G4R4A4_UNORM,
-      fetch_texel_1d_f_argb4444,
-      fetch_texel_2d_f_argb4444,
-      fetch_texel_3d_f_argb4444
+      fetch_texel_1d_B4G4R4A4_UNORM,
+      fetch_texel_2d_B4G4R4A4_UNORM,
+      fetch_texel_3d_B4G4R4A4_UNORM
    },
    {
       MESA_FORMAT_B4G4R4X4_UNORM,
@@ -235,21 +235,21 @@ texfetch_funcs[] =
    },
    {
       MESA_FORMAT_A4R4G4B4_UNORM,
-      fetch_texel_1d_f_argb4444_rev,
-      fetch_texel_2d_f_argb4444_rev,
-      fetch_texel_3d_f_argb4444_rev
+      fetch_texel_1d_A4R4G4B4_UNORM,
+      fetch_texel_2d_A4R4G4B4_UNORM,
+      fetch_texel_3d_A4R4G4B4_UNORM
    },
    {
       MESA_FORMAT_A1B5G5R5_UNORM,
-      fetch_texel_1d_f_rgba5551,
-      fetch_texel_2d_f_rgba5551,
-      fetch_texel_3d_f_rgba5551
+      fetch_texel_1d_A1B5G5R5_UNORM,
+      fetch_texel_2d_A1B5G5R5_UNORM,
+      fetch_texel_3d_A1B5G5R5_UNORM
    },
    {
       MESA_FORMAT_B5G5R5A1_UNORM,
-      fetch_texel_1d_f_argb1555,
-      fetch_texel_2d_f_argb1555,
-      fetch_texel_3d_f_argb1555
+      fetch_texel_1d_B5G5R5A1_UNORM,
+      fetch_texel_2d_B5G5R5A1_UNORM,
+      fetch_texel_3d_B5G5R5A1_UNORM
    },
    {
       MESA_FORMAT_B5G5R5X1_UNORM,
@@ -259,45 +259,45 @@ texfetch_funcs[] =
    },
    {
       MESA_FORMAT_A1R5G5B5_UNORM,
-      fetch_texel_1d_f_argb1555_rev,
-      fetch_texel_2d_f_argb1555_rev,
-      fetch_texel_3d_f_argb1555_rev
+      fetch_texel_1d_A1R5G5B5_UNORM,
+      fetch_texel_2d_A1R5G5B5_UNORM,
+      fetch_texel_3d_A1R5G5B5_UNORM
    },
    {
       MESA_FORMAT_L8A8_UNORM,
-      fetch_texel_1d_f_al88,
-      fetch_texel_2d_f_al88,
-      fetch_texel_3d_f_al88
+      fetch_texel_1d_L8A8_UNORM,
+      fetch_texel_2d_L8A8_UNORM,
+      fetch_texel_3d_L8A8_UNORM
    },
    {
       MESA_FORMAT_A8L8_UNORM,
-      fetch_texel_1d_f_al88_rev,
-      fetch_texel_2d_f_al88_rev,
-      fetch_texel_3d_f_al88_rev
+      fetch_texel_1d_A8L8_UNORM,
+      fetch_texel_2d_A8L8_UNORM,
+      fetch_texel_3d_A8L8_UNORM
    },
    {
       MESA_FORMAT_R8G8_UNORM,
-      fetch_texel_1d_f_gr88,
-      fetch_texel_2d_f_gr88,
-      fetch_texel_3d_f_gr88
+      fetch_texel_1d_R8G8_UNORM,
+      fetch_texel_2d_R8G8_UNORM,
+      fetch_texel_3d_R8G8_UNORM
    },
    {
       MESA_FORMAT_G8R8_UNORM,
-      fetch_texel_1d_f_rg88,
-      fetch_texel_2d_f_rg88,
-      fetch_texel_3d_f_rg88
+      fetch_texel_1d_G8R8_UNORM,
+      fetch_texel_2d_G8R8_UNORM,
+      fetch_texel_3d_G8R8_UNORM
    },
    {
       MESA_FORMAT_L4A4_UNORM,
-      fetch_texel_1d_f_al44,
-      fetch_texel_2d_f_al44,
-      fetch_texel_3d_f_al44
+      fetch_texel_1d_L4A4_UNORM,
+      fetch_texel_2d_L4A4_UNORM,
+      fetch_texel_3d_L4A4_UNORM
    },
    {
       MESA_FORMAT_B2G3R3_UNORM,
-      fetch_texel_1d_f_rgb332,
-      fetch_texel_2d_f_rgb332,
-      fetch_texel_3d_f_rgb332
+      fetch_texel_1d_B2G3R3_UNORM,
+      fetch_texel_2d_B2G3R3_UNORM,
+      fetch_texel_3d_B2G3R3_UNORM
    },
    {
       MESA_FORMAT_R16G16_UNORM,