treewide: Include mesa_interface.h not dri_interface.h

We're about to split the latter off as a compatibility detail for older
versions of Xorg, and the former includes the latter at this point, so
this should be just to prove no functional change.

Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28378>

include/kopper_interface.h

@@ -34,7 +34,7 @@
 #ifndef KOPPER_INTERFACE_H
 #define KOPPER_INTERFACE_H
 
-#include <GL/internal/dri_interface.h>
+#include <GL/internal/mesa_interface.h>
 #include <vulkan/vulkan_core.h>
 
 typedef struct __DRIkopperExtensionRec          __DRIkopperExtension;

src/egl/drivers/dri2/egl_dri2.c

@@ -42,7 +42,7 @@
 #include "drm-uapi/drm_fourcc.h"
 #endif
 #include <GL/gl.h>
-#include <GL/internal/dri_interface.h>
+#include <GL/internal/mesa_interface.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include "dri_screen.h"
@@ -2711,7 +2711,7 @@ dri2_query_dma_buf_formats(_EGLDisplay *disp, EGLint max, EGLint *formats,
    if (max > 0) {
       /* Assert that all of the formats returned are actually fourcc formats.
        * Some day, if we want the internal interface function to be able to
-       * return the fake fourcc formats defined in dri_interface.h, we'll have
+       * return the fake fourcc formats defined in mesa_interface.h, we'll have
        * to do something more clever here to pair the list down to just real
        * fourcc formats so that we don't leak the fake internal ones.
        */

src/egl/drivers/dri2/egl_dri2.h

@@ -59,7 +59,7 @@ struct zwp_linux_dmabuf_feedback_v1;
 #endif
 
 #include <GL/gl.h>
-#include <GL/internal/dri_interface.h>
+#include <GL/internal/mesa_interface.h>
 #include <GL/internal/mesa_interface.h>
 #include "kopper_interface.h"
 

src/egl/drivers/dri2/platform_android.h

@@ -29,7 +29,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <GL/internal/dri_interface.h>
+#include <GL/internal/mesa_interface.h>
 
 #include "egl_dri2.h"
 

src/gallium/frontends/dri/dri_util.h

@@ -35,7 +35,7 @@
 #define _DRI_UTIL_H_
 
 #include <GL/gl.h>
-#include <GL/internal/dri_interface.h>
+#include <GL/internal/mesa_interface.h>
 #include "kopper_interface.h"
 #include "main/formats.h"
 #include "main/glconfig.h"

src/gbm/backends/dri/gbm_dri.c

@@ -41,8 +41,8 @@
 #include <xf86drm.h>
 #include "drm-uapi/drm_fourcc.h"
 
-#include <GL/gl.h> /* dri_interface needs GL types */
-#include <GL/internal/dri_interface.h>
+#include <GL/gl.h> /* mesa_interface needs GL types */
+#include <GL/internal/mesa_interface.h>
 
 #include "gbm_driint.h"
 

src/gbm/backends/dri/gbm_driint.h

@@ -34,8 +34,8 @@
 #include "gbmint.h"
 #include "c11/threads.h"
 
-#include <GL/gl.h> /* dri_interface needs GL types */
-#include "GL/internal/dri_interface.h"
+#include <GL/gl.h> /* mesa_interface needs GL types */
+#include "GL/internal/mesa_interface.h"
 #include "GL/internal/mesa_interface.h"
 #include "kopper_interface.h"
 

src/glx/dri_common.h

@@ -38,7 +38,7 @@
 
 #ifdef GLX_DIRECT_RENDERING
 
-#include <GL/internal/dri_interface.h>
+#include <GL/internal/mesa_interface.h>
 #include <stdbool.h>
 #include "loader.h"
 #include "util/macros.h" /* for PRINTFLIKE */

src/glx/dri_common_interop.c

@@ -25,7 +25,7 @@
 
 #include "glxclient.h"
 #include "glx_error.h"
-#include "GL/internal/dri_interface.h"
+#include "GL/internal/mesa_interface.h"
 #include "dri2_priv.h"
 #if defined(HAVE_DRI3)
 #include "dri3_priv.h"

src/glx/dri_common_query_renderer.c

@@ -25,7 +25,7 @@
 
 #include "glxclient.h"
 #include "glx_error.h"
-#include "GL/internal/dri_interface.h"
+#include "GL/internal/mesa_interface.h"
 #include "dri2_priv.h"
 #if defined(HAVE_DRI3)
 #include "dri3_priv.h"

src/glx/tests/query_renderer_implementation_unittest.cpp

@@ -29,7 +29,7 @@
 #include "glxclient.h"
 #include "glx_error.h"
 #include "dri2.h"
-#include "GL/internal/dri_interface.h"
+#include "GL/internal/mesa_interface.h"
 #include "dri2_priv.h"
 
 namespace {

src/loader/loader.c

@@ -45,7 +45,6 @@
 #include <sys/sysmacros.h>
 #endif
 #include <GL/gl.h>
-#include <GL/internal/dri_interface.h>
 #include <GL/internal/mesa_interface.h>
 #include "loader.h"
 #include "util/libdrm.h"

src/loader/loader.h

@@ -30,7 +30,7 @@
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <stddef.h>
-#include "GL/internal/dri_interface.h"
+#include "GL/internal/mesa_interface.h"
 
 #ifdef __cplusplus
 extern "C" {

src/loader/loader_dri3_helper.h

@@ -32,7 +32,7 @@
 #include <xcb/present.h>
 
 #include <GL/gl.h>
-#include <GL/internal/dri_interface.h>
+#include <GL/internal/mesa_interface.h>
 #include <c11/threads.h>
 
 enum loader_dri3_buffer_type {

src/loader/loader_dri_helper.c

@@ -23,8 +23,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include <GL/gl.h> /* dri_interface needs GL types */
-#include <GL/internal/dri_interface.h>
+#include <GL/gl.h> /* mesa_interface needs GL types */
+#include <GL/internal/mesa_interface.h>
 
 #include "drm-uapi/drm_fourcc.h"
 #include "loader_dri_helper.h"

src/loader/loader_dri_helper.h

@@ -24,8 +24,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include <GL/gl.h> /* dri_interface needs GL types */
-#include <GL/internal/dri_interface.h>
+#include <GL/gl.h> /* mesa_interface needs GL types */
+#include <GL/internal/mesa_interface.h>
 #include <c11/threads.h>
 #include "util/format/u_formats.h"
 

src/mesa/state_tracker/st_cb_eglimage.c

@@ -25,7 +25,7 @@
  *    Chia-I Wu <olv@lunarg.com>
  */
 
-#include <GL/internal/dri_interface.h>
+#include <GL/internal/mesa_interface.h>
 #include "main/errors.h"
 #include "main/texobj.h"
 #include "main/teximage.h"

src/util/u_gralloc/u_gralloc.h

@@ -17,7 +17,7 @@ extern "C" {
 #include <stdbool.h>
 
 #include "util/macros.h"
-#include "GL/internal/dri_interface.h"
+#include "GL/internal/mesa_interface.h"
 
 struct u_gralloc;