mesa: Redefine the RG formats as array formats.

[mesa.git] / src / mesa / swrast / s_texfetch.c

diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index db5a956ab28f67a44af920aa99ea9aa7ae069012..61c879134675df96e44d5598757a209ff5ebea68 100644 (file)
--- a/src/mesa/swrast/s_texfetch.c
+++ b/src/mesa/swrast/s_texfetch.c
@@ -141,12 +141,8 @@ texfetch_funcs[] =
    FETCH_FUNCS(A1B5G5R5_UNORM),
    FETCH_FUNCS(B5G5R5A1_UNORM),
    FETCH_FUNCS(A1R5G5B5_UNORM),
-   FETCH_FUNCS(R8G8_UNORM),
-   FETCH_FUNCS(G8R8_UNORM),
    FETCH_FUNCS(L4A4_UNORM),
    FETCH_FUNCS(B2G3R3_UNORM),
-   FETCH_FUNCS(R16G16_UNORM),
-   FETCH_FUNCS(G16R16_UNORM),
    FETCH_FUNCS(B10G10R10A2_UNORM),
    FETCH_FUNCS(R10G10B10A2_UNORM),
 
@@ -177,6 +173,8 @@ texfetch_funcs[] =
    FETCH_FUNCS(I_UNORM16),
    FETCH_FUNCS(R_UNORM8),
    FETCH_FUNCS(R_UNORM16),
+   FETCH_FUNCS(RG_UNORM8),
+   FETCH_FUNCS(RG_UNORM16),
    FETCH_FUNCS(BGR_UNORM8),
    FETCH_FUNCS(RGB_UNORM8),
    FETCH_FUNCS(RGBA_UNORM16),
@@ -188,8 +186,6 @@ texfetch_funcs[] =
    FETCH_FUNCS(A8B8G8R8_SNORM),
    FETCH_FUNCS(X8B8G8R8_SNORM),
    FETCH_FUNCS(R8G8B8A8_SNORM),
-   FETCH_FUNCS(R16G16_SNORM),
-   FETCH_FUNCS(R8G8_SNORM),
 
    /* Array signed/normalized formats */
    FETCH_FUNCS(A_SNORM8),
@@ -202,6 +198,8 @@ texfetch_funcs[] =
    FETCH_FUNCS(I_SNORM16),
    FETCH_FUNCS(R_SNORM8),
    FETCH_FUNCS(R_SNORM16),
+   FETCH_FUNCS(RG_SNORM8),
+   FETCH_FUNCS(RG_SNORM16),
    FETCH_FUNCS(RGB_SNORM16),
    FETCH_FUNCS(RGBA_SNORM16),