Emil Velikov 80bea2ba6e glx/test: meson: assorted include fixes ... Swap '..' with the symbolic inc_glx and add glproto as dependency. That will pull the correct include, effectively fixing the tests on macOS. Fixes: a47c525f32 ("meson: build glx") Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Dylan Baker <dylan@pnwbakers.com> (cherry picked from commit f331419f26) Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Conflicts: src/glx/tests/meson.build		2019-01-11 19:19:08 +00:00
..
amd	radv: don't set surf_index for stencil-only images	2019-01-11 19:19:08 +00:00
broadcom	v3d: Add missing flagging of SYNCB as a TSY op.	2019-01-11 16:43:42 +00:00
compiler	nir: properly find the entry to keep in copy_prop_vars	2019-01-11 19:19:08 +00:00
egl	egl/wayland: plug memory leak in drm_handle_device()	2018-11-28 18:05:05 +00:00
gallium	pipe-loader: meson: reference correct library	2019-01-11 19:19:08 +00:00
gbm	gbm: remove unnecessary meson include	2018-11-14 18:53:02 +00:00
getopt
glx	glx/test: meson: assorted include fixes	2019-01-11 19:19:08 +00:00
gtest	meson: hide warnings from external project gtest	2018-10-31 18:20:25 +00:00
hgl	meson: Add Haiku platform support v4	2018-02-16 16:56:34 -06:00
intel	i965/vec4/dce: Don't narrow the write mask if the flags are used	2019-01-11 19:19:08 +00:00
loader	loader: free error state, when checking the drawable type	2019-01-11 16:43:42 +00:00
mapi	glapi: add missing visibility args	2018-11-23 11:50:36 +00:00
mesa	mesa/st/nir: fix missing nir_compact_varyings	2019-01-11 16:43:42 +00:00
util	util/ralloc: Make sizeof(linear_header) a multiple of 8	2018-11-14 18:53:02 +00:00
vulkan	vulkan/wsi: fix s/,/;/ typo	2018-11-28 18:05:05 +00:00
Makefile.am	configure: allow building with python3	2018-10-31 19:15:50 +00:00
meson.build	TODO: glx: meson: build dri based glx tests, only with -Dglx=dri	2019-01-11 19:19:08 +00:00
SConscript	scons: Remove gles option.	2018-10-19 16:50:26 +01:00