From 3f0d41e7685d47a4b64a7e8b1fbf4386d4c85a53fced2fc9cdc360f48b936716 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 5 Oct 2010 07:10:43 +0000 Subject: [PATCH 1/4] - MesaLib 7.9 - obsoletes commit-73dab75.diff OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=132 --- Mesa.changes | 6 ++++++ Mesa.spec | 6 ++---- MesaLib-7.9-rc2.tar.bz2 | 3 --- MesaLib-7.9.tar.bz2 | 3 +++ commit-73dab75.diff | 26 -------------------------- 5 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 MesaLib-7.9-rc2.tar.bz2 create mode 100644 MesaLib-7.9.tar.bz2 delete mode 100644 commit-73dab75.diff diff --git a/Mesa.changes b/Mesa.changes index 4f8dc8a..9960345 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -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 diff --git a/Mesa.spec b/Mesa.spec index ef8ad3d..9099d8b 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -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 diff --git a/MesaLib-7.9-rc2.tar.bz2 b/MesaLib-7.9-rc2.tar.bz2 deleted file mode 100644 index eb9d799..0000000 --- a/MesaLib-7.9-rc2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21dd2333571e0843cc3f306d3e1448e6ef147ae03faa8b7245192720d5b7843f -size 5676582 diff --git a/MesaLib-7.9.tar.bz2 b/MesaLib-7.9.tar.bz2 new file mode 100644 index 0000000..b3ef4c7 --- /dev/null +++ b/MesaLib-7.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3 +size 5678494 diff --git a/commit-73dab75.diff b/commit-73dab75.diff deleted file mode 100644 index aef9aab..0000000 --- a/commit-73dab75.diff +++ /dev/null @@ -1,26 +0,0 @@ -commit 73dab75b4165f7d2214a68d4ba8e3cb7aab9b4ac -Author: Zhenyu Wang -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. From 7f65bac0f4ab285e64a72c2a51a92778c1598d015e43b502989cb6d8b5307d5f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 7 Oct 2010 07:54:42 +0000 Subject: [PATCH 2/4] - commit-d316391.diff * i965: Fix gen6 pointsize handling to match pre-gen6. Fixes point-line-no-cull (bfo #30532) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=133 --- Mesa.changes | 7 +++++++ Mesa.spec | 2 ++ commit-d316391.diff | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 commit-d316391.diff diff --git a/Mesa.changes b/Mesa.changes index 9960345..ff82345 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 7 07:35:31 UTC 2010 - sndirsch@novell.com + +- commit-d316391.diff + * i965: Fix gen6 pointsize handling to match pre-gen6. Fixes + point-line-no-cull (bfo #30532) + ------------------------------------------------------------------- Tue Oct 5 06:57:26 UTC 2010 - sndirsch@novell.com diff --git a/Mesa.spec b/Mesa.spec index 9099d8b..93ccd16 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -55,6 +55,7 @@ Patch1: dri_driver_dir.diff Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff # already upstream +Patch10: commit-d316391.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -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 diff --git a/commit-d316391.diff b/commit-d316391.diff new file mode 100644 index 0000000..7576be9 --- /dev/null +++ b/commit-d316391.diff @@ -0,0 +1,23 @@ +commit d3163912c1f15fcb44beb33c5069799d56e1dc16 +Author: Eric Anholt +Date: Wed Oct 6 17:29:29 2010 -0700 + + i965: Fix gen6 pointsize handling to match pre-gen6. + + Fixes point-line-no-cull. + Bug #30532 + +diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c +index 6c88338..b2a6bd0 100644 +--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c ++++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c +@@ -125,7 +125,8 @@ upload_sf_state(struct brw_context *brw) + } + + /* _NEW_POINT */ +- if (ctx->Point._Attenuated) ++ if (!(ctx->VertexProgram.PointSizeEnabled || ++ ctx->Point._Attenuated)) + dw4 |= GEN6_SF_USE_STATE_POINT_WIDTH; + + dw4 |= U_FIXED(CLAMP(ctx->Point.Size, 0.125, 225.875), 3) << From cfa9ca6f86ae84ed7d0374bb2fdefb047ff3be73e11d0ecc0541d635c02b1a89 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 7 Oct 2010 21:21:58 +0000 Subject: [PATCH 3/4] Accepting request 49938 from X11:XOrg checked in (request 49938) OBS-URL: https://build.opensuse.org/request/show/49938 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=134 --- Mesa.changes | 13 ------------- Mesa.spec | 6 +++--- MesaLib-7.9-rc2.tar.bz2 | 3 +++ MesaLib-7.9.tar.bz2 | 3 --- commit-73dab75.diff | 26 ++++++++++++++++++++++++++ commit-d316391.diff | 23 ----------------------- 6 files changed, 32 insertions(+), 42 deletions(-) create mode 100644 MesaLib-7.9-rc2.tar.bz2 delete mode 100644 MesaLib-7.9.tar.bz2 create mode 100644 commit-73dab75.diff delete mode 100644 commit-d316391.diff diff --git a/Mesa.changes b/Mesa.changes index ff82345..4f8dc8a 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,16 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 7 07:35:31 UTC 2010 - sndirsch@novell.com - -- commit-d316391.diff - * i965: Fix gen6 pointsize handling to match pre-gen6. Fixes - point-line-no-cull (bfo #30532) - -------------------------------------------------------------------- -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 diff --git a/Mesa.spec b/Mesa.spec index 93ccd16..ef8ad3d 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -43,7 +43,7 @@ Provides: XFree86-Mesa-64bit = %{version} Mesa-64bit < %{version} %endif # Summary: System for rendering interactive 3-D graphics -Source: MesaLib-%{_version}.tar.bz2 +Source: MesaLib-%{_version}-rc2.tar.bz2 Source1: MesaDemos-7.8.2.tar.bz2 Source2: baselibs.conf Source3: README.updates @@ -55,7 +55,7 @@ Patch1: dri_driver_dir.diff Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff # already upstream -Patch10: commit-d316391.diff +Patch10: commit-73dab75.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -135,7 +135,7 @@ Authors: Francisco Jerez %prep -%setup -n %{name}-%{_version} -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 diff --git a/MesaLib-7.9-rc2.tar.bz2 b/MesaLib-7.9-rc2.tar.bz2 new file mode 100644 index 0000000..eb9d799 --- /dev/null +++ b/MesaLib-7.9-rc2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21dd2333571e0843cc3f306d3e1448e6ef147ae03faa8b7245192720d5b7843f +size 5676582 diff --git a/MesaLib-7.9.tar.bz2 b/MesaLib-7.9.tar.bz2 deleted file mode 100644 index b3ef4c7..0000000 --- a/MesaLib-7.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3 -size 5678494 diff --git a/commit-73dab75.diff b/commit-73dab75.diff new file mode 100644 index 0000000..aef9aab --- /dev/null +++ b/commit-73dab75.diff @@ -0,0 +1,26 @@ +commit 73dab75b4165f7d2214a68d4ba8e3cb7aab9b4ac +Author: Zhenyu Wang +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. diff --git a/commit-d316391.diff b/commit-d316391.diff deleted file mode 100644 index 7576be9..0000000 --- a/commit-d316391.diff +++ /dev/null @@ -1,23 +0,0 @@ -commit d3163912c1f15fcb44beb33c5069799d56e1dc16 -Author: Eric Anholt -Date: Wed Oct 6 17:29:29 2010 -0700 - - i965: Fix gen6 pointsize handling to match pre-gen6. - - Fixes point-line-no-cull. - Bug #30532 - -diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c -index 6c88338..b2a6bd0 100644 ---- a/src/mesa/drivers/dri/i965/gen6_sf_state.c -+++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c -@@ -125,7 +125,8 @@ upload_sf_state(struct brw_context *brw) - } - - /* _NEW_POINT */ -- if (ctx->Point._Attenuated) -+ if (!(ctx->VertexProgram.PointSizeEnabled || -+ ctx->Point._Attenuated)) - dw4 |= GEN6_SF_USE_STATE_POINT_WIDTH; - - dw4 |= U_FIXED(CLAMP(ctx->Point.Size, 0.125, 225.875), 3) << From c95d9fec391b65a4fba3c9b59bb15c0fca678db0e04b113e146ecfd9b525e697 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 7 Oct 2010 21:21:59 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/Mesa revision 99.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=ec253640be150c935d32fe3121c4f90f --- Mesa.changes | 13 +++++++++++++ Mesa.spec | 8 ++++---- MesaLib-7.9-rc2.tar.bz2 | 3 --- MesaLib-7.9.tar.bz2 | 3 +++ commit-73dab75.diff | 26 -------------------------- commit-d316391.diff | 23 +++++++++++++++++++++++ 6 files changed, 43 insertions(+), 33 deletions(-) delete mode 100644 MesaLib-7.9-rc2.tar.bz2 create mode 100644 MesaLib-7.9.tar.bz2 delete mode 100644 commit-73dab75.diff create mode 100644 commit-d316391.diff diff --git a/Mesa.changes b/Mesa.changes index 4f8dc8a..ff82345 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Oct 7 07:35:31 UTC 2010 - sndirsch@novell.com + +- commit-d316391.diff + * i965: Fix gen6 pointsize handling to match pre-gen6. Fixes + point-line-no-cull (bfo #30532) + +------------------------------------------------------------------- +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 diff --git a/Mesa.spec b/Mesa.spec index ef8ad3d..c82602c 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -22,7 +22,7 @@ %define _version 7.9 Version: 7.9 -Release: 2 +Release: 3 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}-rc2.tar.bz2 +Source: MesaLib-%{_version}.tar.bz2 Source1: MesaDemos-7.8.2.tar.bz2 Source2: baselibs.conf Source3: README.updates @@ -55,7 +55,7 @@ Patch1: dri_driver_dir.diff Patch8: egl-buildfix.diff Patch9: Mesa_indirect_old_xserver_compatibility.diff # already upstream -Patch10: commit-73dab75.diff +Patch10: commit-d316391.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -135,7 +135,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 diff --git a/MesaLib-7.9-rc2.tar.bz2 b/MesaLib-7.9-rc2.tar.bz2 deleted file mode 100644 index eb9d799..0000000 --- a/MesaLib-7.9-rc2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21dd2333571e0843cc3f306d3e1448e6ef147ae03faa8b7245192720d5b7843f -size 5676582 diff --git a/MesaLib-7.9.tar.bz2 b/MesaLib-7.9.tar.bz2 new file mode 100644 index 0000000..b3ef4c7 --- /dev/null +++ b/MesaLib-7.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3 +size 5678494 diff --git a/commit-73dab75.diff b/commit-73dab75.diff deleted file mode 100644 index aef9aab..0000000 --- a/commit-73dab75.diff +++ /dev/null @@ -1,26 +0,0 @@ -commit 73dab75b4165f7d2214a68d4ba8e3cb7aab9b4ac -Author: Zhenyu Wang -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. diff --git a/commit-d316391.diff b/commit-d316391.diff new file mode 100644 index 0000000..7576be9 --- /dev/null +++ b/commit-d316391.diff @@ -0,0 +1,23 @@ +commit d3163912c1f15fcb44beb33c5069799d56e1dc16 +Author: Eric Anholt +Date: Wed Oct 6 17:29:29 2010 -0700 + + i965: Fix gen6 pointsize handling to match pre-gen6. + + Fixes point-line-no-cull. + Bug #30532 + +diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c +index 6c88338..b2a6bd0 100644 +--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c ++++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c +@@ -125,7 +125,8 @@ upload_sf_state(struct brw_context *brw) + } + + /* _NEW_POINT */ +- if (ctx->Point._Attenuated) ++ if (!(ctx->VertexProgram.PointSizeEnabled || ++ ctx->Point._Attenuated)) + dw4 |= GEN6_SF_USE_STATE_POINT_WIDTH; + + dw4 |= U_FIXED(CLAMP(ctx->Point.Size, 0.125, 225.875), 3) <<