From d6356b81a47b27706be50f6c2abbb6cd73b4d5e4 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@freedesktop.org>
Date: Sat, 1 May 2021 13:08:51 -0700
Subject: [PATCH] glx: Fix macOS build.

In file included from ../src/glx/apple/apple_glx_context.c:49:
../src/glx/glxclient.h:56:10: fatal error: 'loader.h' file not found
         ^~~~~~~~~~

Fixes: 1cb664c15cb3 ("glx: s/dri_message/glx_message/")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4702
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10568>
---
 src/glx/apple/apple_glx_log.c     | 1 +
 src/glx/apple/apple_glx_pbuffer.c | 1 +
 src/glx/apple/meson.build         | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/glx/apple/apple_glx_log.c b/src/glx/apple/apple_glx_log.c
index 3602a8c6248..d95d18dd940 100644
--- a/src/glx/apple/apple_glx_log.c
+++ b/src/glx/apple/apple_glx_log.c
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <inttypes.h>
 #include <pthread.h>
+#include "glxclient.h"
 #include "apple_glx_log.h"
 #include "util/debug.h"
 
diff --git a/src/glx/apple/apple_glx_pbuffer.c b/src/glx/apple/apple_glx_pbuffer.c
index bab4d3ff45b..e97e29323a7 100644
--- a/src/glx/apple/apple_glx_pbuffer.c
+++ b/src/glx/apple/apple_glx_pbuffer.c
@@ -44,6 +44,7 @@
 #include <stdlib.h>
 #include <pthread.h>
 #include <assert.h>
+#include "glxclient.h"
 #include "apple_glx.h"
 #include "glxconfig.h"
 #include "apple_cgl.h"
diff --git a/src/glx/apple/meson.build b/src/glx/apple/meson.build
index 86c4c76367d..f88c22de623 100644
--- a/src/glx/apple/meson.build
+++ b/src/glx/apple/meson.build
@@ -54,7 +54,7 @@ endif
 libappleglx = static_library(
   'glxapple',
   [files_libappleglx, glapitable_h],
-  include_directories: [inc_mesa, inc_glx, inc_src, inc_include, inc_glapi],
+  include_directories: [inc_mesa, inc_glx, inc_src, inc_include, inc_glapi, inc_loader],
   dependencies: [dep_xext, dep_xplugin],
   gnu_symbol_visibility : 'hidden',
   build_by_default: false,