SHA256
1
0
forked from pool/Mesa

- MesaLib 7.9

- obsoletes commit-73dab75.diff

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=132
This commit is contained in:
Stefan Dirsch 2010-10-05 07:10:43 +00:00 committed by Git OBS Bridge
parent 10909a54a2
commit 3f0d41e768
5 changed files with 11 additions and 33 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 5 06:57:26 UTC 2010 - sndirsch@novell.com
- MesaLib 7.9
- obsoletes commit-73dab75.diff
-------------------------------------------------------------------
Thu Sep 30 09:49:13 UTC 2010 - sndirsch@novell.com

View File

@ -43,7 +43,7 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version}
%endif
#
Summary: System for rendering interactive 3-D graphics
Source: MesaLib-%{_version}-rc2.tar.bz2
Source: MesaLib-%{_version}.tar.bz2
Source1: MesaDemos-7.8.2.tar.bz2
Source2: baselibs.conf
Source3: README.updates
@ -55,7 +55,6 @@ 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
@ -135,7 +134,7 @@ Authors:
Francisco Jerez
%prep
%setup -n %{name}-%{_version}-rc2 -a1 -b4 -q
%setup -n %{name}-%{_version} -a1 -b4 -q
# no need to build (GLUT-)Demos
rm -rf src/glut progs/{demos,redbook,samples,xdemos,glsl}
# we use freeglut
@ -147,7 +146,6 @@ 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

View File

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

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

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

View File

@ -1,26 +0,0 @@
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.