Attachment 83839 Details for Bug 64323 – hack/workaround by calim

[patch] hack/workaround by calim

workaround_calim.patch (text/plain), 1.80 KB, created by Emil Velikov on 2013-08-08 14:45:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emil Velikov

Created: 2013-08-08 14:45:34 UTC

Size: 1.80 KB

patch

obsolete

>diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c b/src/gallium/drivers/nouveau/nouveau_buffer.c
>index 02bc6f0..797d6dd 100644
>--- a/src/gallium/drivers/nouveau/nouveau_buffer.c
>+++ b/src/gallium/drivers/nouveau/nouveau_buffer.c
>@@ -205,6 +205,9 @@ nouveau_transfer_write(struct nouveau_context *nv, struct nouveau_transfer *tx,
>                   base, size / 4, (const uint32_t *)data);
>    else
>       nv->push_data(nv, buf->bo, buf->offset + base, buf->domain, size, data);
>+
>+   nouveau_fence_ref(nv->screen->fence.current, &buf->fence);
>+   nouveau_fence_ref(nv->screen->fence.current, &buf->fence_wr);
> }
> 
> 
>diff --git a/src/gallium/drivers/nv50/nv50_vbo.c b/src/gallium/drivers/nv50/nv50_vbo.c
>index db4e0cd..ca4790d 100644
>--- a/src/gallium/drivers/nv50/nv50_vbo.c
>+++ b/src/gallium/drivers/nv50/nv50_vbo.c
>@@ -577,7 +577,7 @@ nv50_draw_elements(struct nv50_context *nv50, boolean shorten,
>       nv50->state.index_bias = index_bias;
>    }
> 
>-   if (nv50->idxbuf.buffer) {
>+   if (nv50->idxbuf.buffer && 0) {
>       struct nv04_resource *buf = nv04_resource(nv50->idxbuf.buffer);
>       unsigned pb_start;
>       unsigned pb_bytes;
>@@ -627,9 +627,15 @@ nv50_draw_elements(struct nv50_context *nv50, boolean shorten,
> 
>          prim |= NV50_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
>       }
>+      nv50_resource_validate(buf, NOUVEAU_BO_RD);
>    } else {
>       const void *data = nv50->idxbuf.user_buffer;
> 
>+      if (nv50->idxbuf.buffer)
>+         data = nouveau_resource_map_offset(&nv50->base,
>+                                            nv04_resource(nv50->idxbuf.buffer),
>+                                            nv50->idxbuf.offset, NOUVEAU_BO_RD);
>+
>       while (instance_count--) {
>          BEGIN_NV04(push, NV50_3D(VERTEX_BEGIN_GL), 1);
>          PUSH_DATA (push, prim);

Actions: View | Splinter Review

Attachments on bug 64323: 81517 | 83839 | 89965 | 89968 | 90011 | 90056

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.