diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2017-09-22 12:55:00 -0700 |
---|---|---|
committer | Dylan Baker <dylan@pnwbakers.com> | 2017-10-09 13:42:44 -0700 |
commit | a47c525f3281a2753180e076c7e9b7772aff8f06 (patch) | |
tree | a9a973252197dab9bcfdc0cb0731d2814f09646c /meson_options.txt | |
parent | 3218056e0eb375eeda470058d06add1532acd6d4 (diff) |
meson: build glx
This gets GLX and the loader building. The resulting GLX and i965 have
been tested on piglit and seem to work fine. This patch leaves a lot of
todo's in it's wake, GLX is quite complicated, and the build options
involved are many, and the goal at the moment is to get dri and gallium
drivers building.
v2: - fix typo "vaule" -> "value"
- put the not on the correct element of the conditional
- Put correct description of dri3 option in this patch not the next
one (Eric A)
- fix non glvnd version (Eric A)
- build glx tests
- move loader include variables to this patch (Eric A)
v3: - set the version correctly for GL_LIB_NAME in libglx
v4: - set pkgconfig private fields
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'meson_options.txt')
-rw-r--r-- | meson_options.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meson_options.txt b/meson_options.txt index f352f384c1..09adce0286 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -20,6 +20,8 @@ option('platforms', type : 'string', value : 'x11,wayland', description : 'comma separated list of window systems to support. wayland, x11, surfaceless, drm, etc.') +option('dri3', type : 'combo', value : 'auto', choices : ['auto', 'yes', 'no'], + description : 'enable support for dri3') option('dri-drivers', type : 'string', value : 'i965', description : 'comma separated list of dri drivers to build.') option('vulkan-drivers', type : 'string', value : 'intel,amd', @@ -36,6 +38,10 @@ option('gles2', type : 'boolean', value : true, description : 'Build support for OpenGL ES 2.x and 3.x') option('opengl', type : 'boolean', value : true, description : 'Build support for OpenGL (all versions)') +option('glx', type : 'combo', value : 'auto', choices : ['auto', 'disabled', 'dri', 'xlib', 'gallium-xlib'], + description : 'Build support for GLX platform') +option('glvnd', type : 'boolean', value : false, + description : 'Enable GLVND support.') option('asm', type : 'boolean', value : true, description : 'Build assembly code if possible') option('valgrind', type : 'boolean', value : true, |