diff options
| author | Brian Paul <brianp@vmware.com> | 2010-03-25 16:12:01 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-03-25 16:12:01 -0600 |
| commit | a6fecdff3e71f080d4caf29d2b0713ab5ce9d5f4 (patch) | |
| tree | c0008c909e6ef0e25b62ef92b77061c955f85836 /src/mesa/drivers/dri/r300/r300_fragprog_common.c | |
| parent | 8814bb652aa0deee7fa34c0746ba9dc63163b88d (diff) | |
| parent | 59258498dc6fa51573b176d071644bd3e750b5ac (diff) | |
Merge branch '7.8'
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_fragprog_common.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_fragprog_common.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c index 61ea5e4d9a..0646da4624 100644 --- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c +++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c @@ -256,6 +256,19 @@ static void translate_fragment_program(GLcontext *ctx, struct r300_fragment_prog fp->InputsRead = compiler.Base.Program.InputsRead; + /* Clear the fog/wpos_attr if code accessing these + * attributes has been removed during compilation + */ + if (fp->fog_attr != FRAG_ATTRIB_MAX) { + if (!(fp->InputsRead & (1 << fp->fog_attr))) + fp->fog_attr = FRAG_ATTRIB_MAX; + } + + if (fp->wpos_attr != FRAG_ATTRIB_MAX) { + if (!(fp->InputsRead & (1 << fp->wpos_attr))) + fp->wpos_attr = FRAG_ATTRIB_MAX; + } + rc_destroy(&compiler.Base); } |