Mesa (master): glx/meson: use full include path for dri_interface.h

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 6e3d3f5b2c90ed79de85f69d4e0cc9b1b0760158
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e3d3f5b2c90ed79de85f69d4e0cc9b1b0760158

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Tue Mar  5 11:09:13 2019 +0000

glx/meson: use full include path for dri_interface.h

Everything else uses `#include "GL/internal/dri_interface.h"` instead,
and this full path was even already used in other parts of GLX.

While at it, nothing uses `inc_gl_internal` anymore so let's remove it
as well.

Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Tested-by: Clayton Craft <clayton.a.craft at intel.com>

---

 include/meson.build                                      | 1 -
 src/glx/dri_common_interop.c                             | 2 +-
 src/glx/dri_common_query_renderer.c                      | 2 +-
 src/glx/meson.build                                      | 2 +-
 src/glx/tests/meson.build                                | 3 +--
 src/glx/tests/query_renderer_implementation_unittest.cpp | 2 +-
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/include/meson.build b/include/meson.build
index aaeec1293f0..03168e6d802 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -20,7 +20,6 @@
 
 inc_include = include_directories('.')
 inc_d3d9 = include_directories('D3D9')
-inc_gl_internal = include_directories('GL/internal')
 inc_haikugl = include_directories('HaikuGL')
 
 if with_gles1
diff --git a/src/glx/dri_common_interop.c b/src/glx/dri_common_interop.c
index 85538c63599..2d4fc3d3e62 100644
--- a/src/glx/dri_common_interop.c
+++ b/src/glx/dri_common_interop.c
@@ -25,7 +25,7 @@
 
 #include "glxclient.h"
 #include "glx_error.h"
-#include "dri_interface.h"
+#include "GL/internal/dri_interface.h"
 #include "dri2_priv.h"
 #if defined(HAVE_DRI3)
 #include "dri3_priv.h"
diff --git a/src/glx/dri_common_query_renderer.c b/src/glx/dri_common_query_renderer.c
index ebeedc9c037..672e3bf314a 100644
--- a/src/glx/dri_common_query_renderer.c
+++ b/src/glx/dri_common_query_renderer.c
@@ -25,7 +25,7 @@
 
 #include "glxclient.h"
 #include "glx_error.h"
-#include "dri_interface.h"
+#include "GL/internal/dri_interface.h"
 #include "dri2_priv.h"
 #if defined(HAVE_DRI3)
 #include "dri3_priv.h"
diff --git a/src/glx/meson.build b/src/glx/meson.build
index 061e026e53f..0e3245a254f 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -139,7 +139,7 @@ gl_lib_cargs = [
 libglx = static_library(
   'glx',
   [files_libglx, glx_generated],
-  include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal],
+  include_directories : [inc_common, inc_glapi, inc_loader],
   c_args : [
     c_vis_args, gl_lib_cargs,
     '-DGL_LIB_NAME="lib at 0@.so. at 1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
diff --git a/src/glx/tests/meson.build b/src/glx/tests/meson.build
index 68e1ca59c22..83f04e47b2a 100644
--- a/src/glx/tests/meson.build
+++ b/src/glx/tests/meson.build
@@ -45,8 +45,7 @@ if with_shared_glapi
       [files_glx_test, glx_indirect_size_h, main_dispatch_h],
       link_with : [libglx, libglapi],
       include_directories : [
-        inc_src, inc_include, inc_mesa, inc_mapi, inc_gl_internal,
-        inc_glx,
+        inc_src, inc_include, inc_mesa, inc_mapi, inc_glx,
       ],
       dependencies : [dep_libdrm, dep_glproto, dep_thread, idep_gtest]
     ),
diff --git a/src/glx/tests/query_renderer_implementation_unittest.cpp b/src/glx/tests/query_renderer_implementation_unittest.cpp
index c3f5cc7214a..cf5fe16b398 100644
--- a/src/glx/tests/query_renderer_implementation_unittest.cpp
+++ b/src/glx/tests/query_renderer_implementation_unittest.cpp
@@ -29,7 +29,7 @@
 #include "glxclient.h"
 #include "glx_error.h"
 #include "dri2.h"
-#include "dri_interface.h"
+#include "GL/internal/dri_interface.h"
 #include "dri2_priv.h"
 
 struct attribute_test_vector {