diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 14b16cb..25b196e 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -3016,10 +3016,13 @@ _mesa_format_matches_format_and_type(gl_format gl_format,
    case MESA_FORMAT_SIGNED_GR1616:
    case MESA_FORMAT_SIGNED_RGB_16:
    case MESA_FORMAT_SIGNED_RGBA_16:
-   case MESA_FORMAT_RGBA_16:
       /* FINISHME: SNORM */
       return GL_FALSE;
 
+   case MESA_FORMAT_RGBA_16:
+      return format == GL_RGBA && type == GL_UNSIGNED_SHORT && littleEndian &&
+         !swapBytes;
+
    case MESA_FORMAT_RED_RGTC1:
    case MESA_FORMAT_SIGNED_RED_RGTC1:
    case MESA_FORMAT_RG_RGTC2: