Commit 6e3d3f5b authored by Eric Engestrom's avatar Eric Engestrom Committed by Eric Engestrom

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: 's avatarEric Engestrom <eric.engestrom@intel.com>
Reviewed-by: 's avatarDylan Baker <dylan@pnwbakers.com>
Tested-by: 's avatarClayton Craft <clayton.a.craft@intel.com>
parent b1218d8c
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
......
......@@ -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]
),
......
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment