Update MesaLib to 11.1.1. Add patches from xsrc: atexit() is not a good idea in shared libraries. Changes: Bug fixes This list is likely incomplete. Bug 91806 - configure does not test whether assembler supports sse4.1 Bug 92229 - [APITRACE] SOMA have serious graphical errors Bug 92233 - Unigine Heaven 4.0 silhuette run Bug 93004 - Guild Wars 2 crash on nouveau DX11 cards Bug 93215 - [Regression bisected] Ogles1conform Automatic mipmap generation test is fail Bug 93257 - [SKL, bisected] ASTC dEQP tests segfault Changes Brian Paul (1): st/mesa: check state->mesa in early return check in st_validate_state() Dave Airlie (6): mesa/varray: set double arrays to non-normalised. mesa/shader: return correct attribute location for double matrix arrays glsl: pass stage into mark function glsl/fp64: add helper for dual slot double detection. glsl: fix count_attribute_slots to allow for different 64-bit handling glsl: only update doubles inputs for vertex inputs. Emil Velikov (4): docs: add sha256 checksums for 11.0.1 cherry-ignore: drop the "re-enable" DCC on Stoney cherry-ignore: don't pick a specific i965 formats patch Update version to 11.1.1 Eric Anholt (2): vc4: Warn instead of abort()ing on exec ioctl failures. vc4: Keep sample mask writes from being reordered after TLB writes Grazvydas Ignotas (1): r600: fix constant buffer size programming Ian Romanick (1): meta/generate_mipmap: Work-around GLES 1.x problem with GL_DRAW_FRAMEBUFFER Ilia Mirkin (9): nv50/ir: can't have predication and immediates gk104/ir: simplify and fool-proof texbar algorithm glsl: assign varying locations to tess shaders when doing SSO glx/dri3: a drawable might not be bound at wait time nvc0: don't forget to reset VTX_TMP bufctx slot after blit completion nv50/ir: float(s32 & 0xff) = float(u8), not s8 nv50,nvc0: make sure there's pushbuf space and that we ref the bo early nv50,nvc0: fix crash when increasing bsp bo size for h264 nvc0: scale up inter_bo size so that it's 16M for a 4K video Jonathan Gray (2): configure.ac: use pkg-config for libelf configure: check for python2.7 for PYTHON2 Kenneth Graunke (5): ralloc: Fix ralloc_adopt() to the old context's last child's parent. drirc: Disable ARB_blend_func_extended for Heaven 4.0/Valley 1.0. glsl: Fix varying struct locations when varying packing is disabled. nvc0: Set winding order regardless of domain. nir: Add a lower_fdiv option, turn fdiv into fmul/frcp. Marek Ol邸叩k (7): tgsi/scan: add flag colors_written r600g: write all MRTs only if there is exactly one output (fixes a hang) radeonsi: don't call of u_prims_for_vertices for patches and rectangles radeonsi: apply the streamout workaround to Fiji as well gallium/radeon: fix Hyper-Z hangs by programming PA_SC_MODE_CNTL_1 correctly program: add _mesa_reserve_parameter_storage st/mesa: fix GLSL uniform updates for glBitmap & glDrawPixels (v2) Mark Janes (1): Add missing platform information for KBL Mikl坦s M叩t辿 (1): mesa: Don't leak ATIfs instructions in DeleteFragmentShader Neil Roberts (3): i965: Add MESA_FORMAT_B8G8R8X8_SRGB to brw_format_for_mesa_format i965: Add B8G8R8X8_SRGB to the alpha format override i965: Fix crash when calling glViewport with no surface bound Nicolai H辰hnle (2): gallium/radeon: only dispose locally created target machine in radeon_llvm_compile gallium/radeon: fix regression in a number of driver queries Oded Gabbay (1): configura.ac: fix test for SSE4.1 assembler support Patrick Rudolph (2): nv50,nvc0: fix use-after-free when vertex buffers are unbound gallium/util: return correct number of bound vertex buffers Rob Herring (1): freedreno/ir3: fix 32-bit builds with pointer-to-int-cast error enabled Samuel Pitoiset (3): nvc0: free memory allocated by the prog which reads MP perf counters nv50,nvc0: free memory allocated by performance metrics nv50: free memory allocated by the prog which reads MP perf counters Sarah Sharp (1): mesa: Add KBL PCI IDs and platform information.diff -r1.119 -r1.120 pkgsrc/graphics/MesaLib/Makefile
(wiz)
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | # $NetBSD: Makefile,v 1.119 2016/01/05 13:02:57 tnn Exp $ | 1 | # $NetBSD: Makefile,v 1.120 2016/01/27 07:39:54 wiz Exp $ | |
2 | 2 | |||
3 | DISTNAME= mesa-11.1.0 | 3 | DISTNAME= mesa-11.1.1 | |
4 | PKGNAME= ${DISTNAME:S/mesa/MesaLib/} | 4 | PKGNAME= ${DISTNAME:S/mesa/MesaLib/} | |
5 | CATEGORIES= graphics x11 | 5 | CATEGORIES= graphics x11 | |
6 | MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/ | 6 | MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/ | |
7 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.mesa3d.org/ | 10 | HOMEPAGE= http://www.mesa3d.org/ | |
11 | COMMENT= The Mesa 3D Graphics Library | 11 | COMMENT= The Mesa 3D Graphics Library | |
12 | LICENSE= mit | 12 | LICENSE= mit | |
13 | 13 | |||
14 | GNU_CONFIGURE= yes | 14 | GNU_CONFIGURE= yes | |
15 | USE_TOOLS+= pkg-config gmake | 15 | USE_TOOLS+= pkg-config gmake | |
16 | USE_LANGUAGES= c99 c++ | 16 | USE_LANGUAGES= c99 c++ |
@@ -1,46 +1,49 @@ | @@ -1,46 +1,49 @@ | |||
1 | $NetBSD: distinfo,v 1.110 2016/01/05 13:02:57 tnn Exp $ | 1 | $NetBSD: distinfo,v 1.111 2016/01/27 07:39:54 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (mesa-11.1.0.tar.xz) = a57c3b741a465cfd189416bb036323d2ec581d94 | 3 | SHA1 (mesa-11.1.1.tar.xz) = 77eeb75660e8d0851457151ef18c87540c6fd6bc | |
4 | RMD160 (mesa-11.1.0.tar.xz) = 386684fe856ab3acfa914fb8809886330c7696c4 | 4 | RMD160 (mesa-11.1.1.tar.xz) = 2ebeefdec30be12a32977f46611f0aa28c677c38 | |
5 | SHA512 (mesa-11.1.0.tar.xz) = 49817dbe599fdeb3e9d69f149283a5414d3101177040e04ec2c07c9bc57c2e86dcd74c0eb9e5784eb74ec5adff01f4fc8fd07fce650ce0afc18c81265e369192 | 5 | SHA512 (mesa-11.1.1.tar.xz) = 1d41bb4e58042230a38784477c425a2517ef57b17055413884dfb1b7a635a7d8ec68b9be705cbd5608910d75d73988d7c18467c779c48547c5c533750e722521 | |
6 | Size (mesa-11.1.0.tar.xz) = 7557948 bytes | 6 | Size (mesa-11.1.1.tar.xz) = 7561216 bytes | |
7 | SHA1 (patch-configure) = 3e0c3402bfbc4ad286fe938b8b117add23d51454 | 7 | SHA1 (patch-configure) = c4d69982863b1752891339a9dd3c0c37bc896006 | |
8 | SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e | 8 | SHA1 (patch-include_GL_glxext.h) = 830902f2d38a8395cda682c059fc5223e1b0e89e | |
9 | SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 99b6dd6739c29551ae2c885eabd7babd159fc3e5 | 9 | SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 99b6dd6739c29551ae2c885eabd7babd159fc3e5 | |
10 | SHA1 (patch-src_egl_main_eglglobals.c) = 2d81ae27f09162d23bc684456cc5fef48c042652 | |||
10 | SHA1 (patch-src_gallium_auxiliary_util_u__cpu__detect.c) = 5f4c3db54620739da0fe7dfb57c58728ecbbb6e0 | 11 | SHA1 (patch-src_gallium_auxiliary_util_u__cpu__detect.c) = 5f4c3db54620739da0fe7dfb57c58728ecbbb6e0 | |
11 | SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975 | 12 | SHA1 (patch-src_gallium_auxiliary_util_u__format__tests.c) = 4d5e4677c2825778c43440ab131b8807f6840975 | |
12 | SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = 812e4a5291aea47e06505f09891e0434c4d9c34d | 13 | SHA1 (patch-src_gallium_auxiliary_util_u__math.h) = 812e4a5291aea47e06505f09891e0434c4d9c34d | |
13 | SHA1 (patch-src_gallium_auxiliary_util_u__network.c) = 283f505af780071dc9fd7914f8065e3fb7d8a4fd | 14 | SHA1 (patch-src_gallium_auxiliary_util_u__network.c) = 283f505af780071dc9fd7914f8065e3fb7d8a4fd | |
14 | SHA1 (patch-src_gallium_auxiliary_util_u__network.h) = c6106d67b4fa9db0d790474182d6e0ce0c5da677 | 15 | SHA1 (patch-src_gallium_auxiliary_util_u__network.h) = c6106d67b4fa9db0d790474182d6e0ce0c5da677 | |
15 | SHA1 (patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp) = 5fc2ef7eafac3006896af96bac8176c79b17cfdc | 16 | SHA1 (patch-src_gallium_drivers_nouveau_codegen_nv50__ir__peephole.cpp) = 5fc2ef7eafac3006896af96bac8176c79b17cfdc | |
16 | SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = ae1b6eb4df3e4db0f37e44118cdf69b16f3c471e | 17 | SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = ae1b6eb4df3e4db0f37e44118cdf69b16f3c471e | |
17 | SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626 | 18 | SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626 | |
18 | SHA1 (patch-src_gallium_targets_dri_Makefile.in) = a9a8265d97297040a3e3260b362ca920ec852280 | 19 | SHA1 (patch-src_gallium_targets_dri_Makefile.in) = a9a8265d97297040a3e3260b362ca920ec852280 | |
19 | SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 2358b7d5ea89e28cb3ac07a408b18e8bf55e057a | 20 | SHA1 (patch-src_gallium_winsys_radeon_drm_radeon__drm__winsys.c) = 2358b7d5ea89e28cb3ac07a408b18e8bf55e057a | |
20 | SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen.c) = 4b2ae565377b1a0396c8bf6b2663c261592b8e5e | 21 | SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen.c) = 4b2ae565377b1a0396c8bf6b2663c261592b8e5e | |
21 | SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = e4b891e8b4ebe5b8e8c7b8c2c1dbed11b9c417df | 22 | SHA1 (patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c) = e4b891e8b4ebe5b8e8c7b8c2c1dbed11b9c417df | |
22 | SHA1 (patch-src_gbm_main_gbm.c) = 70225ab7352f123c9efc68b6d4ff0d9675b6f9dc | 23 | SHA1 (patch-src_gbm_main_gbm.c) = 70225ab7352f123c9efc68b6d4ff0d9675b6f9dc | |
24 | SHA1 (patch-src_glsl_glsl__parser__extras.cpp) = eb05a70782edb0ccb82c04ef17de60352c840268 | |||
23 | SHA1 (patch-src_glsl_ralloc.c) = 7443d00ff05ee1e1dcfa2b76972b55abadebcad8 | 25 | SHA1 (patch-src_glsl_ralloc.c) = 7443d00ff05ee1e1dcfa2b76972b55abadebcad8 | |
24 | SHA1 (patch-src_glx_apple_apple__glapi.c) = df70afc24759978f954ac3a774a14e6518dde97a | 26 | SHA1 (patch-src_glx_apple_apple__glapi.c) = df70afc24759978f954ac3a774a14e6518dde97a | |
25 | SHA1 (patch-src_glx_glxclient.h) = e15256851559dafb7a86e1eb7e9d6afc86de581b | 27 | SHA1 (patch-src_glx_glxclient.h) = e15256851559dafb7a86e1eb7e9d6afc86de581b | |
26 | SHA1 (patch-src_glx_glxcurrent.c) = 713f75bcafb186c7123d19a6aae3deaed9d5fa69 | 28 | SHA1 (patch-src_glx_glxcurrent.c) = 713f75bcafb186c7123d19a6aae3deaed9d5fa69 | |
27 | SHA1 (patch-src_loader_Makefile.in) = be0eb34d814366c14ba5165b8081d18f37d262eb | 29 | SHA1 (patch-src_loader_Makefile.in) = 30454c207924183c881a84d31458fdc0ddb1680b | |
28 | SHA1 (patch-src_loader_loader.c) = f99b13451f4f932031e876cd611ab746ec5caf1b | 30 | SHA1 (patch-src_loader_loader.c) = f99b13451f4f932031e876cd611ab746ec5caf1b | |
29 | SHA1 (patch-src_mapi_entry__x86-64__tls.h) = e1cc896dd9cf7d77b837104557c0e0bf9d41ff55 | 31 | SHA1 (patch-src_mapi_entry__x86-64__tls.h) = e1cc896dd9cf7d77b837104557c0e0bf9d41ff55 | |
30 | SHA1 (patch-src_mapi_entry__x86__tls.h) = 3d6c11281b57c9c713899022bfc8fcea54d07d56 | 32 | SHA1 (patch-src_mapi_entry__x86__tls.h) = 3d6c11281b57c9c713899022bfc8fcea54d07d56 | |
31 | SHA1 (patch-src_mapi_entry__x86__tsd.h) = 62501b6e609fa81e33fd826a694e9d9752a7ba21 | 33 | SHA1 (patch-src_mapi_entry__x86__tsd.h) = 62501b6e609fa81e33fd826a694e9d9752a7ba21 | |
32 | SHA1 (patch-src_mapi_glapi_gen_gl__gentable.py) = 53026e520a510e54494760a3fa05af6f15dfb9d8 | 34 | SHA1 (patch-src_mapi_glapi_gen_gl__gentable.py) = 53026e520a510e54494760a3fa05af6f15dfb9d8 | |
33 | SHA1 (patch-src_mapi_u__current.c) = 1731375d82119be326b35d141d7879e083d6d620 | 35 | SHA1 (patch-src_mapi_u__current.c) = 1731375d82119be326b35d141d7879e083d6d620 | |
34 | SHA1 (patch-src_mapi_u__current.h) = 214dd29cb0c4fe127eb1157b04b12ddfc455b4b0 | 36 | SHA1 (patch-src_mapi_u__current.h) = 214dd29cb0c4fe127eb1157b04b12ddfc455b4b0 | |
35 | SHA1 (patch-src_mesa_drivers_dri_Makefile.in) = 48032b8f8e6eac59092f68f3c32cfdd44d7ce8bf | 37 | SHA1 (patch-src_mesa_drivers_dri_Makefile.in) = 48032b8f8e6eac59092f68f3c32cfdd44d7ce8bf | |
36 | SHA1 (patch-src_mesa_drivers_dri_common_Makefile.in) = 5e160f7d92c2e9f3fa36e52a082a496af67e634e | 38 | SHA1 (patch-src_mesa_drivers_dri_common_Makefile.in) = 5e160f7d92c2e9f3fa36e52a082a496af67e634e | |
37 | SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = 668cc1d6a58f8f02eb9eb32c1aeffb4bef7beaf4 | 39 | SHA1 (patch-src_mesa_drivers_dri_common_xmlconfig.c) = 668cc1d6a58f8f02eb9eb32c1aeffb4bef7beaf4 | |
38 | SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = fd8436e4e3a69250256c2cddf8138effb16bd7b3 | 40 | SHA1 (patch-src_mesa_drivers_dri_i915_intel__screen.c) = fd8436e4e3a69250256c2cddf8138effb16bd7b3 | |
39 | SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 7c1a1e5c549f64d4c390e0c87984c44a88d4abfe | 41 | SHA1 (patch-src_mesa_drivers_dri_i965_intel__screen.c) = 7c1a1e5c549f64d4c390e0c87984c44a88d4abfe | |
40 | SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = b8a6cca517e1cccbdb2c59cf67a6d2481cdfebd4 | 42 | SHA1 (patch-src_mesa_drivers_dri_swrast_swrast.c) = b8a6cca517e1cccbdb2c59cf67a6d2481cdfebd4 | |
41 | SHA1 (patch-src_mesa_main_context.c) = 695b0e04cbd08dfed46b4dae5f9602b35e21f5b3 | 43 | SHA1 (patch-src_mesa_main_context.c) = 695b0e04cbd08dfed46b4dae5f9602b35e21f5b3 | |
44 | SHA1 (patch-src_mesa_main_extensions.c) = d650d7ddfe22ddbcd8a4c24b64feb27126521ae0 | |||
42 | SHA1 (patch-src_mesa_main_macros.h) = e0e98dff37bbf96fea2f3adf0dc9ef9911b711d9 | 45 | SHA1 (patch-src_mesa_main_macros.h) = e0e98dff37bbf96fea2f3adf0dc9ef9911b711d9 | |
43 | SHA1 (patch-src_mesa_main_shader__query.cpp) = 6273c74161f045363c58f38adeb672287f6a0898 | 46 | SHA1 (patch-src_mesa_main_shader__query.cpp) = 6273c74161f045363c58f38adeb672287f6a0898 | |
44 | SHA1 (patch-src_mesa_tnl_t__pipeline.c) = afc7d5f27aeadacc7c6a762e5aa892e01a0c1317 | 47 | SHA1 (patch-src_mesa_tnl_t__pipeline.c) = afc7d5f27aeadacc7c6a762e5aa892e01a0c1317 | |
45 | SHA1 (patch-src_mesa_x86_common__x86.c) = bdac91384d67ad0238ecd4cdcf5cfc787952a3d9 | 48 | SHA1 (patch-src_mesa_x86_common__x86.c) = bdac91384d67ad0238ecd4cdcf5cfc787952a3d9 | |
46 | SHA1 (patch-src_util_u__atomic.h) = 4a567b6fe5bf67fb7f386fa5f37bedb66d593085 | 49 | SHA1 (patch-src_util_u__atomic.h) = 4a567b6fe5bf67fb7f386fa5f37bedb66d593085 |
@@ -1,65 +1,65 @@ | @@ -1,65 +1,65 @@ | |||
1 | $NetBSD: patch-configure,v 1.3 2016/01/05 13:02:57 tnn Exp $ | 1 | $NetBSD: patch-configure,v 1.4 2016/01/27 07:39:54 wiz Exp $ | |
2 | 2 | |||
3 | Make sure toolchain can assemble SSE stuff in addition to having intrinsics. | 3 | Make sure toolchain can assemble SSE stuff in addition to having intrinsics. | |
4 | Add libdevq support from FreeBSD ports. | 4 | Add libdevq support from FreeBSD ports. | |
5 | 5 | |||
6 | --- configure.orig 2015-12-15 14:52:26.000000000 +0000 | 6 | --- configure.orig 2016-01-13 10:48:25.000000000 +0000 | |
7 | +++ configure | 7 | +++ configure | |
8 | @@ -859,6 +859,8 @@ GLPROTO_LIBS | 8 | @@ -860,6 +860,8 @@ GLPROTO_LIBS | |
9 | GLPROTO_CFLAGS | 9 | GLPROTO_CFLAGS | |
10 | XLIBGL_LIBS | 10 | XLIBGL_LIBS | |
11 | XLIBGL_CFLAGS | 11 | XLIBGL_CFLAGS | |
12 | +LIBDEVQ_LIBS | 12 | +LIBDEVQ_LIBS | |
13 | +LIBDEVQ_CFLAGS | 13 | +LIBDEVQ_CFLAGS | |
14 | LIBUDEV_LIBS | 14 | LIBUDEV_LIBS | |
15 | LIBUDEV_CFLAGS | 15 | LIBUDEV_CFLAGS | |
16 | ENABLE_SHADER_CACHE_FALSE | 16 | ENABLE_SHADER_CACHE_FALSE | |
17 | @@ -1173,6 +1175,8 @@ OPENSSL_CFLAGS | 17 | @@ -1174,6 +1176,8 @@ OPENSSL_CFLAGS | |
18 | OPENSSL_LIBS | 18 | OPENSSL_LIBS | |
19 | LIBUDEV_CFLAGS | 19 | LIBUDEV_CFLAGS | |
20 | LIBUDEV_LIBS | 20 | LIBUDEV_LIBS | |
21 | +LIBDEVQ_CFLAGS | 21 | +LIBDEVQ_CFLAGS | |
22 | +LIBDEVQ_LIBS | 22 | +LIBDEVQ_LIBS | |
23 | XLIBGL_CFLAGS | 23 | XLIBGL_CFLAGS | |
24 | XLIBGL_LIBS | 24 | XLIBGL_LIBS | |
25 | GLPROTO_CFLAGS | 25 | GLPROTO_CFLAGS | |
26 | @@ -5281,6 +5285,7 @@ DRI2PROTO_REQUIRED=2.6 | 26 | @@ -5287,6 +5291,7 @@ DRI2PROTO_REQUIRED=2.6 | |
27 | DRI3PROTO_REQUIRED=1.0 | 27 | DRI3PROTO_REQUIRED=1.0 | |
28 | PRESENTPROTO_REQUIRED=1.0 | 28 | PRESENTPROTO_REQUIRED=1.0 | |
29 | LIBUDEV_REQUIRED=151 | 29 | LIBUDEV_REQUIRED=151 | |
30 | +LIBDEVQ_REQUIRED=0.0.2 | 30 | +LIBDEVQ_REQUIRED=0.0.2 | |
31 | GLPROTO_REQUIRED=1.4.14 | 31 | GLPROTO_REQUIRED=1.4.14 | |
32 | LIBOMXIL_BELLAGIO_REQUIRED=0.0 | 32 | LIBOMXIL_BELLAGIO_REQUIRED=0.0 | |
33 | LIBVA_REQUIRED=0.38.0 | 33 | LIBVA_REQUIRED=0.38.0 | |
34 | @@ -19935,7 +19940,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ | 34 | @@ -19942,7 +19947,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ | |
35 | #include <smmintrin.h> | 35 | int param; | |
36 | int main () { | 36 | int main () { | |
37 | __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c; | 37 | __m128i a = _mm_set1_epi32 (param), b = _mm_set1_epi32 (param + 1), c; | |
38 | - c = _mm_max_epu32(a, b); | 38 | - c = _mm_max_epu32(a, b); | |
39 | + c = _mm_max_epu32(a, b); asm volatile ("movntdqa (%esi),%xmm3\n"); | 39 | + c = _mm_max_epu32(a, b); asm volatile ("movntdqa (%esi),%xmm3\n"); | |
40 | return 0; | 40 | return _mm_cvtsi128_si32(c); | |
41 | } | 41 | } | |
42 | _ACEOF | 42 | _ACEOF | |
43 | @@ -20720,7 +20725,7 @@ _ACEOF | 43 | @@ -20727,7 +20732,7 @@ _ACEOF | |
44 | $as_echo_n "checking if more special flags are required for pthreads... " >&6; } | 44 | $as_echo_n "checking if more special flags are required for pthreads... " >&6; } | |
45 | flag=no | 45 | flag=no | |
46 | case ${host_os} in | 46 | case ${host_os} in | |
47 | - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; | 47 | - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; | |
48 | + aix* | freebsd* | dragonfly* | darwin*) flag="-D_THREAD_SAFE";; | 48 | + aix* | freebsd* | dragonfly* | darwin*) flag="-D_THREAD_SAFE";; | |
49 | osf* | hpux*) flag="-D_REENTRANT";; | 49 | osf* | hpux*) flag="-D_REENTRANT";; | |
50 | solaris*) | 50 | solaris*) | |
51 | if test "$GCC" = "yes"; then | 51 | if test "$GCC" = "yes"; then | |
52 | @@ -22080,6 +22085,89 @@ else | 52 | @@ -22087,6 +22092,89 @@ else | |
53 | fi | 53 | fi | |
54 | 54 | |||
55 | 55 | |||
56 | + | 56 | + | |
57 | +# Check for libdevq | 57 | +# Check for libdevq | |
58 | + | 58 | + | |
59 | +pkg_failed=no | 59 | +pkg_failed=no | |
60 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5 | 60 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5 | |
61 | +$as_echo_n "checking for LIBDEVQ... " >&6; } | 61 | +$as_echo_n "checking for LIBDEVQ... " >&6; } | |
62 | +if test -n "$LIBDEVQ_CFLAGS"; then | 62 | +if test -n "$LIBDEVQ_CFLAGS"; then | |
63 | + pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS" | 63 | + pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS" | |
64 | + elif test -n "$PKG_CONFIG"; then | 64 | + elif test -n "$PKG_CONFIG"; then | |
65 | + if test -n "$PKG_CONFIG" && \ | 65 | + if test -n "$PKG_CONFIG" && \ | |
@@ -129,43 +129,43 @@ Add libdevq support from FreeBSD ports. | @@ -129,43 +129,43 @@ Add libdevq support from FreeBSD ports. | |||
129 | + LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS | 129 | + LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS | |
130 | + LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS | 130 | + LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS | |
131 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | 131 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | |
132 | +$as_echo "yes" >&6; } | 132 | +$as_echo "yes" >&6; } | |
133 | + have_libdevq=yes | 133 | + have_libdevq=yes | |
134 | +fi | 134 | +fi | |
135 | + | 135 | + | |
136 | + | 136 | + | |
137 | + | 137 | + | |
138 | + | 138 | + | |
139 | if test "x$enable_dri" = xyes; then | 139 | if test "x$enable_dri" = xyes; then | |
140 | if test "$enable_static" = yes; then | 140 | if test "$enable_static" = yes; then | |
141 | as_fn_error $? "Cannot use static libraries for DRI drivers" "$LINENO" 5 | 141 | as_fn_error $? "Cannot use static libraries for DRI drivers" "$LINENO" 5 | |
142 | @@ -22882,6 +22970,10 @@ if test "$have_sysfs" = yes; then | 142 | @@ -22889,6 +22977,10 @@ if test "$have_sysfs" = yes; then | |
143 | DEFINES="$DEFINES -DHAVE_SYSFS" | 143 | DEFINES="$DEFINES -DHAVE_SYSFS" | |
144 | have_pci_id=yes | 144 | have_pci_id=yes | |
145 | fi | 145 | fi | |
146 | +if test "$have_libdevq" = yes; then | 146 | +if test "$have_libdevq" = yes; then | |
147 | + DEFINES="$DEFINES -DHAVE_LIBDEVQ" | 147 | + DEFINES="$DEFINES -DHAVE_LIBDEVQ" | |
148 | + have_pci_id=yes | 148 | + have_pci_id=yes | |
149 | +fi | 149 | +fi | |
150 | 150 | |||
151 | # This is outside the case (above) so that it is invoked even for non-GLX | 151 | # This is outside the case (above) so that it is invoked even for non-GLX | |
152 | # builds. | 152 | # builds. | |
153 | @@ -23814,6 +23906,8 @@ fi | 153 | @@ -23821,6 +23913,8 @@ fi | |
154 | 154 | |||
155 | if test "x$need_pci_id$have_libudev" = xyesyes; then | 155 | if test "x$need_pci_id$have_libudev" = xyesyes; then | |
156 | GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED" | 156 | GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED" | |
157 | +elif test "x$need_libdevq" = xyes; then | 157 | +elif test "x$need_libdevq" = xyes; then | |
158 | + GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED" | 158 | + GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED" | |
159 | else | 159 | else | |
160 | GBM_PC_REQ_PRIV="" | 160 | GBM_PC_REQ_PRIV="" | |
161 | fi | 161 | fi | |
162 | @@ -25381,9 +25475,6 @@ fi | 162 | @@ -25468,9 +25562,6 @@ fi | |
163 | CLANG_LIBDIR=${LLVM_LIBDIR} | 163 | CLANG_LIBDIR=${LLVM_LIBDIR} | |
164 | fi | 164 | fi | |
165 | CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} | 165 | CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} | |
166 | - if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then : | 166 | - if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then : | |
167 | - as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5 | 167 | - as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5 | |
168 | -fi | 168 | -fi | |
169 | fi | 169 | fi | |
170 | else | 170 | else | |
171 | MESA_LLVM=0 | 171 | MESA_LLVM=0 |
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | $NetBSD: patch-src_loader_Makefile.in,v 1.3 2016/01/05 13:02:57 tnn Exp $ | 1 | $NetBSD: patch-src_loader_Makefile.in,v 1.4 2016/01/27 07:39:54 wiz Exp $ | |
2 | 2 | |||
3 | FreeBSD & DragonFly support for libdevq. | 3 | FreeBSD & DragonFly support for libdevq. | |
4 | 4 | |||
5 | --- src/loader/Makefile.in.orig 2015-12-15 14:52:32.000000000 +0000 | 5 | --- src/loader/Makefile.in.orig 2016-01-13 10:48:30.000000000 +0000 | |
6 | +++ src/loader/Makefile.in | 6 | +++ src/loader/Makefile.in | |
7 | @@ -321,6 +321,8 @@ LEXLIB = @LEXLIB@ | 7 | @@ -320,6 +320,8 @@ LEXLIB = @LEXLIB@ | |
8 | LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ | 8 | LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ | |
9 | LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@ | 9 | LIBCLC_INCLUDEDIR = @LIBCLC_INCLUDEDIR@ | |
10 | LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@ | 10 | LIBCLC_LIBEXECDIR = @LIBCLC_LIBEXECDIR@ | |
11 | +LIBDEVQ_CFLAGS = @LIBDEVQ_CFLAGS@ | 11 | +LIBDEVQ_CFLAGS = @LIBDEVQ_CFLAGS@ | |
12 | +LIBDEVQ_LIBS = @LIBDEVQ_LIBS@ | 12 | +LIBDEVQ_LIBS = @LIBDEVQ_LIBS@ | |
13 | LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ | 13 | LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ | |
14 | LIBDRM_LIBS = @LIBDRM_LIBS@ | 14 | LIBDRM_LIBS = @LIBDRM_LIBS@ | |
15 | LIBOBJS = @LIBOBJS@ | 15 | LIBELF_CFLAGS = @LIBELF_CFLAGS@ | |
16 | @@ -531,7 +533,7 @@ AM_CPPFLAGS = \ | 16 | @@ -532,7 +534,7 @@ AM_CPPFLAGS = \ | |
17 | $(LIBDRM_CFLAGS) \ | 17 | $(LIBDRM_CFLAGS) \ | |
18 | $(LIBUDEV_CFLAGS) | 18 | $(LIBUDEV_CFLAGS) | |
19 | 19 | |||
20 | -libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1) | 20 | -libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1) | |
21 | +libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1) $(LIBDEVQ_CFLAGS) | 21 | +libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1) $(LIBDEVQ_CFLAGS) | |
22 | libloader_la_SOURCES = $(LOADER_C_FILES) | 22 | libloader_la_SOURCES = $(LOADER_C_FILES) | |
23 | libloader_la_LIBADD = $(am__append_2) $(am__append_3) | 23 | libloader_la_LIBADD = $(am__append_2) $(am__append_3) | |
24 | @HAVE_DRI3_TRUE@libloader_dri3_helper_la_SOURCES = \ | 24 | @HAVE_DRI3_TRUE@libloader_dri3_helper_la_SOURCES = \ |
$NetBSD: patch-src_egl_main_eglglobals.c,v 1.1 2016/01/27 07:39:54 wiz Exp $
atexit() is not a good idea in shared libraries.
--- src/egl/main/eglglobals.c.orig 2015-11-28 17:37:59.000000000 +0000
+++ src/egl/main/eglglobals.c
@@ -59,11 +59,16 @@ struct _egl_global _eglGlobal =
" EGL_MESA_platform_gbm"
};
+static EGLBoolean registered = EGL_FALSE;
-static void
+static void __attribute__((__destructor__))
_eglAtExit(void)
{
EGLint i;
+
+ if (!registered)
+ return;
+
for (i = _eglGlobal.NumAtExitCalls - 1; i >= 0; i--)
_eglGlobal.AtExitCalls[i]();
}
@@ -73,14 +78,9 @@ void
_eglAddAtExitCall(void (*func)(void))
{
if (func) {
- static EGLBoolean registered = EGL_FALSE;
-
mtx_lock(_eglGlobal.Mutex);
- if (!registered) {
- atexit(_eglAtExit);
- registered = EGL_TRUE;
- }
+ registered = EGL_TRUE;
assert(_eglGlobal.NumAtExitCalls < ARRAY_SIZE(_eglGlobal.AtExitCalls));
_eglGlobal.AtExitCalls[_eglGlobal.NumAtExitCalls++] = func;
$NetBSD: patch-src_glsl_glsl__parser__extras.cpp,v 1.1 2016/01/27 07:39:54 wiz Exp $
atexit() is not a good idea in shared libraries.
--- src/glsl/glsl_parser_extras.cpp.orig 2016-01-07 16:17:53.000000000 +0000
+++ src/glsl/glsl_parser_extras.cpp
@@ -1967,7 +1967,7 @@ extern "C" {
* programs would be invalid. So this should happen at approximately
* program exit.
*/
-void
+void __attribute__((__destructor__))
_mesa_destroy_shader_compiler(void)
{
_mesa_destroy_shader_compiler_caches();
$NetBSD: patch-src_mesa_main_extensions.c,v 1.1 2016/01/27 07:39:54 wiz Exp $
atexit() is not a good idea in shared libraries.
--- src/mesa/main/extensions.c.orig 2016-01-07 16:17:53.000000000 +0000
+++ src/mesa/main/extensions.c
@@ -256,7 +256,7 @@ get_extension_override( struct gl_contex
* These strings are allocated early during the first context creation by
* _mesa_one_time_init_extension_overrides.
*/
-static void
+static void __attribute__((__destructor__))
free_unknown_extensions_strings(void)
{
free(extra_extensions);
@@ -277,7 +277,7 @@ _mesa_one_time_init_extension_overrides(
int len;
size_t offset;
- atexit(free_unknown_extensions_strings);
+ /* atexit(free_unknown_extensions_strings); */
memset(&_mesa_extension_override_enables, 0, sizeof(struct gl_extensions));
memset(&_mesa_extension_override_disables, 0, sizeof(struct gl_extensions));