diff options
| author | Michal Krol <michal@vmware.com> | 2010-03-02 13:35:30 +0100 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2010-03-02 13:35:30 +0100 |
| commit | 4ca70c489baed3e23dbf5e5e5794385113e22252 (patch) | |
| tree | c2fb1cc4f46e2ffe2c84ce4680fc68fed29f02de /src/gallium/drivers/svga/svga_state_need_swtnl.c | |
| parent | c1c7fa5192c4fb3f51fb67c81e58713d61ff0c93 (diff) | |
| parent | ff9ddf4d39be9e36d3e1dd9e10e889efa40dfb1e (diff) | |
Merge branch 'gallium-no-rhw-position'
Conflicts:
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_emit.c
src/gallium/drivers/r300/r300_state_derived.c
Diffstat (limited to 'src/gallium/drivers/svga/svga_state_need_swtnl.c')
| -rw-r--r-- | src/gallium/drivers/svga/svga_state_need_swtnl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_state_need_swtnl.c b/src/gallium/drivers/svga/svga_state_need_swtnl.c index dd13a89d24..a6ed18599c 100644 --- a/src/gallium/drivers/svga/svga_state_need_swtnl.c +++ b/src/gallium/drivers/svga/svga_state_need_swtnl.c @@ -129,8 +129,7 @@ static int update_need_pipeline( struct svga_context *svga, /* SVGA_NEW_CLIP */ - if (!svga->curr.rast->templ.bypass_vs_clip_and_viewport && - svga->curr.clip.nr) { + if (svga->curr.clip.nr) { SVGA_DBG(DEBUG_SWTNL, "%s: userclip\n", __FUNCTION__); need_pipeline = TRUE; } |