From c353937a8d96f549835e8a441f0c16ab835ff54c4586610b13dd74f0db2baaf4 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 9 Mar 2015 10:45:09 +0000 Subject: [PATCH] Accepting request 289760 from home:tobijk:X11:XOrg - Update to version 10.5.0: + Initial support for the new Intel Skylake GPUs and Adreno 4xx GPUs. + Experimental EGL support for Haiku. + The new IR - NIR. A flat, typeless IR, supporting SSA. + GLX/DRI3 fixes and improvements. + A lot of preparation work for GL_ARB_direct_state_access. + The usual amount of piglit and drawElements Quality Program (dEQP) fixes. + Building mesa with GCC 4.1 or earlier is no longer supported. + The distribution tarball has been renamed and now contains all the generated sources. - New GL features: + GL_ARB_framebuffer_sRGB on freedreno + GL_ARB_texture_rg on freedreno + GL_EXT_packed_float on freedreno + GL_EXT_polygon_offset_clamp on i965, nv50, nvc0, r600, radeonsi, llvmpipe + GL_EXT_texture_shared_exponent on freedreno + GL_EXT_texture_snorm on freedreno - Changes to Package: + switch to xz compressed sources + remove Patch16: u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch + add Patch100: U_0001_gallium_include_util_macros.patch + add Patch101: U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch + add Patch102: U_0003_fix_build_after_macro_include.patch OBS-URL: https://build.opensuse.org/request/show/289760 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=434 --- Mesa.changes | 30 +++++++ Mesa.spec | 22 +++-- MesaLib-10.4.4.tar.bz2 | 3 - U_0001_gallium_include_util_macros.patch | 89 +++++++++++++++++++ ...end_of_non_void_function_unreachable.patch | 24 +++++ U_0003_fix_build_after_macro_include.patch | 24 +++++ mesa-10.5.0.tar.xz | 3 + ...e_for_RTDyldMemoryManager_unique_ptr.patch | 29 ------ 8 files changed, 184 insertions(+), 40 deletions(-) delete mode 100644 MesaLib-10.4.4.tar.bz2 create mode 100644 U_0001_gallium_include_util_macros.patch create mode 100644 U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch create mode 100644 U_0003_fix_build_after_macro_include.patch create mode 100644 mesa-10.5.0.tar.xz delete mode 100644 u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch diff --git a/Mesa.changes b/Mesa.changes index f808193..d029532 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Sat Mar 7 02:13:12 UTC 2015 - tobias.johannes.klausmann@mni.thm.de + +- Update to version 10.5.0: + + Initial support for the new Intel Skylake GPUs and Adreno 4xx + GPUs. + + Experimental EGL support for Haiku. + + The new IR - NIR. A flat, typeless IR, supporting SSA. + + GLX/DRI3 fixes and improvements. + + A lot of preparation work for GL_ARB_direct_state_access. + + The usual amount of piglit and drawElements Quality Program + (dEQP) fixes. + + Building mesa with GCC 4.1 or earlier is no longer supported. + + The distribution tarball has been renamed and now contains all + the generated sources. +- New GL features: + + GL_ARB_framebuffer_sRGB on freedreno + + GL_ARB_texture_rg on freedreno + + GL_EXT_packed_float on freedreno + + GL_EXT_polygon_offset_clamp on i965, nv50, nvc0, r600, radeonsi, + llvmpipe + + GL_EXT_texture_shared_exponent on freedreno + + GL_EXT_texture_snorm on freedreno +- Changes to Package: + + switch to xz compressed sources + + remove Patch16: u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch + + add Patch100: U_0001_gallium_include_util_macros.patch + + add Patch101: U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch + + add Patch102: U_0003_fix_build_after_macro_include.patch + ------------------------------------------------------------------- Mon Mar 2 19:27:19 UTC 2015 - idonmez@suse.com diff --git a/Mesa.spec b/Mesa.spec index 4c99ce7..c142b2d 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -17,8 +17,8 @@ %define glamor 1 -%define _name_archive MesaLib -%define _version 10.4.4 +%define _name_archive mesa +%define _version 10.5.0 %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %define gallium_loader 1 %else @@ -37,13 +37,13 @@ %define with_nine 1 %endif Name: Mesa -Version: 10.4.4 +Version: 10.5.0 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT Group: System/Libraries Url: http://www.mesa3d.org -Source: ftp://ftp.freedesktop.org/pub/mesa/%{_version}/%{_name_archive}-%{_version}.tar.bz2 +Source: ftp://ftp.freedesktop.org/pub/mesa/%{_version}/%{_name_archive}-%{_version}.tar.xz Source2: baselibs.conf Source3: README.updates Source4: manual-pages.tar.bz2 @@ -54,8 +54,11 @@ Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch Patch13: u_mesa-8.0.1-fix-16bpp.patch # Patch from Fedora, use shmget when available, under llvmpipe Patch15: u_mesa-8.0-llvmpipe-shmget.patch -# Fix build with llvm 3.6 fdo#86958 -Patch16: u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch + +Patch100: U_0001_gallium_include_util_macros.patch +Patch101: U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch +Patch102: U_0003_fix_build_after_macro_include.patch + BuildRequires: autoconf >= 2.60 BuildRequires: automake BuildRequires: bison @@ -69,6 +72,7 @@ BuildRequires: libtool BuildRequires: libvdpau-devel BuildRequires: pkgconfig BuildRequires: python-base +BuildRequires: python-mako BuildRequires: python-xml BuildRequires: pkgconfig(dri2proto) BuildRequires: pkgconfig(dri3proto) @@ -506,7 +510,7 @@ This package contains the VDPAU state tracker for radeonsi. %prep -%setup -q -n %{name}-%{_version} -b4 +%setup -q -n %{_name_archive}-%{_version} -b4 # remove some docs rm -rf docs/README.{VMS,WIN32,OS2} ### disabled, but not dropped yet; these still need investigation in @@ -516,7 +520,9 @@ rm -rf docs/README.{VMS,WIN32,OS2} #%patch15 -p1 #%patch13 -p1 ### -%patch16 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 %build %if 0%{?suse_version} >= 1310 diff --git a/MesaLib-10.4.4.tar.bz2 b/MesaLib-10.4.4.tar.bz2 deleted file mode 100644 index 3019d4b..0000000 --- a/MesaLib-10.4.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c -size 7507100 diff --git a/U_0001_gallium_include_util_macros.patch b/U_0001_gallium_include_util_macros.patch new file mode 100644 index 0000000..a60590b --- /dev/null +++ b/U_0001_gallium_include_util_macros.patch @@ -0,0 +1,89 @@ +From 984f3069370cd4a347cb38269d430b428385affd Mon Sep 17 00:00:00 2001 +From: Tobias Klausmann +Date: Thu, 12 Feb 2015 18:31:40 +0100 +Subject: gallium: include util/macros.h + +The most common macros are defined there, no use to duplicate these +Clean up the already redefinded macros + +Signed-off-by: Tobias Klausmann +Reviewed-by: Eric Anholt + +diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h +index fb018bf..cc4f444 100644 +--- a/src/gallium/include/pipe/p_compiler.h ++++ b/src/gallium/include/pipe/p_compiler.h +@@ -33,6 +33,8 @@ + + #include "p_config.h" + ++#include "util/macros.h" ++ + #include + #include + #include +@@ -204,61 +206,6 @@ void _ReadWriteBarrier(void); + + #endif + +- +-/* You should use these macros to mark if blocks where the if condition +- * is either likely to be true, or unlikely to be true. +- * +- * This will inform human readers of this fact, and will also inform +- * the compiler, who will in turn inform the CPU. +- * +- * CPUs often start executing code inside the if or the else blocks +- * without knowing whether the condition is true or not, and will have +- * to throw the work away if they find out later they executed the +- * wrong part of the if. +- * +- * If these macros are used, the CPU is more likely to correctly predict +- * the right path, and will avoid speculatively executing the wrong branch, +- * thus not throwing away work, resulting in better performance. +- * +- * In light of this, it is also a good idea to mark as "likely" a path +- * which is not necessarily always more likely, but that will benefit much +- * more from performance improvements since it is already much faster than +- * the other path, or viceversa with "unlikely". +- * +- * Example usage: +- * if(unlikely(do_we_need_a_software_fallback())) +- * do_software_fallback(); +- * else +- * render_with_gpu(); +- * +- * The macros follow the Linux kernel convention, and more examples can +- * be found there. +- * +- * Note that profile guided optimization can offer better results, but +- * needs an appropriate coverage suite and does not inform human readers. +- */ +-#ifndef likely +-# if defined(__GNUC__) +-# define likely(x) __builtin_expect(!!(x), 1) +-# define unlikely(x) __builtin_expect(!!(x), 0) +-# else +-# define likely(x) (x) +-# define unlikely(x) (x) +-# endif +-#endif +- +- +-/** +- * Static (compile-time) assertion. +- * Basically, use COND to dimension an array. If COND is false/zero the +- * array size will be -1 and we'll get a compilation error. +- */ +-#define STATIC_ASSERT(COND) \ +- do { \ +- (void) sizeof(char [1 - 2*!(COND)]); \ +- } while (0) +- +- + #if defined(__cplusplus) + } + #endif +-- +cgit v0.10.2 + diff --git a/U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch b/U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch new file mode 100644 index 0000000..936ba85 --- /dev/null +++ b/U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch @@ -0,0 +1,24 @@ +From 98ae01c82294882b1fddcd03adf24101b4f24d4f Mon Sep 17 00:00:00 2001 +From: Tobias Klausmann +Date: Thu, 12 Feb 2015 18:31:41 +0100 +Subject: st/nine: Mark end of non-void function unreachable + +Signed-off-by: Tobias Klausmann +Reviewed-by: Eric Anholt + +diff --git a/src/gallium/state_trackers/nine/nine_pipe.h b/src/gallium/state_trackers/nine/nine_pipe.h +index 17844d5..b8e728e 100644 +--- a/src/gallium/state_trackers/nine/nine_pipe.h ++++ b/src/gallium/state_trackers/nine/nine_pipe.h +@@ -222,7 +222,7 @@ d3d9_get_pipe_depth_format_bindings(D3DFORMAT format) + case D3DFMT_DF24: + case D3DFMT_INTZ: + return PIPE_BIND_DEPTH_STENCIL | PIPE_BIND_SAMPLER_VIEW; +- default: assert(0); ++ default: unreachable("Unexpected format"); + } + } + +-- +cgit v0.10.2 + diff --git a/U_0003_fix_build_after_macro_include.patch b/U_0003_fix_build_after_macro_include.patch new file mode 100644 index 0000000..03186a3 --- /dev/null +++ b/U_0003_fix_build_after_macro_include.patch @@ -0,0 +1,24 @@ +From 1d1e820a6dce5e6fc8f67bd0f00e402645774e1b Mon Sep 17 00:00:00 2001 +From: Eric Anholt +Date: Tue, 24 Feb 2015 13:47:58 +0000 +Subject: r600: Fix build after 984f3069370cd4a347cb38269d430b428385affd + +Same as for the CLAMP macro, undef it before including a header file that +tries to make fields with that name. + +diff --git a/src/gallium/drivers/r600/sb/sb_bc.h b/src/gallium/drivers/r600/sb/sb_bc.h +index 6d3dc4d..072d8f8 100644 +--- a/src/gallium/drivers/r600/sb/sb_bc.h ++++ b/src/gallium/drivers/r600/sb/sb_bc.h +@@ -784,7 +784,7 @@ public: \ + + // CLAMP macro defined elsewhere interferes with bytecode field name + #undef CLAMP +- ++#undef ARRAY_SIZE + #include "sb_bc_fmt_def.inc" + + #undef BC_FORMAT_BEGIN +-- +cgit v0.10.2 + diff --git a/mesa-10.5.0.tar.xz b/mesa-10.5.0.tar.xz new file mode 100644 index 0000000..f6c16dd --- /dev/null +++ b/mesa-10.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7ca9f9044bbdd674377e3eebceef1fae339c8817b9aa435c2053e4fea44e5d3 +size 6974540 diff --git a/u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch b/u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch deleted file mode 100644 index 1ff99f7..0000000 --- a/u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ef7e0b39a24966526b102643523feac765771842 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= -Date: Wed, 3 Dec 2014 07:48:26 +0000 -Subject: gallivm: Update for RTDyldMemoryManager becoming an unique_ptr. - -Trivial. - -Fixes https://bugs.freedesktop.org/show_bug.cgi?id=86958 - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index fe3c754..5210acc 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -500,8 +500,12 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT, - MM = new ShaderMemoryManager(JMM); - *OutCode = MM->getGeneratedCode(); - -+#if HAVE_LLVM >= 0x0306 -+ builder.setMCJITMemoryManager(std::unique_ptr(MM)); -+#else - builder.setMCJITMemoryManager(MM); - #endif -+#endif - } else { - #if HAVE_LLVM < 0x0306 - BaseMemoryManager* JMM = reinterpret_cast(CMM); --- -cgit v0.10.2 -