From f6e4f956689719c77e8d22951f4b1f6ed5548da4 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Tue, 20 Feb 2018 23:17:31 -0500 Subject: nv50,nvc0: fix clear buffer acceleration Two things were off: - valid range was not updated, which could affect waiting for future maps - fencing was done manually instead of using the *_resource_validate helper, which resulted in a missed dirty buffer flag being set Fixes: KHR-GL45.direct_state_access.buffers_clear Signed-off-by: Ilia Mirkin Tested-by: Karol Herbst --- src/gallium/drivers/nouveau/nv50/nv50_surface.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/gallium/drivers/nouveau/nv50') diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c index 908c534b92e..037e14a4d60 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c @@ -672,10 +672,7 @@ nv50_clear_buffer_push(struct pipe_context *pipe, count -= nr; } - if (buf->mm) { - nouveau_fence_ref(nv50->screen->base.fence.current, &buf->fence); - nouveau_fence_ref(nv50->screen->base.fence.current, &buf->fence_wr); - } + nv50_resource_validate(buf, NOUVEAU_BO_WR); nouveau_bufctx_reset(nv50->bufctx, 0); } @@ -727,6 +724,8 @@ nv50_clear_buffer(struct pipe_context *pipe, return; } + util_range_add(&buf->valid_buffer_range, offset, offset + size); + assert(size % data_size == 0); if (offset & 0xff) { @@ -747,10 +746,10 @@ nv50_clear_buffer(struct pipe_context *pipe, assert(width > 0); BEGIN_NV04(push, NV50_3D(CLEAR_COLOR(0)), 4); - PUSH_DATAf(push, color.f[0]); - PUSH_DATAf(push, color.f[1]); - PUSH_DATAf(push, color.f[2]); - PUSH_DATAf(push, color.f[3]); + PUSH_DATA (push, color.ui[0]); + PUSH_DATA (push, color.ui[1]); + PUSH_DATA (push, color.ui[2]); + PUSH_DATA (push, color.ui[3]); if (nouveau_pushbuf_space(push, 64, 1, 0)) return; @@ -796,10 +795,7 @@ nv50_clear_buffer(struct pipe_context *pipe, BEGIN_NV04(push, NV50_3D(COND_MODE), 1); PUSH_DATA (push, nv50->cond_condmode); - if (buf->mm) { - nouveau_fence_ref(nv50->screen->base.fence.current, &buf->fence); - nouveau_fence_ref(nv50->screen->base.fence.current, &buf->fence_wr); - } + nv50_resource_validate(buf, NOUVEAU_BO_WR); if (width * height != elements) { offset += width * height * data_size; -- cgit v1.2.3