- 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
This commit is contained in:
Stefan Dirsch 2010-10-07 07:54:42 +00:00 committed by Git OBS Bridge
parent 3f0d41e768
commit 7f65bac0f4
3 changed files with 32 additions and 0 deletions

View File

@ -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

View File

@ -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

23
commit-d316391.diff Normal file
View File

@ -0,0 +1,23 @@
commit d3163912c1f15fcb44beb33c5069799d56e1dc16
Author: Eric Anholt <eric@anholt.net>
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) <<