summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nv40/nv40_state_emit.c
diff options
context:
space:
mode:
authorBen Skeggs <darktama@beleth.(none)>2008-02-20 17:22:40 +1100
committerBen Skeggs <darktama@beleth.(none)>2008-02-20 17:22:40 +1100
commit759fa5fcc8038af4845a6d9c57b75933ef26559c (patch)
tree5c62bfc7f8a50db047b0f86f59bb179c8d19840f /src/gallium/drivers/nv40/nv40_state_emit.c
parent9cd10d7618a226fe46395b08beb19e420bc14a4f (diff)
nv40: fb state
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_state_emit.c')
-rw-r--r--src/gallium/drivers/nv40/nv40_state_emit.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv40/nv40_state_emit.c b/src/gallium/drivers/nv40/nv40_state_emit.c
index 65d7e2978a..a9ca71c5e9 100644
--- a/src/gallium/drivers/nv40/nv40_state_emit.c
+++ b/src/gallium/drivers/nv40/nv40_state_emit.c
@@ -2,6 +2,7 @@
#include "nv40_state.h"
static struct nv40_state_entry *render_states[] = {
+ &nv40_state_framebuffer,
&nv40_state_rasterizer,
&nv40_state_clip,
&nv40_state_scissor,
@@ -67,7 +68,7 @@ nv40_state_emit(struct nv40_context *nv40)
so_emit(nv40->nvws, nv40->hw->state[idx]);
}
- so_emit_reloc_markers(nv40->nvws, nv40->so_framebuffer);
+ so_emit_reloc_markers(nv40->nvws, nv40->state.hw[NV40_STATE_FB]);
for (i = 0; i < 16; i++) {
if (!(nv40->fp_samplers & (1 << i)))
continue;
@@ -81,9 +82,6 @@ nv40_emit_hw_state(struct nv40_context *nv40)
{
nv40_state_validate(nv40);
- if (nv40->dirty & NV40_NEW_FB)
- so_emit(nv40->nvws, nv40->so_framebuffer);
-
if (nv40->dirty_samplers || (nv40->dirty & NV40_NEW_FRAGPROG)) {
nv40_fragtex_bind(nv40);