diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-01-01 06:09:59 -0500 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2015-09-05 23:03:52 -0400 |
| commit | 75e34d1df8b0ab56e5e658b8ef90ff6057ec954e (patch) | |
| tree | 606456f6a1e18248fc2f9d43afa92a2705bad315 /src/gallium/drivers/nouveau/nv50/nv50_vbo.c | |
| parent | 5165e464f225cd1b0f61e0da0758052b9b9ff518 (diff) | |
| download | external_mesa3d-75e34d1df8b0ab56e5e658b8ef90ff6057ec954e.zip external_mesa3d-75e34d1df8b0ab56e5e658b8ef90ff6057ec954e.tar.gz external_mesa3d-75e34d1df8b0ab56e5e658b8ef90ff6057ec954e.tar.bz2 | |
nv50: fix drawing from tfb, direct-to-pushbuf submits
The stride was being set to 0, which is illegal (and also non-sensical).
Also we must wait for the buffer to become available for reading as
otherwise a wrong value may be prefetched. Since we must wait for the
buffer anyways, and it's mapped and in GART, we may as well avoid the
annoyance of the indirect pushbuf submit.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Cc: mesa-stable@lists.freedesktop.org
Diffstat (limited to 'src/gallium/drivers/nouveau/nv50/nv50_vbo.c')
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_vbo.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_vbo.c b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c index 6324726..ca51ea1 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_vbo.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_vbo.c @@ -736,9 +736,8 @@ nva0_draw_stream_output(struct nv50_context *nv50, BEGIN_NV04(push, NVA0_3D(DRAW_TFB_BASE), 1); PUSH_DATA (push, 0); BEGIN_NV04(push, NVA0_3D(DRAW_TFB_STRIDE), 1); - PUSH_DATA (push, 0); - BEGIN_NV04(push, NVA0_3D(DRAW_TFB_BYTES), 1); - nv50_query_pushbuf_submit(push, so->pq, 0x4); + PUSH_DATA (push, so->stride); + nv50_query_pushbuf_submit(push, NVA0_3D_DRAW_TFB_BYTES, so->pq, 0x4); BEGIN_NV04(push, NV50_3D(VERTEX_END_GL), 1); PUSH_DATA (push, 0); |