diff options
author | Alan Hourihane <alanh@vmware.com> | 2009-01-16 16:44:53 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@vmware.com> | 2009-01-16 16:44:53 +0000 |
commit | 2e28c1fda24988241ef7abb91b7d896e38f5df26 (patch) | |
tree | 593e70705d1f60babd77697b75f7618a94c6703b /src/mesa/drivers/dri/r300/r300_state.c | |
parent | 47ca0234dc9f83808cb141944537c78eaade5d55 (diff) | |
parent | e442fe5ba53acf16c78339f19921d70dba3928f6 (diff) |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/slang/slang_compile.c
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_state.c')
-rw-r--r-- | src/mesa/drivers/dri/r300/r300_state.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 6a5c3633a2..a63dbac343 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -1675,6 +1675,13 @@ static void r300SetupRSUnit(GLcontext * ctx) rs_col_count += count; } + if (InputsRead & FRAG_BIT_FOGC) { + /* XXX FIX THIS + * Just turn off the bit for now. + * Need to do something similar to the color/texcoord inputs. + */ + InputsRead &= ~FRAG_BIT_FOGC; + } for (i = 0; i < ctx->Const.MaxTextureUnits; i++) { int swiz; |