fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nv50: fix layerid to be the fp input number rather than vp output number

Browse source 
In the tests they were the same so it didn't matter, but indications are
that this is the correct behaviour. Also take this opportunity to
(trivially) support using gl_Layer in fp.

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>
(cherry picked from commit 364bdd2419)
This commit is contained in:
Ilia Mirkin 2014-02-03 23:35:14 -05:00 • committed by Ian Romanick
parent 156ac628a8
commit 142f6cc0b4
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/nouveau/nv50/nv50_program.c
View file

@ -104,7 +104,7 @@ nv50_vertprog_assign_slots(struct nv50_ir_prog_info *info)
prog->vp.bfc[info->out[i].si] = i;
break;
case TGSI_SEMANTIC_LAYER:
prog->gp.has_layer = true;
prog->gp.has_layer = TRUE;
prog->gp.layerid = n;
break;
default:

2
src/gallium/drivers/nouveau/nv50/nv50_program.h
View file

@ -89,7 +89,7 @@ struct nv50_program {
struct {
uint32_t vert_count;
uint8_t prim_type; /* point, line strip or tri strip */
bool has_layer;
uint8_t has_layer;
ubyte layerid; /* hw value of layer output */
} gp;

12
src/gallium/drivers/nouveau/nv50/nv50_shader_state.c
View file

@ -346,7 +346,7 @@ nv50_fp_linkage_validate(struct nv50_context *nv50)
struct nv50_varying dummy;
int i, n, c, m;
uint32_t primid = 0;
uint32_t layerid = vp->gp.layerid;
uint32_t layerid = 0;
uint32_t psiz = 0x000;
uint32_t interp = fp->fp.interp;
uint32_t colors = fp->fp.colors;
@ -405,15 +405,17 @@ nv50_fp_linkage_validate(struct nv50_context *nv50)
case TGSI_SEMANTIC_PRIMID:
primid = m;
break;
case TGSI_SEMANTIC_LAYER:
layerid = m;
break;
}
m = nv50_vec4_map(map, m, lin,
&fp->in[i], (n < vp->out_nr) ? &vp->out[n] : &dummy);
}
if (vp->gp.has_layer) {
// In GL4.x, layer can be an fp input, but not in 3.x. Make sure to add
// it to the output map.
map[m++] = layerid;
if (vp->gp.has_layer && !layerid) {
layerid = m;
map[m++] = vp->gp.layerid;
}
if (nv50->rast->pipe.point_size_per_vertex) {