diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-08-26 05:30:39 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-08-26 05:30:39 +0000 |
| commit | 27c93456b58343162f7c4ad20ca6bea0c9a91646 (patch) | |
| tree | 945c20b63e0b9975ee40f114c5312f8d8f1a2d0b /lib/mesa/src/gallium/auxiliary/pipe-loader | |
| parent | 875b83a3ee95e248388fbf72271acc80f6f97987 (diff) | |
Import Mesa 20.1.6
Diffstat (limited to 'lib/mesa/src/gallium/auxiliary/pipe-loader')
| -rw-r--r-- | lib/mesa/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 4 | ||||
| -rw-r--r-- | lib/mesa/src/gallium/auxiliary/pipe-loader/meson.build | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lib/mesa/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/lib/mesa/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h index 6c7c630f4..1be9abd87 100644 --- a/lib/mesa/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h +++ b/lib/mesa/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h @@ -31,6 +31,7 @@ DRI_CONF_SECTION_DEBUG DRI_CONF_FORCE_GLSL_ABS_SQRT("false") DRI_CONF_GLSL_CORRECT_DERIVATIVES_AFTER_DISCARD("false") DRI_CONF_ALLOW_GLSL_LAYOUT_QUALIFIER_ON_FUNCTION_PARAMETERS("false") + DRI_CONF_ALLOW_DRAW_OUT_OF_ORDER("false") DRI_CONF_FORCE_COMPAT_PROFILE("false") DRI_CONF_FORCE_GL_VENDOR() DRI_CONF_SECTION_END @@ -38,5 +39,8 @@ DRI_CONF_SECTION_END DRI_CONF_SECTION_MISCELLANEOUS DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER("false") DRI_CONF_GLSL_ZERO_INIT("false") + DRI_CONF_VS_POSITION_ALWAYS_INVARIANT("false") DRI_CONF_ALLOW_RGB10_CONFIGS("true") + DRI_CONF_ALLOW_FP16_CONFIGS("false") + DRI_CONF_FORCE_INTEGER_TEX_NEAREST("false") DRI_CONF_SECTION_END diff --git a/lib/mesa/src/gallium/auxiliary/pipe-loader/meson.build b/lib/mesa/src/gallium/auxiliary/pipe-loader/meson.build index 0e4b1ded5..4c6ae60ff 100644 --- a/lib/mesa/src/gallium/auxiliary/pipe-loader/meson.build +++ b/lib/mesa/src/gallium/auxiliary/pipe-loader/meson.build @@ -27,9 +27,11 @@ files_pipe_loader = files( ) libpipe_loader_defines = [] +libpipe_loader_links = [] if dep_libdrm.found() files_pipe_loader += files('pipe_loader_drm.c') + libpipe_loader_links += libloader endif if with_dri libpipe_loader_defines += '-DHAVE_PIPE_LOADER_DRI' @@ -37,10 +39,13 @@ endif if with_gallium_drisw_kms libpipe_loader_defines += '-DHAVE_PIPE_LOADER_KMS' endif +if not (with_gallium_st_nine or with_gallium_opencl) + libpipe_loader_defines += '-DDROP_PIPE_LOADER_MISC' +endif libpipe_loader_static = static_library( 'pipe_loader_static', - [files_pipe_loader, xmlpool_options_h], + files_pipe_loader, include_directories : [ inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux, inc_gallium_winsys, @@ -53,7 +58,7 @@ libpipe_loader_static = static_library( libpipe_loader_dynamic = static_library( 'pipe_loader_dynamic', - [files_pipe_loader, xmlpool_options_h], + files_pipe_loader, include_directories : [ inc_util, inc_loader, inc_gallium, inc_include, inc_src, inc_gallium_aux, inc_gallium_winsys, @@ -64,7 +69,7 @@ libpipe_loader_dynamic = static_library( join_paths(get_option('prefix'), get_option('libdir'), 'gallium-pipe') ) ], - link_with : libloader, + link_with : [libpipe_loader_links], dependencies : [dep_libdrm, idep_xmlconfig], build_by_default : false, ) |