diff options
| author | Emil Velikov <[email protected]> | 2020-03-04 17:46:54 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2020-04-01 16:21:28 +0100 |
| commit | 06f758b0931794f5b8edb23587633f172e1b685d (patch) | |
| tree | 8c1beca1ffc70079e51f41ee3a245fbc115b5662 /src | |
| parent | 70ac7f5b0c46370075a35067c9f7dfe78e84b16d (diff) | |
meson: glx: drop with_glx == dri check
We can get into src/glx only with with_glx == dri. Thus there's no point
in the secondary, nested, check - it's always true.
Cc: Dylan Baker <dylan@pnwbakers>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Adam Jackson <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4084>
Diffstat (limited to 'src')
| -rw-r--r-- | src/glx/meson.build | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/glx/meson.build b/src/glx/meson.build index d0fcae72176..bbbd3d65a4f 100644 --- a/src/glx/meson.build +++ b/src/glx/meson.build @@ -30,6 +30,12 @@ files_libglx = files( 'clientinfo.c', 'compsize.c', 'create_context.c', + 'dri_common.c', + 'dri_common.h', + 'dri_common_query_renderer.c', + 'dri_common_interop.c', + 'drisw_glx.c', + 'drisw_priv.h', 'eval.c', 'glxclient.h', 'glxcmds.c', @@ -64,26 +70,15 @@ files_libglx = files( 'single2.c', 'singlepix.c', 'vertarr.c', + 'xfont.c', ) extra_libs_libglx = [] extra_deps_libgl = [] extra_ld_args_libgl = [] -if with_glx == 'dri' - files_libglx += files( - 'dri_common.c', - 'dri_common.h', - 'dri_common_query_renderer.c', - 'dri_common_interop.c', - 'xfont.c', - 'drisw_glx.c', - 'drisw_priv.h', - ) -endif - # dri2 -if with_glx == 'dri' and with_dri_platform == 'drm' and dep_libdrm.found() +if with_dri_platform == 'drm' and dep_libdrm.found() files_libglx += files( 'dri2.c', 'dri2_glx.c', |