2 files changed, 8 insertions, 12 deletions
diff --git a/src/mesa/swrast/s_texfetch.c b/src/mesa/swrast/s_texfetch.c
index db5a956ab28..61c87913467 100644
--- 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),
 
diff --git a/src/mesa/swrast/s_texfetch_tmp.h b/src/mesa/swrast/s_texfetch_tmp.h
index f31167a83e7..e0885da2f9c 100644
--- a/src/mesa/swrast/s_texfetch_tmp.h
+++ b/src/mesa/swrast/s_texfetch_tmp.h
@@ -128,14 +128,12 @@ FETCH_RGBA(B5G5R5A1_UNORM, GLushort, 1)
 FETCH_RGBA(A1R5G5B5_UNORM, GLushort, 1)
 FETCH_RGBA(B10G10R10A2_UNORM, GLuint, 1)
 FETCH_RGBA(R10G10B10A2_UNORM, GLuint, 1)
-FETCH_RGBA(R8G8_UNORM, GLushort, 1)
-FETCH_RGBA(G8R8_UNORM, GLushort, 1)
+FETCH_RGBA(RG_UNORM8, GLubyte, 2)
 FETCH_RGBA(L4A4_UNORM, GLubyte, 1)
 FETCH_RGBA(R_UNORM8, GLubyte, 1)
 FETCH_RGBA(R_UNORM16, GLushort, 1)
 FETCH_RGBA(LA_UNORM8, GLubyte, 2)
-FETCH_RGBA(R16G16_UNORM, GLuint, 1)
-FETCH_RGBA(G16R16_UNORM, GLuint, 1)
+FETCH_RGBA(RG_UNORM16, GLushort, 2)
 FETCH_RGBA(B2G3R3_UNORM, GLubyte, 1)
 FETCH_RGBA(A_UNORM8, GLubyte, 1)
 FETCH_RGBA(A_UNORM16, GLushort, 1)
@@ -164,8 +162,8 @@ FETCH_RGBA(R_SNORM8, GLbyte, 1)
 FETCH_RGBA(A_SNORM8, GLbyte, 1)
 FETCH_RGBA(L_SNORM8, GLbyte, 1)
 FETCH_RGBA(I_SNORM8, GLbyte, 1)
-FETCH_RGBA(R8G8_SNORM, GLshort, 1)
 FETCH_RGBA(LA_SNORM8, GLbyte, 2)
+FETCH_RGBA(RG_SNORM8, GLbyte, 2)
 FETCH_RGBA(X8B8G8R8_SNORM, GLint, 1)
 FETCH_RGBA(A8B8G8R8_SNORM, GLint, 1)
 FETCH_RGBA(R8G8B8A8_SNORM, GLint, 1)
@@ -173,7 +171,7 @@ FETCH_RGBA(R_SNORM16, GLshort, 1)
 FETCH_RGBA(A_SNORM16, GLshort, 1)
 FETCH_RGBA(L_SNORM16, GLshort, 1)
 FETCH_RGBA(I_SNORM16, GLshort, 1)
-FETCH_RGBA(R16G16_SNORM, GLshort, 2)
+FETCH_RGBA(RG_SNORM16, GLshort, 2)
 FETCH_RGBA(LA_SNORM16, GLshort, 2)
 FETCH_RGBA(RGB_SNORM16, GLshort, 3)
 FETCH_RGBA(RGBA_SNORM16, GLshort, 4)