diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c
index 6dde9accb8a..45aaf8902b6 100644
--- a/src/gallium/frontends/dri/dri_screen.c
+++ b/src/gallium/frontends/dri/dri_screen.c
@@ -521,8 +521,7 @@ dri_get_egl_image(struct pipe_frontend_screen *fscreen,
       /* Guess sized internal format for dma-bufs. Could be used
        * by EXT_EGL_image_storage.
        */
-      mesa_format mesa_format = driImageFormatToGLFormat(map->dri_format);
-      stimg->internalformat = driGLFormatToSizedInternalGLFormat(mesa_format);
+      stimg->internalformat = driImageFormatToSizedInternalGLFormat(map->dri_format);
    } else {
       stimg->internalformat = img->internal_format;
    }
diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c
index 508c5b87a71..69f01b78c56 100644
--- a/src/gallium/frontends/dri/dri_util.c
+++ b/src/gallium/frontends/dri/dri_util.c
@@ -980,173 +980,134 @@ const __DRI2flushControlExtension dri2FlushControlExtension = {
  */
 static const struct {
    uint32_t    image_format;
-   mesa_format mesa_format;
    GLenum internal_format;
 } format_mapping[] = {
    {
       .image_format    = __DRI_IMAGE_FORMAT_RGB565,
-      .mesa_format     =        MESA_FORMAT_B5G6R5_UNORM,
       .internal_format =        GL_RGB565,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_ARGB1555,
-      .mesa_format     =        MESA_FORMAT_B5G5R5A1_UNORM,
       .internal_format =        GL_RGB5_A1,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_ABGR1555,
-      .mesa_format     =        MESA_FORMAT_R5G5B5A1_UNORM,
       .internal_format =        GL_RGB5_A1,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_XRGB8888,
-      .mesa_format     =        MESA_FORMAT_B8G8R8X8_UNORM,
       .internal_format =        GL_RGB8,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_ABGR16161616F,
-      .mesa_format     =        MESA_FORMAT_RGBA_FLOAT16,
       .internal_format =        GL_RGBA16F,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_XBGR16161616F,
-      .mesa_format     =        MESA_FORMAT_RGBX_FLOAT16,
       .internal_format =        GL_RGB16F,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_ABGR16161616,
-      .mesa_format     =        MESA_FORMAT_RGBA_UNORM16,
       .internal_format =        GL_RGBA16,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_XBGR16161616,
-      .mesa_format     =        MESA_FORMAT_RGBX_UNORM16,
       .internal_format =        GL_RGB16,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_ARGB2101010,
-      .mesa_format     =        MESA_FORMAT_B10G10R10A2_UNORM,
       .internal_format =        GL_RGB10_A2,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_XRGB2101010,
-      .mesa_format     =        MESA_FORMAT_B10G10R10X2_UNORM,
       .internal_format =        GL_RGB10,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_ABGR2101010,
-      .mesa_format     =        MESA_FORMAT_R10G10B10A2_UNORM,
       .internal_format =        GL_RGB10_A2,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_XBGR2101010,
-      .mesa_format     =        MESA_FORMAT_R10G10B10X2_UNORM,
       .internal_format =        GL_RGB10,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_ARGB8888,
-      .mesa_format     =        MESA_FORMAT_B8G8R8A8_UNORM,
       .internal_format =        GL_RGBA8,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_ABGR8888,
-      .mesa_format     =        MESA_FORMAT_R8G8B8A8_UNORM,
       .internal_format =        GL_RGBA8,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_XBGR8888,
-      .mesa_format     =        MESA_FORMAT_R8G8B8X8_UNORM,
       .internal_format =        GL_RGB8,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_R8,
-      .mesa_format     =        MESA_FORMAT_R_UNORM8,
       .internal_format =        GL_R8,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_R8,
-      .mesa_format     =        MESA_FORMAT_L_UNORM8,
       .internal_format =        GL_R8,
    },
 #if UTIL_ARCH_LITTLE_ENDIAN
    {
       .image_format    = __DRI_IMAGE_FORMAT_GR88,
-      .mesa_format     =        MESA_FORMAT_RG_UNORM8,
       .internal_format =        GL_RG8,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_GR88,
-      .mesa_format     =        MESA_FORMAT_LA_UNORM8,
       .internal_format =        GL_RG8,
    },
 #endif
    {
       .image_format    = __DRI_IMAGE_FORMAT_SABGR8,
-      .mesa_format     =        MESA_FORMAT_R8G8B8A8_SRGB,
       .internal_format =        GL_SRGB8_ALPHA8,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_SARGB8,
-      .mesa_format     =        MESA_FORMAT_B8G8R8A8_SRGB,
       .internal_format =        GL_SRGB8_ALPHA8,
    },
    {
       .image_format = __DRI_IMAGE_FORMAT_SXRGB8,
-      .mesa_format  =           MESA_FORMAT_B8G8R8X8_SRGB,
       .internal_format =        GL_SRGB8,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_R16,
-      .mesa_format     =        MESA_FORMAT_R_UNORM16,
       .internal_format =        GL_R16,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_R16,
-      .mesa_format     =        MESA_FORMAT_L_UNORM16,
       .internal_format =        GL_R16,
    },
 #if UTIL_ARCH_LITTLE_ENDIAN
    {
       .image_format    = __DRI_IMAGE_FORMAT_GR1616,
-      .mesa_format     =        MESA_FORMAT_RG_UNORM16,
       .internal_format =        GL_RG16,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_GR1616,
-      .mesa_format     =        MESA_FORMAT_LA_UNORM16,
       .internal_format =        GL_RG16,
    },
 #endif
    {
       .image_format    = __DRI_IMAGE_FORMAT_ARGB4444,
-      .mesa_format     =        MESA_FORMAT_B4G4R4A4_UNORM,
       .internal_format =        GL_RGBA4,
    },
    {
       .image_format    = __DRI_IMAGE_FORMAT_ABGR4444,
-      .mesa_format     =        MESA_FORMAT_R4G4B4A4_UNORM,
       .internal_format =        GL_RGBA4,
    },
 };
 
 uint32_t
-driGLFormatToSizedInternalGLFormat(mesa_format format)
-{
-   for (size_t i = 0; i < ARRAY_SIZE(format_mapping); i++)
-      if (format_mapping[i].mesa_format == format)
-         return format_mapping[i].internal_format;
-
-   return GL_NONE;
-}
-
-mesa_format
-driImageFormatToGLFormat(uint32_t image_format)
+driImageFormatToSizedInternalGLFormat(uint32_t image_format)
 {
    for (size_t i = 0; i < ARRAY_SIZE(format_mapping); i++)
       if (format_mapping[i].image_format == image_format)
-         return format_mapping[i].mesa_format;
+         return format_mapping[i].internal_format;
 
-   return MESA_FORMAT_NONE;
+   return GL_NONE;
 }
 
 /** Image driver interface */
diff --git a/src/gallium/frontends/dri/dri_util.h b/src/gallium/frontends/dri/dri_util.h
index 1a31597c719..d619e2f516c 100644
--- a/src/gallium/frontends/dri/dri_util.h
+++ b/src/gallium/frontends/dri/dri_util.h
@@ -123,10 +123,7 @@ driCreateContextAttribs(__DRIscreen *psp, int api,
                         void *data);
 
 extern uint32_t
-driGLFormatToSizedInternalGLFormat(mesa_format format);
-
-extern mesa_format
-driImageFormatToGLFormat(uint32_t image_format);
+driImageFormatToSizedInternalGLFormat(uint32_t image_format);
 
 extern const __DRIimageDriverExtension driImageDriverExtension;