rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 290174 from X11:XOrg

Browse Source 
- 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/290174
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=236
This commit is contained in:
Dominique Leuenberger 2015-03-12 15:37:55 +00:00 committed by Git OBS Bridge
commit d82ddd9bb8
8 changed files with 184 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Mesa.changes
View File

@ -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 Mon Mar 2 19:27:19 UTC 2015 - idonmez@suse.com

22
Mesa.spec
View File

@ -17,8 +17,8 @@
%define glamor 1 %define glamor 1
%define _name_archive MesaLib %define _name_archive mesa
%define _version 10.4.4 %define _version 10.5.0
%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x %ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
%define gallium_loader 1 %define gallium_loader 1
%else %else
@ -37,13 +37,13 @@
%define with_nine 1 %define with_nine 1
%endif %endif
Name: Mesa Name: Mesa
Version: 10.4.4 Version: 10.5.0
Release: 0 Release: 0
Summary: System for rendering interactive 3-D graphics Summary: System for rendering interactive 3-D graphics
License: MIT License: MIT
Group: System/Libraries Group: System/Libraries
Url: http://www.mesa3d.org 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 Source2: baselibs.conf
Source3: README.updates Source3: README.updates
Source4: manual-pages.tar.bz2 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 Patch13: u_mesa-8.0.1-fix-16bpp.patch
# Patch from Fedora, use shmget when available, under llvmpipe # Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch 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: autoconf >= 2.60
BuildRequires: automake BuildRequires: automake
BuildRequires: bison BuildRequires: bison
@ -69,6 +72,7 @@ BuildRequires: libtool
BuildRequires: libvdpau-devel BuildRequires: libvdpau-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python-base BuildRequires: python-base
BuildRequires: python-mako
BuildRequires: python-xml BuildRequires: python-xml
BuildRequires: pkgconfig(dri2proto) BuildRequires: pkgconfig(dri2proto)
BuildRequires: pkgconfig(dri3proto) BuildRequires: pkgconfig(dri3proto)
@ -506,7 +510,7 @@ This package contains the VDPAU state tracker for radeonsi.
%prep %prep
%setup -q -n %{name}-%{_version} -b4 %setup -q -n %{_name_archive}-%{_version} -b4
# remove some docs # remove some docs
rm -rf docs/README.{VMS,WIN32,OS2} rm -rf docs/README.{VMS,WIN32,OS2}
### disabled, but not dropped yet; these still need investigation in ### disabled, but not dropped yet; these still need investigation in
@ -516,7 +520,9 @@ rm -rf docs/README.{VMS,WIN32,OS2}
#%patch15 -p1 #%patch15 -p1
#%patch13 -p1 #%patch13 -p1
### ###
%patch16 -p1 %patch100 -p1
%patch101 -p1
%patch102 -p1
%build %build
%if 0%{?suse_version} >= 1310 %if 0%{?suse_version} >= 1310

3
MesaLib-10.4.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c
size 7507100

89
U_0001_gallium_include_util_macros.patch Normal file
View File

@ -0,0 +1,89 @@
From 984f3069370cd4a347cb38269d430b428385affd Mon Sep 17 00:00:00 2001
From: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
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 <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
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 <stdlib.h>
#include <string.h>
#include <stddef.h>
@@ -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

24
U_0002_st_nine_mark_end_of_non_void_function_unreachable.patch Normal file
View File

@ -0,0 +1,24 @@
From 98ae01c82294882b1fddcd03adf24101b4f24d4f Mon Sep 17 00:00:00 2001
From: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Date: Thu, 12 Feb 2015 18:31:41 +0100
Subject: st/nine: Mark end of non-void function unreachable
Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann@mni.thm.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
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

24
U_0003_fix_build_after_macro_include.patch Normal file
View File

@ -0,0 +1,24 @@
From 1d1e820a6dce5e6fc8f67bd0f00e402645774e1b Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
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

3
mesa-10.5.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7ca9f9044bbdd674377e3eebceef1fae339c8817b9aa435c2053e4fea44e5d3
size 6974540

29
u_gallivm_Update_for_RTDyldMemoryManager_unique_ptr.patch
View File

@ -1,29 +0,0 @@
From ef7e0b39a24966526b102643523feac765771842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
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<RTDyldMemoryManager>(MM));
+#else
builder.setMCJITMemoryManager(MM);
#endif
+#endif
} else {
#if HAVE_LLVM < 0x0306
BaseMemoryManager* JMM = reinterpret_cast<BaseMemoryManager*>(CMM);
--
cgit v0.10.2