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

Accepting request 49550 from X11:XOrg

Browse Source 
Copy from X11:XOrg/Mesa based on submit request 49550 from user sndirsch

OBS-URL: https://build.opensuse.org/request/show/49550
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=98
This commit is contained in:
OBS User autobuild
2010-10-01 21:58:03 +00:00
committed by Git OBS Bridge
parent a0bec58c35 10909a54a2
commit 3b051c815c
5 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Mesa.changes
View File

@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Thu Sep 30 09:49:13 UTC 2010 - sndirsch@novell.com
- commit-73dab75.diff
* i965: fallback lineloop on sandybridge for now (bfo #30420,
comment #8)
-------------------------------------------------------------------
Wed Sep 29 12:01:23 UTC 2010 - sndirsch@novell.com
- updated to MesaLib 7.9-RC2
-------------------------------------------------------------------
Mon Sep 27 18:28:46 UTC 2010 - sndirsch@novell.com

8
Mesa.spec
View File

@@ -22,7 +22,7 @@
%define _version 7.9
Version: 7.9
Release: 1
Release: 2
Name: Mesa
BuildRequires: gcc-c++ libdrm-devel libexpat-devel pkgconfig python-base xorg-x11-devel
@@ -43,7 +43,7 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version}
%endif
#
Summary: System for rendering interactive 3-D graphics
Source: MesaLib-%{_version}-rc1.tar.bz2
Source: MesaLib-%{_version}-rc2.tar.bz2
Source1: MesaDemos-7.8.2.tar.bz2
Source2: baselibs.conf
Source3: README.updates
@@ -55,6 +55,7 @@ Patch1: dri_driver_dir.diff
Patch8: egl-buildfix.diff
Patch9: Mesa_indirect_old_xserver_compatibility.diff
# already upstream
Patch10: commit-73dab75.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -134,7 +135,7 @@ Authors:
Francisco Jerez
%prep
%setup -n %{name}-%{_version}-rc1 -a1 -b4 -q
%setup -n %{name}-%{_version}-rc2 -a1 -b4 -q
# no need to build (GLUT-)Demos
rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
# we use freeglut
@@ -146,6 +147,7 @@ sed -i 's/REPLACE/%_lib/g' src/glx/Makefile
sed -i 's/REPLACE/%_lib/g' src/egl/drivers/dri2/Makefile
%patch8
%patch9 -p0
%patch10 -p1
%build

3
MesaLib-7.9-rc1.tar.bz2
View File

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

3
MesaLib-7.9-rc2.tar.bz2 Normal file
View File

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

26
commit-73dab75.diff Normal file
View File

@@ -0,0 +1,26 @@
commit 73dab75b4165f7d2214a68d4ba8e3cb7aab9b4ac
Author: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Sun Sep 26 13:15:39 2010 +0800
i965: fallback lineloop on sandybridge for now
Until we fixed GS hang issue.
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 16331cc..6a4dda2 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -204,6 +204,13 @@ static GLboolean check_fallbacks( struct brw_context *brw,
GLcontext *ctx = &brw->intel.ctx;
GLuint i;
+ /* XXX FIXME */
+ if (brw->intel.gen >= 6) {
+ for (i = 0; i < nr_prims; i++)
+ if (prim[i].mode == GL_LINE_LOOP)
+ return GL_TRUE;
+ }
+
/* If we don't require strict OpenGL conformance, never
* use fallbacks. If we're forcing fallbacks, always
* use fallfacks.