diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-02-03 23:20:32 -0500 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2014-02-06 18:02:57 -0500 |
| commit | c7373b7dc7202b93eecc1072efda7319b1ad0da8 (patch) | |
| tree | 5ba567c74ed320d899bdc78b0fcafb8cb89b4033 /src/gallium/drivers/nouveau/nv50/nv50_program.c | |
| parent | f658150639c36eda351590e757247c56507f494f (diff) | |
| download | external_mesa3d-c7373b7dc7202b93eecc1072efda7319b1ad0da8.zip external_mesa3d-c7373b7dc7202b93eecc1072efda7319b1ad0da8.tar.gz external_mesa3d-c7373b7dc7202b93eecc1072efda7319b1ad0da8.tar.bz2 | |
nv50: rework primid logic
Functionally identical but much simpler. Should also better integrate
with future layer/viewport changes/fixes.
Cc: 10.1 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Diffstat (limited to 'src/gallium/drivers/nouveau/nv50/nv50_program.c')
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_program.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_program.c b/src/gallium/drivers/nouveau/nv50/nv50_program.c index 636ef87..f14d3ef 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_program.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_program.c @@ -170,10 +170,8 @@ nv50_fragprog_assign_slots(struct nv50_ir_prog_info *info) if (info->in[i].sn == TGSI_SEMANTIC_COLOR) prog->vp.bfc[info->in[i].si] = j; - else if (info->in[i].sn == TGSI_SEMANTIC_PRIMID) { + else if (info->in[i].sn == TGSI_SEMANTIC_PRIMID) prog->vp.attrs[2] |= NV50_3D_VP_GP_BUILTIN_ATTR_EN_PRIMITIVE_ID; - prog->gp.primid = j; - } prog->in[j].id = i; prog->in[j].mask = info->in[i].mask; @@ -345,7 +343,6 @@ nv50_program_translate(struct nv50_program *prog, uint16_t chipset) prog->vp.clpd[0] = map_undef; prog->vp.clpd[1] = map_undef; prog->vp.psiz = map_undef; - prog->gp.primid = 0x80; prog->gp.has_layer = 0; info->driverPriv = prog; |