Merge branch 'mesa_7_5_branch'
This commit is contained in:
commit
7ccb00b1ac
|
@ -142,9 +142,18 @@ find_translated_vp(struct st_context *st,
|
|||
if ((fragInputsRead & FRAG_BIT_FOGC)) {
|
||||
/* leave placeholders for the
|
||||
* extra registers we extract from fog */
|
||||
if (stfp->Base.UsesFrontFacing ||
|
||||
stfp->Base.UsesPointCoord) {
|
||||
numIn += 2;
|
||||
if (stfp->Base.UsesFrontFacing) {
|
||||
if (!stfp->Base.UsesFogFragCoord)
|
||||
--stfp->input_to_slot[inAttr];
|
||||
else
|
||||
++numIn;
|
||||
}
|
||||
if (stfp->Base.UsesPointCoord) {
|
||||
if (!stfp->Base.UsesFrontFacing &&
|
||||
!stfp->Base.UsesFogFragCoord)
|
||||
stfp->input_to_slot[inAttr] -= 2;
|
||||
else
|
||||
++numIn;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue