diff options
| author | George Sapountzis <gsapountzis@gmail.com> | 2010-03-21 15:05:21 +0200 |
|---|---|---|
| committer | George Sapountzis <gsapountzis@gmail.com> | 2010-03-21 15:05:21 +0200 |
| commit | f2fa4a188833792684568972b963ca2373202de2 (patch) | |
| tree | abf2444fe3480bdca663647973a80d4ac5a0696c /src/gallium/drivers/nv50/nv50_state_validate.c | |
| parent | 5d524cce9c4fcc18ed977801d59ba7bb911020db (diff) | |
| parent | 1afda5303d2eaf9581fa7c9eec872a0022ff35b5 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_state_validate.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_state_validate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv50/nv50_state_validate.c b/src/gallium/drivers/nv50/nv50_state_validate.c index 63d73b5ce8..b7e355283c 100644 --- a/src/gallium/drivers/nv50/nv50_state_validate.c +++ b/src/gallium/drivers/nv50/nv50_state_validate.c @@ -435,7 +435,7 @@ nv50_state_validate(struct nv50_context *nv50, unsigned wait_dwords) so_emit_reloc_markers(chan, nv50->state.hw[3]); /* vp */ so_emit_reloc_markers(chan, nv50->state.hw[4]); /* fp */ so_emit_reloc_markers(chan, nv50->state.hw[17]); /* vb */ - so_emit_reloc_markers(chan, nv50->screen->static_init); + nv50_screen_relocs(nv50->screen); /* No idea.. */ BEGIN_RING(chan, tesla, 0x142c, 1); |