commit: 266fbd96dfbed56ec1737de331a33fccfe4ad030 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Nov 13 10:08:11 2016 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Nov 15 14:31:53 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266fbd96
media-libs/mesa: Drop old media-libs/mesa/Manifest | 1 - media-libs/mesa/files/glx_ro_text_segm.patch | 28 - .../mesa-10.2-dont-require-llvm-for-r300.patch | 11 - .../mesa/files/mesa-10.3.7-dont-use-clrsb.patch | 36 - .../mesa/files/mesa-10.3.7-format_utils.c.patch | 1089 -------------------- .../mesa/files/mesa-10.5.1-fstat-include.patch | 37 - media-libs/mesa/mesa-10.3.7-r1.ebuild | 523 ---------- media-libs/mesa/metadata.xml | 1 - 8 files changed, 1726 deletions(-) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index c8c3d33..71596a3 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,4 +1,3 @@ -DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b SHA512 bbc027c4146c42aaa160990f5281c71a342d32c10ba56f91da1a60dd4cb7d620ff49b72553d24bc1d87470e2baf9be81b5bdee9abe49d6acc57902fccb9e2e5f WHIRLPOOL 7fa32e70c6aabb84a06f2f852f77eac839aea08726c442742b3d3abdb94a0fd9f033439ab0cb16865f4ee14e1538cb86937856bbdfd1f9090e8e7c43eac52e03 DIST mesa-11.0.6.tar.xz 7272972 SHA256 8340e64cdc91999840404c211496f3de38e7b4cb38db34e2f72f1642c5134760 SHA512 946a66803395ef0f4d3b328e981e03a87bb5173a523be5da1dd3363002fceacd8dcbfdbf9716e31bb4247b23cc5ef112b24bb4ef0709b514bc8160c6cbf1dbf3 WHIRLPOOL 19729acb5fbbcff3a99b4d7644750dff4a7a2d41c3f25f2e004938faf0c72abd33e97f5d23d2804f84b957824757b5f64f3a7f54a2dd8999b2a71eb9b1976e0b DIST mesa-11.0.9.tar.xz 7282648 SHA256 a1262ff1c66a16ccf341186cf0e57b306b8589eb2cc5ce92ffb6788ab01d2b01 SHA512 8bf9c3bfe61f5d22182b9611d66051d83dfb302cc349921bc1d895acc8681b3e22e77cb360e2f12383fd928793b306f8f98998caa457dc04e3ff4e5561ea78f7 WHIRLPOOL a3477542b5ebfed9b69bd29e7f58a01b02c70d49399afb873744de08e776d712eaca3443f88dbdee25b1d3d35a4eb9dae75a3b9d7d6d652d41cded763836c59a DIST mesa-11.1.4.tar.xz 7570840 SHA256 0f781e9072655305f576efd4204d183bf99ac8cb8d9e0dd9fc2b4093230a0eba SHA512 ee83649eb30d0545e0ee950e8a23791c7e4faa01125e9d39fe9ab474cc2813bc7c813b35ce261e837e7c5189fdb3446f5413317ed8663fbdb1083e1d04944ebd WHIRLPOOL d36921620d401cacfb985d66172519b5abcbeb85b2cceac69170139193cd13fda565dffc13858d39e073ea89c4affb4e3960b6013a19247be4e05aa0750d3e55 diff --git a/media-libs/mesa/files/glx_ro_text_segm.patch b/media-libs/mesa/files/glx_ro_text_segm.patch deleted file mode 100644 index 495b7dc..00000000 --- a/media-libs/mesa/files/glx_ro_text_segm.patch +++ /dev/null @@ -1,28 +0,0 @@ -2011-02-09 Jeremy Huddleston <[email protected] - - #240956 - * configure.ac add support to enable readonly test segment on x86 - ---- configure.ac.orig 2008-11-17 23:19:38.000000000 +0100 -+++ configure.ac 2008-11-17 23:20:17.000000000 +0100 -@@ -499,6 +499,20 @@ - enable_xcb=no - fi - -+ -+dnl readonly text segment on x86 hardened platforms -+AC_ARG_ENABLE([glx_rts], -+ [AS_HELP_STRING([--enable-glx-rts], -+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl libGL configuration per driver - dnl diff --git a/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch b/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch deleted file mode 100644 index a85a3c1..00000000 --- a/media-libs/mesa/files/mesa-10.2-dont-require-llvm-for-r300.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2014-03-03 04:05:33.110522943 +0100 -+++ b/configure.ac 2014-03-03 04:06:44.165518094 +0100 -@@ -1774,7 +1774,6 @@ - HAVE_GALLIUM_R300=yes - PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) - gallium_require_drm_loader -- gallium_require_llvm "Gallium R300" - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300" - gallium_check_st "radeon/drm" "r300/dri" "" "" "" - DRICOMMON_NEED_LIBDRM=yes diff --git a/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch b/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch deleted file mode 100644 index c38757d..00000000 --- a/media-libs/mesa/files/mesa-10.3.7-dont-use-clrsb.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 32e98e8ef06f0bb6ad55f9fb5858be77c03367b0 Mon Sep 17 00:00:00 2001 -From: Matt Turner <[email protected]> -Date: Mon, 2 Feb 2015 17:26:49 -0800 -Subject: [PATCH] gallium/util: Don't use __builtin_clrsb in util_last_bit(). - -Unclear circumstances lead to undefined symbols on x86. - -Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536916 -Cc: [email protected] -Reviewed-by: Ilia Mirkin <[email protected]> ---- - src/gallium/auxiliary/util/u_math.h | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h -index 19c7343..ca6d0f1 100644 ---- a/src/gallium/auxiliary/util/u_math.h -+++ b/src/gallium/auxiliary/util/u_math.h -@@ -561,14 +561,10 @@ util_last_bit(unsigned u) - static INLINE unsigned - util_last_bit_signed(int i) - { --#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 407) && !defined(__INTEL_COMPILER) -- return 31 - __builtin_clrsb(i); --#else - if (i >= 0) - return util_last_bit(i); - else - return util_last_bit(~(unsigned)i); --#endif - } - - /* Destructively loop over all of the bits in a mask as in: --- -2.0.4 - diff --git a/media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch b/media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch deleted file mode 100644 index e1fba03..00000000 --- a/media-libs/mesa/files/mesa-10.3.7-format_utils.c.patch +++ /dev/null @@ -1,1089 +0,0 @@ -From cfeb394224f2daeb2139cf4ec489a4dd8297a44d Mon Sep 17 00:00:00 2001 -From: Brian Paul <[email protected]> -Date: Fri, 12 Sep 2014 08:31:15 -0600 -Subject: [PATCH] mesa: break up _mesa_swizzle_and_convert() to reduce compile - time - -This reduces gcc -O3 compile time to 1/4 of what it was on my system. -Reduces MSVC release build time too. - -Reviewed-by: Jason Ekstrand <[email protected]> ---- - src/mesa/main/format_utils.c | 1030 ++++++++++++++++++++++-------------------- - 1 file changed, 550 insertions(+), 480 deletions(-) - -diff --git a/src/mesa/main/format_utils.c b/src/mesa/main/format_utils.c -index 240e3bc..29d779a 100644 ---- a/src/mesa/main/format_utils.c -+++ b/src/mesa/main/format_utils.c -@@ -352,9 +352,14 @@ swizzle_convert_try_memcpy(void *dst, GLenum dst_type, int num_dst_channels, - */ - #define SWIZZLE_CONVERT(DST_TYPE, SRC_TYPE, CONV) \ - do { \ -+ const uint8_t swizzle_x = swizzle[0]; \ -+ const uint8_t swizzle_y = swizzle[1]; \ -+ const uint8_t swizzle_z = swizzle[2]; \ -+ const uint8_t swizzle_w = swizzle[3]; \ - const SRC_TYPE *typed_src = void_src; \ - DST_TYPE *typed_dst = void_dst; \ - DST_TYPE tmp[7]; \ -+ int s, j; \ - tmp[4] = 0; \ - tmp[5] = one; \ - switch (num_dst_channels) { \ -@@ -423,7 +428,527 @@ swizzle_convert_try_memcpy(void *dst, GLenum dst_type, int num_dst_channels, - } \ - break; \ - } \ -- } while (0); -+ } while (0) -+ -+ -+static void -+convert_float(void *void_dst, int num_dst_channels, -+ const void *void_src, GLenum src_type, int num_src_channels, -+ const uint8_t swizzle[4], bool normalized, int count) -+{ -+ const float one = 1.0f; -+ -+ switch (src_type) { -+ case GL_FLOAT: -+ SWIZZLE_CONVERT(float, float, src); -+ break; -+ case GL_HALF_FLOAT: -+ SWIZZLE_CONVERT(float, uint16_t, _mesa_half_to_float(src)); -+ break; -+ case GL_UNSIGNED_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(float, uint8_t, unorm_to_float(src, 8)); -+ } else { -+ SWIZZLE_CONVERT(float, uint8_t, src); -+ } -+ break; -+ case GL_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(float, int8_t, snorm_to_float(src, 8)); -+ } else { -+ SWIZZLE_CONVERT(float, int8_t, src); -+ } -+ break; -+ case GL_UNSIGNED_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(float, uint16_t, unorm_to_float(src, 16)); -+ } else { -+ SWIZZLE_CONVERT(float, uint16_t, src); -+ } -+ break; -+ case GL_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(float, int16_t, snorm_to_float(src, 16)); -+ } else { -+ SWIZZLE_CONVERT(float, int16_t, src); -+ } -+ break; -+ case GL_UNSIGNED_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(float, uint32_t, unorm_to_float(src, 32)); -+ } else { -+ SWIZZLE_CONVERT(float, uint32_t, src); -+ } -+ break; -+ case GL_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(float, int32_t, snorm_to_float(src, 32)); -+ } else { -+ SWIZZLE_CONVERT(float, int32_t, src); -+ } -+ break; -+ default: -+ assert(!"Invalid channel type combination"); -+ } -+} -+ -+ -+static void -+convert_half_float(void *void_dst, int num_dst_channels, -+ const void *void_src, GLenum src_type, int num_src_channels, -+ const uint8_t swizzle[4], bool normalized, int count) -+{ -+ const uint16_t one = _mesa_float_to_half(1.0f); -+ -+ switch (src_type) { -+ case GL_FLOAT: -+ SWIZZLE_CONVERT(uint16_t, float, _mesa_float_to_half(src)); -+ break; -+ case GL_HALF_FLOAT: -+ SWIZZLE_CONVERT(uint16_t, uint16_t, src); -+ break; -+ case GL_UNSIGNED_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_half(src, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, uint8_t, _mesa_float_to_half(src)); -+ } -+ break; -+ case GL_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_half(src, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, int8_t, _mesa_float_to_half(src)); -+ } -+ break; -+ case GL_UNSIGNED_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, uint16_t, unorm_to_half(src, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_float_to_half(src)); -+ } -+ break; -+ case GL_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_half(src, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, int16_t, _mesa_float_to_half(src)); -+ } -+ break; -+ case GL_UNSIGNED_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_half(src, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, uint32_t, _mesa_float_to_half(src)); -+ } -+ break; -+ case GL_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_half(src, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, int32_t, _mesa_float_to_half(src)); -+ } -+ break; -+ default: -+ assert(!"Invalid channel type combination"); -+ } -+} -+ -+ -+static void -+convert_ubyte(void *void_dst, int num_dst_channels, -+ const void *void_src, GLenum src_type, int num_src_channels, -+ const uint8_t swizzle[4], bool normalized, int count) -+{ -+ const uint8_t one = normalized ? UINT8_MAX : 1; -+ -+ switch (src_type) { -+ case GL_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint8_t, float, float_to_unorm(src, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint8_t, float, (src < 0) ? 0 : src); -+ } -+ break; -+ case GL_HALF_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_unorm(src, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_uint(src)); -+ } -+ break; -+ case GL_UNSIGNED_BYTE: -+ SWIZZLE_CONVERT(uint8_t, uint8_t, src); -+ break; -+ case GL_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint8_t, int8_t, snorm_to_unorm(src, 8, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint8_t, int8_t, (src < 0) ? 0 : src); -+ } -+ break; -+ case GL_UNSIGNED_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint8_t, uint16_t, unorm_to_unorm(src, 16, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint8_t, uint16_t, src); -+ } -+ break; -+ case GL_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint8_t, int16_t, snorm_to_unorm(src, 16, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint8_t, int16_t, (src < 0) ? 0 : src); -+ } -+ break; -+ case GL_UNSIGNED_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint8_t, uint32_t, unorm_to_unorm(src, 32, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint8_t, uint32_t, src); -+ } -+ break; -+ case GL_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint8_t, int32_t, snorm_to_unorm(src, 32, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint8_t, int32_t, (src < 0) ? 0 : src); -+ } -+ break; -+ default: -+ assert(!"Invalid channel type combination"); -+ } -+} -+ -+ -+static void -+convert_byte(void *void_dst, int num_dst_channels, -+ const void *void_src, GLenum src_type, int num_src_channels, -+ const uint8_t swizzle[4], bool normalized, int count) -+{ -+ const int8_t one = normalized ? INT8_MAX : 1; -+ -+ switch (src_type) { -+ case GL_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint8_t, float, float_to_snorm(src, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint8_t, float, src); -+ } -+ break; -+ case GL_HALF_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_snorm(src, 8)); -+ } else { -+ SWIZZLE_CONVERT(uint8_t, uint16_t, _mesa_half_to_float(src)); -+ } -+ break; -+ case GL_UNSIGNED_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(int8_t, uint8_t, unorm_to_snorm(src, 8, 8)); -+ } else { -+ SWIZZLE_CONVERT(int8_t, uint8_t, src); -+ } -+ break; -+ case GL_BYTE: -+ SWIZZLE_CONVERT(int8_t, int8_t, src); -+ break; -+ case GL_UNSIGNED_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int8_t, uint16_t, unorm_to_snorm(src, 16, 8)); -+ } else { -+ SWIZZLE_CONVERT(int8_t, uint16_t, src); -+ } -+ break; -+ case GL_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int8_t, int16_t, snorm_to_snorm(src, 16, 8)); -+ } else { -+ SWIZZLE_CONVERT(int8_t, int16_t, src); -+ } -+ break; -+ case GL_UNSIGNED_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int8_t, uint32_t, unorm_to_snorm(src, 32, 8)); -+ } else { -+ SWIZZLE_CONVERT(int8_t, uint32_t, src); -+ } -+ break; -+ case GL_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int8_t, int32_t, snorm_to_snorm(src, 32, 8)); -+ } else { -+ SWIZZLE_CONVERT(int8_t, int32_t, src); -+ } -+ break; -+ default: -+ assert(!"Invalid channel type combination"); -+ } -+} -+ -+ -+static void -+convert_ushort(void *void_dst, int num_dst_channels, -+ const void *void_src, GLenum src_type, int num_src_channels, -+ const uint8_t swizzle[4], bool normalized, int count) -+{ -+ const uint16_t one = normalized ? UINT16_MAX : 1; -+ -+ switch (src_type) { -+ case GL_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, float, float_to_unorm(src, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, float, (src < 0) ? 0 : src); -+ } -+ break; -+ case GL_HALF_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_unorm(src, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_uint(src)); -+ } -+ break; -+ case GL_UNSIGNED_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_unorm(src, 8, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, uint8_t, src); -+ } -+ break; -+ case GL_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_unorm(src, 8, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, int8_t, (src < 0) ? 0 : src); -+ } -+ break; -+ case GL_UNSIGNED_SHORT: -+ SWIZZLE_CONVERT(uint16_t, uint16_t, src); -+ break; -+ case GL_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_unorm(src, 16, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, int16_t, (src < 0) ? 0 : src); -+ } -+ break; -+ case GL_UNSIGNED_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_unorm(src, 32, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, uint32_t, src); -+ } -+ break; -+ case GL_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_unorm(src, 32, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, int32_t, (src < 0) ? 0 : src); -+ } -+ break; -+ default: -+ assert(!"Invalid channel type combination"); -+ } -+} -+ -+ -+static void -+convert_short(void *void_dst, int num_dst_channels, -+ const void *void_src, GLenum src_type, int num_src_channels, -+ const uint8_t swizzle[4], bool normalized, int count) -+{ -+ const int16_t one = normalized ? INT16_MAX : 1; -+ -+ switch (src_type) { -+ case GL_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, float, float_to_snorm(src, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, float, src); -+ } -+ break; -+ case GL_HALF_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_snorm(src, 16)); -+ } else { -+ SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_half_to_float(src)); -+ } -+ break; -+ case GL_UNSIGNED_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(int16_t, uint8_t, unorm_to_snorm(src, 8, 16)); -+ } else { -+ SWIZZLE_CONVERT(int16_t, uint8_t, src); -+ } -+ break; -+ case GL_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(int16_t, int8_t, snorm_to_snorm(src, 8, 16)); -+ } else { -+ SWIZZLE_CONVERT(int16_t, int8_t, src); -+ } -+ break; -+ case GL_UNSIGNED_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int16_t, uint16_t, unorm_to_snorm(src, 16, 16)); -+ } else { -+ SWIZZLE_CONVERT(int16_t, uint16_t, src); -+ } -+ break; -+ case GL_SHORT: -+ SWIZZLE_CONVERT(int16_t, int16_t, src); -+ break; -+ case GL_UNSIGNED_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int16_t, uint32_t, unorm_to_snorm(src, 32, 16)); -+ } else { -+ SWIZZLE_CONVERT(int16_t, uint32_t, src); -+ } -+ break; -+ case GL_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int16_t, int32_t, snorm_to_snorm(src, 32, 16)); -+ } else { -+ SWIZZLE_CONVERT(int16_t, int32_t, src); -+ } -+ break; -+ default: -+ assert(!"Invalid channel type combination"); -+ } -+} -+ -+static void -+convert_uint(void *void_dst, int num_dst_channels, -+ const void *void_src, GLenum src_type, int num_src_channels, -+ const uint8_t swizzle[4], bool normalized, int count) -+{ -+ const uint32_t one = normalized ? UINT32_MAX : 1; -+ -+ switch (src_type) { -+ case GL_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint32_t, float, float_to_unorm(src, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint32_t, float, (src < 0) ? 0 : src); -+ } -+ break; -+ case GL_HALF_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_unorm(src, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_uint(src)); -+ } -+ break; -+ case GL_UNSIGNED_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint32_t, uint8_t, unorm_to_unorm(src, 8, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint32_t, uint8_t, src); -+ } -+ break; -+ case GL_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint32_t, int8_t, snorm_to_unorm(src, 8, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint32_t, int8_t, (src < 0) ? 0 : src); -+ } -+ break; -+ case GL_UNSIGNED_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint32_t, uint16_t, unorm_to_unorm(src, 16, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint32_t, uint16_t, src); -+ } -+ break; -+ case GL_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint32_t, int16_t, snorm_to_unorm(src, 16, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint32_t, int16_t, (src < 0) ? 0 : src); -+ } -+ break; -+ case GL_UNSIGNED_INT: -+ SWIZZLE_CONVERT(uint32_t, uint32_t, src); -+ break; -+ case GL_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint32_t, int32_t, snorm_to_unorm(src, 32, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint32_t, int32_t, (src < 0) ? 0 : src); -+ } -+ break; -+ default: -+ assert(!"Invalid channel type combination"); -+ } -+} -+ -+ -+static void -+convert_int(void *void_dst, int num_dst_channels, -+ const void *void_src, GLenum src_type, int num_src_channels, -+ const uint8_t swizzle[4], bool normalized, int count) -+{ -+ const int32_t one = normalized ? INT32_MAX : 12; -+ -+ switch (src_type) { -+ case GL_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint32_t, float, float_to_snorm(src, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint32_t, float, src); -+ } -+ break; -+ case GL_HALF_FLOAT: -+ if (normalized) { -+ SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_snorm(src, 32)); -+ } else { -+ SWIZZLE_CONVERT(uint32_t, uint16_t, _mesa_half_to_float(src)); -+ } -+ break; -+ case GL_UNSIGNED_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(int32_t, uint8_t, unorm_to_snorm(src, 8, 32)); -+ } else { -+ SWIZZLE_CONVERT(int32_t, uint8_t, src); -+ } -+ break; -+ case GL_BYTE: -+ if (normalized) { -+ SWIZZLE_CONVERT(int32_t, int8_t, snorm_to_snorm(src, 8, 32)); -+ } else { -+ SWIZZLE_CONVERT(int32_t, int8_t, src); -+ } -+ break; -+ case GL_UNSIGNED_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int32_t, uint16_t, unorm_to_snorm(src, 16, 32)); -+ } else { -+ SWIZZLE_CONVERT(int32_t, uint16_t, src); -+ } -+ break; -+ case GL_SHORT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int32_t, int16_t, snorm_to_snorm(src, 16, 32)); -+ } else { -+ SWIZZLE_CONVERT(int32_t, int16_t, src); -+ } -+ break; -+ case GL_UNSIGNED_INT: -+ if (normalized) { -+ SWIZZLE_CONVERT(int32_t, uint32_t, unorm_to_snorm(src, 32, 32)); -+ } else { -+ SWIZZLE_CONVERT(int32_t, uint32_t, src); -+ } -+ break; -+ case GL_INT: -+ SWIZZLE_CONVERT(int32_t, int32_t, src); -+ break; -+ default: -+ assert(!"Invalid channel type combination"); -+ } -+} -+ - - /** - * Convert between array-based color formats. -@@ -478,499 +1003,44 @@ _mesa_swizzle_and_convert(void *void_dst, GLenum dst_type, int num_dst_channels, - const void *void_src, GLenum src_type, int num_src_channels, - const uint8_t swizzle[4], bool normalized, int count) - { -- int s, j; -- register uint8_t swizzle_x, swizzle_y, swizzle_z, swizzle_w; -- - if (swizzle_convert_try_memcpy(void_dst, dst_type, num_dst_channels, - void_src, src_type, num_src_channels, - swizzle, normalized, count)) - return; - -- swizzle_x = swizzle[0]; -- swizzle_y = swizzle[1]; -- swizzle_z = swizzle[2]; -- swizzle_w = swizzle[3]; -- - switch (dst_type) { - case GL_FLOAT: -- { -- const float one = 1.0f; -- switch (src_type) { -- case GL_FLOAT: -- SWIZZLE_CONVERT(float, float, src) -- break; -- case GL_HALF_FLOAT: -- SWIZZLE_CONVERT(float, uint16_t, _mesa_half_to_float(src)) -- break; -- case GL_UNSIGNED_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(float, uint8_t, unorm_to_float(src, 8)) -- } else { -- SWIZZLE_CONVERT(float, uint8_t, src) -- } -- break; -- case GL_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(float, int8_t, snorm_to_float(src, 8)) -- } else { -- SWIZZLE_CONVERT(float, int8_t, src) -- } -- break; -- case GL_UNSIGNED_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(float, uint16_t, unorm_to_float(src, 16)) -- } else { -- SWIZZLE_CONVERT(float, uint16_t, src) -- } -- break; -- case GL_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(float, int16_t, snorm_to_float(src, 16)) -- } else { -- SWIZZLE_CONVERT(float, int16_t, src) -- } -- break; -- case GL_UNSIGNED_INT: -- if (normalized) { -- SWIZZLE_CONVERT(float, uint32_t, unorm_to_float(src, 32)) -- } else { -- SWIZZLE_CONVERT(float, uint32_t, src) -- } -- break; -- case GL_INT: -- if (normalized) { -- SWIZZLE_CONVERT(float, int32_t, snorm_to_float(src, 32)) -- } else { -- SWIZZLE_CONVERT(float, int32_t, src) -- } -- break; -- default: -- assert(!"Invalid channel type combination"); -- } -- } -- break; -+ convert_float(void_dst, num_dst_channels, void_src, src_type, -+ num_src_channels, swizzle, normalized, count); -+ break; - case GL_HALF_FLOAT: -- { -- const uint16_t one = _mesa_float_to_half(1.0f); -- switch (src_type) { -- case GL_FLOAT: -- SWIZZLE_CONVERT(uint16_t, float, _mesa_float_to_half(src)) -- break; -- case GL_HALF_FLOAT: -- SWIZZLE_CONVERT(uint16_t, uint16_t, src) -- break; -- case GL_UNSIGNED_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_half(src, 8)) -- } else { -- SWIZZLE_CONVERT(uint16_t, uint8_t, _mesa_float_to_half(src)) -- } -- break; -- case GL_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_half(src, 8)) -- } else { -- SWIZZLE_CONVERT(uint16_t, int8_t, _mesa_float_to_half(src)) -- } -- break; -- case GL_UNSIGNED_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, uint16_t, unorm_to_half(src, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_float_to_half(src)) -- } -- break; -- case GL_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_half(src, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, int16_t, _mesa_float_to_half(src)) -- } -- break; -- case GL_UNSIGNED_INT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_half(src, 32)) -- } else { -- SWIZZLE_CONVERT(uint16_t, uint32_t, _mesa_float_to_half(src)) -- } -- break; -- case GL_INT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_half(src, 32)) -- } else { -- SWIZZLE_CONVERT(uint16_t, int32_t, _mesa_float_to_half(src)) -- } -- break; -- default: -- assert(!"Invalid channel type combination"); -- } -- } -- break; -+ convert_half_float(void_dst, num_dst_channels, void_src, src_type, -+ num_src_channels, swizzle, normalized, count); -+ break; - case GL_UNSIGNED_BYTE: -- { -- const uint8_t one = normalized ? UINT8_MAX : 1; -- switch (src_type) { -- case GL_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint8_t, float, float_to_unorm(src, 8)) -- } else { -- SWIZZLE_CONVERT(uint8_t, float, (src < 0) ? 0 : src) -- } -- break; -- case GL_HALF_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_unorm(src, 8)) -- } else { -- SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_uint(src)) -- } -- break; -- case GL_UNSIGNED_BYTE: -- SWIZZLE_CONVERT(uint8_t, uint8_t, src) -- break; -- case GL_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(uint8_t, int8_t, snorm_to_unorm(src, 8, 8)) -- } else { -- SWIZZLE_CONVERT(uint8_t, int8_t, (src < 0) ? 0 : src) -- } -- break; -- case GL_UNSIGNED_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(uint8_t, uint16_t, unorm_to_unorm(src, 16, 8)) -- } else { -- SWIZZLE_CONVERT(uint8_t, uint16_t, src) -- } -- break; -- case GL_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(uint8_t, int16_t, snorm_to_unorm(src, 16, 8)) -- } else { -- SWIZZLE_CONVERT(uint8_t, int16_t, (src < 0) ? 0 : src) -- } -- break; -- case GL_UNSIGNED_INT: -- if (normalized) { -- SWIZZLE_CONVERT(uint8_t, uint32_t, unorm_to_unorm(src, 32, 8)) -- } else { -- SWIZZLE_CONVERT(uint8_t, uint32_t, src) -- } -- break; -- case GL_INT: -- if (normalized) { -- SWIZZLE_CONVERT(uint8_t, int32_t, snorm_to_unorm(src, 32, 8)) -- } else { -- SWIZZLE_CONVERT(uint8_t, int32_t, (src < 0) ? 0 : src) -- } -- break; -- default: -- assert(!"Invalid channel type combination"); -- } -- } -- break; -+ convert_ubyte(void_dst, num_dst_channels, void_src, src_type, -+ num_src_channels, swizzle, normalized, count); -+ break; - case GL_BYTE: -- { -- const int8_t one = normalized ? INT8_MAX : 1; -- switch (src_type) { -- case GL_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint8_t, float, float_to_snorm(src, 8)) -- } else { -- SWIZZLE_CONVERT(uint8_t, float, src) -- } -- break; -- case GL_HALF_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint8_t, uint16_t, half_to_snorm(src, 8)) -- } else { -- SWIZZLE_CONVERT(uint8_t, uint16_t, _mesa_half_to_float(src)) -- } -- break; -- case GL_UNSIGNED_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(int8_t, uint8_t, unorm_to_snorm(src, 8, 8)) -- } else { -- SWIZZLE_CONVERT(int8_t, uint8_t, src) -- } -- break; -- case GL_BYTE: -- SWIZZLE_CONVERT(int8_t, int8_t, src) -- break; -- case GL_UNSIGNED_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(int8_t, uint16_t, unorm_to_snorm(src, 16, 8)) -- } else { -- SWIZZLE_CONVERT(int8_t, uint16_t, src) -- } -- break; -- case GL_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(int8_t, int16_t, snorm_to_snorm(src, 16, 8)) -- } else { -- SWIZZLE_CONVERT(int8_t, int16_t, src) -- } -- break; -- case GL_UNSIGNED_INT: -- if (normalized) { -- SWIZZLE_CONVERT(int8_t, uint32_t, unorm_to_snorm(src, 32, 8)) -- } else { -- SWIZZLE_CONVERT(int8_t, uint32_t, src) -- } -- break; -- case GL_INT: -- if (normalized) { -- SWIZZLE_CONVERT(int8_t, int32_t, snorm_to_snorm(src, 32, 8)) -- } else { -- SWIZZLE_CONVERT(int8_t, int32_t, src) -- } -- break; -- default: -- assert(!"Invalid channel type combination"); -- } -- } -- break; -+ convert_byte(void_dst, num_dst_channels, void_src, src_type, -+ num_src_channels, swizzle, normalized, count); -+ break; - case GL_UNSIGNED_SHORT: -- { -- const uint16_t one = normalized ? UINT16_MAX : 1; -- switch (src_type) { -- case GL_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, float, float_to_unorm(src, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, float, (src < 0) ? 0 : src) -- } -- break; -- case GL_HALF_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_unorm(src, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_uint(src)) -- } -- break; -- case GL_UNSIGNED_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, uint8_t, unorm_to_unorm(src, 8, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, uint8_t, src) -- } -- break; -- case GL_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, int8_t, snorm_to_unorm(src, 8, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, int8_t, (src < 0) ? 0 : src) -- } -- break; -- case GL_UNSIGNED_SHORT: -- SWIZZLE_CONVERT(uint16_t, uint16_t, src) -- break; -- case GL_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, int16_t, snorm_to_unorm(src, 16, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, int16_t, (src < 0) ? 0 : src) -- } -- break; -- case GL_UNSIGNED_INT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, uint32_t, unorm_to_unorm(src, 32, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, uint32_t, src) -- } -- break; -- case GL_INT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, int32_t, snorm_to_unorm(src, 32, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, int32_t, (src < 0) ? 0 : src) -- } -- break; -- default: -- assert(!"Invalid channel type combination"); -- } -- } -- break; -+ convert_ushort(void_dst, num_dst_channels, void_src, src_type, -+ num_src_channels, swizzle, normalized, count); -+ break; - case GL_SHORT: -- { -- const int16_t one = normalized ? INT16_MAX : 1; -- switch (src_type) { -- case GL_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, float, float_to_snorm(src, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, float, src) -- } -- break; -- case GL_HALF_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint16_t, uint16_t, half_to_snorm(src, 16)) -- } else { -- SWIZZLE_CONVERT(uint16_t, uint16_t, _mesa_half_to_float(src)) -- } -- break; -- case GL_UNSIGNED_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(int16_t, uint8_t, unorm_to_snorm(src, 8, 16)) -- } else { -- SWIZZLE_CONVERT(int16_t, uint8_t, src) -- } -- break; -- case GL_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(int16_t, int8_t, snorm_to_snorm(src, 8, 16)) -- } else { -- SWIZZLE_CONVERT(int16_t, int8_t, src) -- } -- break; -- case GL_UNSIGNED_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(int16_t, uint16_t, unorm_to_snorm(src, 16, 16)) -- } else { -- SWIZZLE_CONVERT(int16_t, uint16_t, src) -- } -- break; -- case GL_SHORT: -- SWIZZLE_CONVERT(int16_t, int16_t, src) -- break; -- case GL_UNSIGNED_INT: -- if (normalized) { -- SWIZZLE_CONVERT(int16_t, uint32_t, unorm_to_snorm(src, 32, 16)) -- } else { -- SWIZZLE_CONVERT(int16_t, uint32_t, src) -- } -- break; -- case GL_INT: -- if (normalized) { -- SWIZZLE_CONVERT(int16_t, int32_t, snorm_to_snorm(src, 32, 16)) -- } else { -- SWIZZLE_CONVERT(int16_t, int32_t, src) -- } -- break; -- default: -- assert(!"Invalid channel type combination"); -- } -- } -- break; -+ convert_short(void_dst, num_dst_channels, void_src, src_type, -+ num_src_channels, swizzle, normalized, count); -+ break; - case GL_UNSIGNED_INT: -- { -- const uint32_t one = normalized ? UINT32_MAX : 1; -- switch (src_type) { case GL_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint32_t, float, float_to_unorm(src, 32)) -- } else { -- SWIZZLE_CONVERT(uint32_t, float, (src < 0) ? 0 : src) -- } -- break; -- case GL_HALF_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_unorm(src, 32)) -- } else { -- SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_uint(src)) -- } -- break; -- case GL_UNSIGNED_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(uint32_t, uint8_t, unorm_to_unorm(src, 8, 32)) -- } else { -- SWIZZLE_CONVERT(uint32_t, uint8_t, src) -- } -- break; -- case GL_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(uint32_t, int8_t, snorm_to_unorm(src, 8, 32)) -- } else { -- SWIZZLE_CONVERT(uint32_t, int8_t, (src < 0) ? 0 : src) -- } -- break; -- case GL_UNSIGNED_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(uint32_t, uint16_t, unorm_to_unorm(src, 16, 32)) -- } else { -- SWIZZLE_CONVERT(uint32_t, uint16_t, src) -- } -- break; -- case GL_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(uint32_t, int16_t, snorm_to_unorm(src, 16, 32)) -- } else { -- SWIZZLE_CONVERT(uint32_t, int16_t, (src < 0) ? 0 : src) -- } -- break; -- case GL_UNSIGNED_INT: -- SWIZZLE_CONVERT(uint32_t, uint32_t, src) -- break; -- case GL_INT: -- if (normalized) { -- SWIZZLE_CONVERT(uint32_t, int32_t, snorm_to_unorm(src, 32, 32)) -- } else { -- SWIZZLE_CONVERT(uint32_t, int32_t, (src < 0) ? 0 : src) -- } -- break; -- default: -- assert(!"Invalid channel type combination"); -- } -- } -- break; -+ convert_uint(void_dst, num_dst_channels, void_src, src_type, -+ num_src_channels, swizzle, normalized, count); -+ break; - case GL_INT: -- { -- const int32_t one = normalized ? INT32_MAX : 1; -- switch (src_type) { -- case GL_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint32_t, float, float_to_snorm(src, 32)) -- } else { -- SWIZZLE_CONVERT(uint32_t, float, src) -- } -- break; -- case GL_HALF_FLOAT: -- if (normalized) { -- SWIZZLE_CONVERT(uint32_t, uint16_t, half_to_snorm(src, 32)) -- } else { -- SWIZZLE_CONVERT(uint32_t, uint16_t, _mesa_half_to_float(src)) -- } -- break; -- case GL_UNSIGNED_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(int32_t, uint8_t, unorm_to_snorm(src, 8, 32)) -- } else { -- SWIZZLE_CONVERT(int32_t, uint8_t, src) -- } -- break; -- case GL_BYTE: -- if (normalized) { -- SWIZZLE_CONVERT(int32_t, int8_t, snorm_to_snorm(src, 8, 32)) -- } else { -- SWIZZLE_CONVERT(int32_t, int8_t, src) -- } -- break; -- case GL_UNSIGNED_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(int32_t, uint16_t, unorm_to_snorm(src, 16, 32)) -- } else { -- SWIZZLE_CONVERT(int32_t, uint16_t, src) -- } -- break; -- case GL_SHORT: -- if (normalized) { -- SWIZZLE_CONVERT(int32_t, int16_t, snorm_to_snorm(src, 16, 32)) -- } else { -- SWIZZLE_CONVERT(int32_t, int16_t, src) -- } -- break; -- case GL_UNSIGNED_INT: -- if (normalized) { -- SWIZZLE_CONVERT(int32_t, uint32_t, unorm_to_snorm(src, 32, 32)) -- } else { -- SWIZZLE_CONVERT(int32_t, uint32_t, src) -- } -- break; -- case GL_INT: -- SWIZZLE_CONVERT(int32_t, int32_t, src) -- break; -- default: -- assert(!"Invalid channel type combination"); -- } -- } -- break; -+ convert_int(void_dst, num_dst_channels, void_src, src_type, -+ num_src_channels, swizzle, normalized, count); -+ break; - default: - assert(!"Invalid channel type"); - } --- -2.0.5 - diff --git a/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch b/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch deleted file mode 100644 index 212d00d..00000000 --- a/media-libs/mesa/files/mesa-10.5.1-fstat-include.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 771cd266b9d00bdcf2cf7acaa3c8363c358d7478 Mon Sep 17 00:00:00 2001 -From: Emil Velikov <[email protected]> -Date: Wed, 11 Mar 2015 19:12:35 +0000 -Subject: loader: include <sys/stat.h> for non-sysfs builds - -Required by fstat(), otherwise we'll error out due to implicit function -declaration. - -Cc: "10.4 10.5" <[email protected]> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89530 -Signed-off-by: Emil Velikov <[email protected]> -Reported-by: Vadim Rutkovsky <[email protected]> -Tested-by: Vadim Rutkovsky <[email protected]> - -diff --git a/src/loader/loader.c b/src/loader/loader.c -index 9ff5115..17bf133 100644 ---- a/src/loader/loader.c -+++ b/src/loader/loader.c -@@ -64,6 +64,7 @@ - * Rob Clark <[email protected]> - */ - -+#include <sys/stat.h> - #include <stdarg.h> - #include <stdio.h> - #include <string.h> -@@ -80,7 +81,6 @@ - #endif - #endif - #ifdef HAVE_SYSFS --#include <sys/stat.h> - #include <sys/types.h> - #endif - #include "loader.h" --- -cgit v0.10.2 - diff --git a/media-libs/mesa/mesa-10.3.7-r1.ebuild b/media-libs/mesa/mesa-10.3.7-r1.ebuild deleted file mode 100644 index 5f83757..00000000 --- a/media-libs/mesa/mesa-10.3.7-r1.ebuild +++ /dev/null @@ -1,523 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit base autotools multilib multilib-minimal flag-o-matic \ - python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS} - -OPENGL_DIR="xorg-x11" - -MY_PN="${PN/m/M}" -MY_P="${MY_PN}-${PV/_/-}" -MY_SRC_P="${MY_PN}Lib-${PV/_/-}" - -FOLDER="${PV/.0/}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/"; - -#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2" -if [[ $PV = 9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2 - ${SRC_PATCHES}" -fi - -# The code is MIT/X11. -# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0 -LICENSE="MIT SGI-B-2.0" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -RESTRICT="!bindist? ( bindist )" - -INTEL_CARDS="i915 i965 ilo intel" -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl - opencl openvg osmesa pax_kernel openmax pic selinux - +udev vdpau wayland xvmc xa kernel_FreeBSD kernel_linux" - -REQUIRED_USE=" - llvm? ( gallium ) - openvg? ( egl gallium ) - opencl? ( - gallium - llvm - ) - openmax? ( gallium ) - gles1? ( egl ) - gles2? ( egl ) - wayland? ( egl gbm ) - xa? ( gallium ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( || ( classic gallium ) ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_ilo? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_radeon? ( || ( classic gallium ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_vmware? ( gallium ) - ${PYTHON_REQUIRED_USE} -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !<x11-base/xorg-server-1.7 - !<=x11-proto/xf86driproto-2.0.3 - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) - classic? ( app-eselect/eselect-mesa ) - gallium? ( app-eselect/eselect-mesa ) - >=app-eselect/eselect-opengl-1.2.7 - udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) ) - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] - llvm? ( - video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) - video_cards_r600? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) - !video_cards_r600? ( - video_cards_radeon? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) - ) - >=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}] - <sys-devel/llvm-3.6 - video_cards_radeonsi? ( >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] ) - ) - opencl? ( - app-eselect/eselect-opencl - dev-libs/libclc - ) - openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) - vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] ) - wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] -" -for card in ${INTEL_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - " -done - -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - llvm? ( - video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) - ) - opencl? ( - >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}] - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.16-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -# It is slow without texrels, if someone wants slow -# mesa without texrels +pic use is worth the shot -QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*" -QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*" - -# Think about: ggi, fbcon, no-X configs - -pkg_setup() { - # workaround toc-issue wrt #386545 - use ppc64 && append-flags -mminimal-toc - - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - python-any-r1_pkg_setup -} - -src_unpack() { - default - [[ $PV = 9999* ]] && git-r3_src_unpack -} - -src_prepare() { - # apply patches - if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/patches" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - epatch "${FILESDIR}"/${PN}-10.3.7-dont-use-clrsb.patch - epatch "${FILESDIR}"/${PN}-10.3.7-format_utils.c.patch - epatch "${FILESDIR}"/${PN}-10.5.1-fstat-include.patch - - # relax the requirement that r300 must have llvm, bug 380303 - epatch "${FILESDIR}"/${PN}-10.2-dont-require-llvm-for-r300.patch - - # fix for hardened pax_kernel, bug 240956 - [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch - - # Solaris needs some recent POSIX stuff in our case - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die - fi - - base_src_prepare - - eautoreconf - multilib_copy_sources -} - -multilib_src_configure() { - local myconf - - if use classic; then - # Configurable DRI drivers - driver_enable swrast - - # Intel code - driver_enable video_cards_i915 i915 - driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - driver_enable video_cards_nouveau nouveau - - # ATI code - driver_enable video_cards_r100 radeon - driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - driver_enable video_cards_radeon radeon r200 - fi - fi - - if use egl; then - myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") " - fi - - if use gallium; then - myconf+=" - $(use_enable llvm gallium-llvm) - $(use_enable openvg) - $(use_enable openvg gallium-egl) - $(use_enable openmax omx) - $(use_enable vdpau) - $(use_enable xa) - $(use_enable xvmc) - " - gallium_enable swrast - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable video_cards_i915 i915 - gallium_enable video_cards_ilo ilo - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - myconf+=" - $(use_enable opencl) - --with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa" - --with-clang-libdir="${EPREFIX}/usr/lib" - " - fi - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if use pax_kernel; then - myconf+=" - $(use_enable x86 glx-rts) - " - fi - - # on abi_x86_32 hardened we need to have asm disable - if [[ ${ABI} == x86* ]] && use pic; then - myconf+=" --disable-asm" - fi - - # build fails with BSD indent, bug #428112 - use userland_GNU || export INDENT=cat - - econf \ - --enable-dri \ - --enable-glx \ - --enable-shared-glapi \ - $(use_enable !bindist texture-float) \ - $(use_enable debug) \ - $(use_enable dri3) \ - $(use_enable egl) \ - $(use_enable gbm) \ - $(use_enable gles1) \ - $(use_enable gles2) \ - $(use_enable nptl glx-tls) \ - $(use_enable osmesa) \ - $(use_enable !udev sysfs) \ - --enable-llvm-shared-libs \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - PYTHON2="${PYTHON}" \ - ${myconf} -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib - # because user can eselect desired GL provider. - ebegin "Moving libGL and friends for dynamic switching" - local x - local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/" - dodir ${gl_dir}/{lib,extensions,include/GL} - for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${ED}${gl_dir}"/lib \ - || die "Failed to move ${x}" - fi - done - for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${ED}${gl_dir}"/include/GL \ - || die "Failed to move ${x}" - fi - done - for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do - if [ -d ${x} ]; then - mv -f "${x}" "${ED}${gl_dir}"/include \ - || die "Failed to move ${x}" - fi - done - eend $? - - if use classic || use gallium; then - ebegin "Moving DRI/Gallium drivers for dynamic switching" - local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) - keepdir /usr/$(get_libdir)/dri - dodir /usr/$(get_libdir)/mesa - for x in ${gallium_drivers[@]}; do - if [ -f "$(get_libdir)/gallium/${x}" ]; then - mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ - || die "Failed to move ${x}" - fi - done - if use classic; then - emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install - fi - for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${x/dri/mesa}" \ - || die "Failed to move ${x}" - fi - done - pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" - ln -s ../mesa/*.so . || die "Creating symlink failed" - # remove symlinks to drivers known to eselect - for x in ${gallium_drivers[@]}; do - if [ -f ${x} -o -L ${x} ]; then - rm "${x}" || die "Failed to remove ${x}" - fi - done - popd - eend $? - fi - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi - - if use openmax; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx" - doenvd "${T}"/99mesaxdgomx - keepdir /usr/share/mesa/xdg - fi -} - -multilib_src_install_all() { - prune_libtool_files --all - einstalldocs - - if use !bindist; then - dodoc docs/patents.txt - fi - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -multilib_src_test() { - if use llvm; then - local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf' - pushd src/gallium/drivers/llvmpipe >/dev/null || die - emake ${llvm_tests} - pax-mark m ${llvm_tests} - popd >/dev/null || die - fi - emake check -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - - # switch to xorg-x11 and back if necessary, bug #374647 comment 11 - OLD_IMPLEM="$(eselect opengl show)" - if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then - eselect opengl set ${OPENGL_DIR} - eselect opengl set ${OLD_IMPLEM} - fi - - # Select classic/gallium drivers - if use classic || use gallium; then - eselect mesa set --auto - fi - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - fi - - # run omxregister-bellagio to make the OpenMAX drivers known system-wide - if use openmax; then - ebegin "Registering OpenMAX drivers" - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \ - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \ - omxregister-bellagio - eend $? - fi - - # warn about patent encumbered texture-float - if use !bindist; then - elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" - elog "enabled. Please see patents.txt for an explanation." - fi - - local using_radeon r_flag - for r_flag in ${RADEON_CARDS}; do - if use video_cards_${r_flag}; then - using_radeon=1 - break - fi - done - - if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then - elog "Note that in order to have full S3TC support, it is necessary to install" - elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" - elog "textures in some apps, and some others even require this to run." - fi -} - -pkg_prerm() { - if use openmax; then - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister - fi -} - -# $1 - VIDEO_CARDS flag -# other args - names of DRI drivers to enable -# TODO: avoid code duplication for a more elegant implementation -driver_enable() { - case $# in - # for enabling unconditionally - 1) - DRI_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - DRI_DRIVERS+=",${i}" - done - fi - ;; - esac -} - -gallium_enable() { - case $# in - # for enabling unconditionally - 1) - GALLIUM_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - GALLIUM_DRIVERS+=",${i}" - done - fi - ;; - esac -} diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml index f8485a8..054cb72 100644 --- a/media-libs/mesa/metadata.xml +++ b/media-libs/mesa/metadata.xml @@ -22,7 +22,6 @@ <flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag> <flag name="openmax">Enable OpenMAX video decode/encode acceleration for Gallium3D.</flag> <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for low level sha1 utility functions. May cause issues with games from Steam.</flag> - <flag name="openvg">Enable the OpenVG 2D acceleration API for Gallium3D.</flag> <flag name="osmesa">Build the Mesa library for off-screen rendering.</flag> <flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag> <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
