diff options
author | Brian Paul <brianp@vmware.com> | 2009-08-12 20:32:41 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-08-12 20:32:41 -0600 |
commit | f3b215cba2bca92d6582cc0c34702b73289f909c (patch) | |
tree | b7a534f0adae00b68641b005c0db81227cf5aa8e /src/mesa/state_tracker/st_atom_shader.c | |
parent | fdfb0d4b0e04bff2f3dbae2d1f8e3765fb4b0dce (diff) | |
parent | f7618f4f37d42461b1a6feaa392935d1ae703873 (diff) |
Merge branch 'new-frag-attribs'
This branch introduces new FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC fragment
program inputs for GLSL gl_FrontFacing and gl_PointCoord. Before, these
attributes were packed with the FOG attribute. That made things
complicated elsewhere.
Diffstat (limited to 'src/mesa/state_tracker/st_atom_shader.c')
-rw-r--r-- | src/mesa/state_tracker/st_atom_shader.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c index 8b3bb5cc03..ee649be885 100644 --- a/src/mesa/state_tracker/st_atom_shader.c +++ b/src/mesa/state_tracker/st_atom_shader.c @@ -139,23 +139,6 @@ find_translated_vp(struct st_context *st, if (fragInputsRead & (1 << inAttr)) { stfp->input_to_slot[inAttr] = numIn; numIn++; - if (((1 << inAttr) & FRAG_BIT_FOGC)) { - /* leave placeholders for the - * extra registers we extract from fog */ - 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; - } - } } else { stfp->input_to_slot[inAttr] = UNUSED; |