Attachment 46789 Details for Bug 35878 – patch

[patch] patch

nv50_clip_planes.patch (text/plain), 4.78 KB, created by maximlevitsky on 2011-05-16 21:35:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: maximlevitsky

Created: 2011-05-16 21:35:03 UTC

Size: 4.78 KB

patch

obsolete

>commit 71dba2c0c2cd37cf7da2dc6ef0e5808e4328024c
>Author: Maxim Levitsky <maximlevitsky@gmail.com>
>Date:   Tue May 17 07:30:30 2011 +0300
>
>    nv50: add support for user clip planes.
>    
>    Clip distance is calculated each time vertex position is written
>    which is suboptiomal is some cases but very safe.
>    User clip planes are an obsolete feature anyway.
>    
>    Every time number of clip planes increase, the vertex shader is recompiled.
>    That ensures no overhead in normal case (no user clip planes)
>    and reasonable overhead otherwice.
>    
>    Fixes 3D windows in compiz, and reflection effect in neverball.
>    Also fixes noticeable artefacts in compiz expo plugin when windows were dragged.
>    (about later I might not be right)
>    
>    Thanks to Christoph Bumiller for writing the shader compiler, and for helping me
>    learn it enough to fix that little issue.
>    
>    (This is based on patch by same author that added this support to older version of shader compiler)
>    
>    Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
>
>diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c
>index 41d3e14..4def93d 100644
>--- a/src/gallium/drivers/nv50/nv50_program.c
>+++ b/src/gallium/drivers/nv50/nv50_program.c
>@@ -395,6 +395,9 @@ nv50_vertprog_prepare(struct nv50_translation_info *ti)
>       }
>    }
> 
>+   p->vp.clpd = p->max_out;
>+   p->max_out += p->vp.clpd_nr;
>+
>    for (i = 0; i < TGSI_SEMANTIC_COUNT; ++i) {
>       switch (ti->sysval_map[i]) {
>       case 2:
>diff --git a/src/gallium/drivers/nv50/nv50_shader_state.c b/src/gallium/drivers/nv50/nv50_shader_state.c
>index 82c346c..76644a0 100644
>--- a/src/gallium/drivers/nv50/nv50_shader_state.c
>+++ b/src/gallium/drivers/nv50/nv50_shader_state.c
>@@ -170,6 +170,12 @@ nv50_vertprog_validate(struct nv50_context *nv50)
>    struct nouveau_channel *chan = nv50->screen->base.channel;
>    struct nv50_program *vp = nv50->vertprog;
> 
>+   if (nv50->clip.nr > vp->vp.clpd_nr) {
>+         if (vp->translated)
>+            nv50_program_destroy(nv50, vp);
>+         vp->vp.clpd_nr = nv50->clip.nr;
>+   }
>+
>    if (!nv50_program_validate(nv50, vp))
>          return;
> 
>@@ -368,8 +374,9 @@ nv50_fp_linkage_validate(struct nv50_context *nv50)
>    dummy.linear = 0;
>    m = nv50_vec4_map(map, 0, lin, &dummy, &vp->out[0]);
> 
>+
>    for (c = 0; c < vp->vp.clpd_nr; ++c)
>-      map[m++] |= vp->vp.clpd + c;
>+      map[m++] = vp->vp.clpd + c;
> 
>    colors |= m << 8; /* adjust BFC0 id */
> 
>diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c
>index cdf1a98..630006c 100644
>--- a/src/gallium/drivers/nv50/nv50_state_validate.c
>+++ b/src/gallium/drivers/nv50/nv50_state_validate.c
>@@ -303,10 +303,10 @@ static struct state_validate {
> #endif
>     { nv50_validate_viewport,      NV50_NEW_VIEWPORT },
>     { nv50_validate_clip,          NV50_NEW_CLIP },
>-    { nv50_vertprog_validate,      NV50_NEW_VERTPROG },
>+    { nv50_vertprog_validate,      NV50_NEW_VERTPROG | NV50_NEW_CLIP},
>     { nv50_gmtyprog_validate,      NV50_NEW_GMTYPROG },
>     { nv50_fragprog_validate,      NV50_NEW_FRAGPROG },
>-    { nv50_fp_linkage_validate,    NV50_NEW_FRAGPROG | NV50_NEW_VERTPROG |
>+    { nv50_fp_linkage_validate,    NV50_NEW_FRAGPROG | NV50_NEW_VERTPROG | NV50_NEW_CLIP |
>                                    NV50_NEW_GMTYPROG },
>     { nv50_gp_linkage_validate,    NV50_NEW_GMTYPROG | NV50_NEW_VERTPROG },
>     { nv50_validate_derived_rs,    NV50_NEW_FRAGPROG | NV50_NEW_RASTERIZER |
>diff --git a/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c b/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c
>index 25dcaae..5a19363 100644
>--- a/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c
>+++ b/src/gallium/drivers/nv50/nv50_tgsi_to_nc.c
>@@ -1990,6 +1990,39 @@ bld_instruction(struct bld_context *bld,
> 
>    FOR_EACH_DST0_ENABLED_CHANNEL(c, insn)
>       emit_store(bld, insn, c, dst0[c]);
>+
>+
>+   const struct tgsi_full_dst_register *dreg = &insn->Dst[0];
>+
>+   if(bld->ti->p->type == PIPE_SHADER_VERTEX &&
>+      dreg->Register.File == TGSI_FILE_OUTPUT &&
>+      bld->ti->p->out[dreg->Register.Index].sn == TGSI_SEMANTIC_POSITION) {
>+
>+
>+      for (int p = 0 ; p < bld->ti->p->vp.clpd_nr ; p++) {
>+         struct nv_value *clipd = NULL;
>+
>+        for (int c = 0 ; c < 4 ; c++) {
>+
>+            temp = new_value(bld->pc, NV_FILE_MEM_C(15), NV_TYPE_F32);
>+            temp->reg.id = p * 4 + c;
>+            temp = bld_insn_1(bld, NV_OP_LDA, temp);
>+
>+            if (!clipd)
>+               clipd = bld_insn_2(bld, NV_OP_MUL, dst0[c], temp);
>+            else
>+               clipd = bld_insn_3(bld, NV_OP_MAD, dst0[c], temp, clipd);
>+         }
>+
>+         temp = bld_insn_1(bld, NV_OP_MOV, clipd);
>+         temp->reg.file = NV_FILE_OUT;
>+         temp->insn->fixed = 1;
>+         temp->reg.id = bld->ti->p->vp.clpd + p;
>+      }
>+   }
>+
>+
>+
> }
> 
> static INLINE void

Actions: View | Splinter Review

Attachments on bug 35878: 45140 | 45141 | 46789

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.