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

Accepting request 110727 from X11:XOrg

Browse Source 
-- Updated software rasterizer to use llvmpipe the advanced,
-  multithreaded,software rasterizer if availaible for that
-  archetecture (ie. X86/X86-64).

- Adjust baselibs.conf for OSMesa soname change

- U_gallium-rtasm-properly-detect-SSE-and-SSE2.patch 
  * gallium/rtasm: properly detect SSE and SSE2;  this should fix
    crashes on ancient processors. (bnc#728737)

OBS-URL: https://build.opensuse.org/request/show/110727
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=143
This commit is contained in:
Stephan Kulow 2012-03-23 14:11:37 +00:00 committed by Git OBS Bridge
commit ea7a32a032
4 changed files with 108 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Mesa.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Wed Mar 21 23:21:24 UTC 2012 - ryanbach@adelphia.net
-- Updated software rasterizer to use llvmpipe the advanced,
- multithreaded,software rasterizer if availaible for that
- archetecture (ie. X86/X86-64).
-------------------------------------------------------------------
Wed Mar 21 18:06:27 UTC 2012 - jengelh@medozas.de
- Adjust baselibs.conf for OSMesa soname change
-------------------------------------------------------------------
Wed Mar 21 14:55:19 UTC 2012 - sndirsch@suse.com
- U_gallium-rtasm-properly-detect-SSE-and-SSE2.patch
* gallium/rtasm: properly detect SSE and SSE2; this should fix
crashes on ancient processors. (bnc#728737)
-------------------------------------------------------------------
Thu Mar 1 08:22:41 UTC 2012 - coolo@suse.com

3
Mesa.spec
View File

@ -86,6 +86,7 @@ Patch1: Mesa-nodate.diff
# to be upstreamed
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
# already upstream
Patch12: U_gallium-rtasm-properly-detect-SSE-and-SSE2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -367,6 +368,7 @@ rm -f include/GL/{glut.h,uglglutshapes.h,glutf90.h}
# remove some docs
rm -rf docs/README.{VMS,WIN32,OS2}
#%patch11 -p1
%patch12 -p1
%build
@ -384,6 +386,7 @@ autoreconf -fi
--enable-shared-dricore \
--with-dri-searchpath=/usr/%{_lib}/dri/updates:/usr/%{_lib}/dri \
%ifarch %ix86 x86_64
--enable-gallium-llvm \
--with-dri-drivers=i915,i965,nouveau,r200,radeon \
--with-gallium-drivers=r300,r600,nouveau,swrast \
%endif

85
U_gallium-rtasm-properly-detect-SSE-and-SSE2.patch Normal file
View File

@ -0,0 +1,85 @@
From 74d303521e6ba41d1cbeb75edb2f834ebbe8c550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <maraeo@gmail.com>
Date: Fri, 24 Feb 2012 19:29:48 +0100
Subject: [PATCH] gallium/rtasm: properly detect SSE and SSE2
This should fix crashes on ancient processors.
---
src/gallium/auxiliary/rtasm/rtasm_cpu.c | 48 +++++++++++++++---------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/gallium/auxiliary/rtasm/rtasm_cpu.c b/src/gallium/auxiliary/rtasm/rtasm_cpu.c
index 0461c81..7afcf14 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_cpu.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_cpu.c
@@ -25,43 +25,43 @@
*
**************************************************************************/
+#include "pipe/p_config.h"
+#include "rtasm_cpu.h"
+
+#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
#include "util/u_debug.h"
-#include "rtasm_cpu.h"
+#include "util/u_cpu_detect.h"
+DEBUG_GET_ONCE_BOOL_OPTION(nosse, "GALLIUM_NOSSE", FALSE);
-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
-static boolean rtasm_sse_enabled(void)
+static struct util_cpu_caps *get_cpu_caps(void)
{
- static boolean firsttime = 1;
- static boolean enabled;
-
- /* This gets called quite often at the moment:
- */
- if (firsttime) {
- enabled = !debug_get_bool_option("GALLIUM_NOSSE", FALSE);
- firsttime = FALSE;
- }
- return enabled;
+ util_cpu_detect();
+ return &util_cpu_caps;
}
-#endif
int rtasm_cpu_has_sse(void)
{
- /* FIXME: actually detect this at run-time */
-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
- return rtasm_sse_enabled();
-#else
- return 0;
-#endif
+ return !debug_get_option_nosse() && get_cpu_caps()->has_sse;
}
int rtasm_cpu_has_sse2(void)
{
- /* FIXME: actually detect this at run-time */
-#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
- return rtasm_sse_enabled();
+ return !debug_get_option_nosse() && get_cpu_caps()->has_sse2;
+}
+
+
#else
+
+int rtasm_cpu_has_sse(void)
+{
return 0;
-#endif
}
+
+int rtasm_cpu_has_sse2(void)
+{
+ return 0;
+}
+
+#endif
--
1.7.3.4

2
baselibs.conf
View File

@ -36,7 +36,7 @@ Mesa-libGLU-devel
requires -Mesa-libGLU-<targettype>
requires "Mesa-libGLU1-<targettype> = <version>"
Mesa-libIndirectGL1
libOSMesa7
libOSMesa8
libgbm1
libgbm-devel
requires -libgbm-<targettype>