AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nv50: make a working check for user memory vertex/index buffers

Browse Source
This commit is contained in:
Christoph Bumiller
2010-04-20 22:01:37 +02:00
parent 03e97e7f8d
commit 3a5b82f335
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/nv50/nv50_resource.h
+8
View File
@@ -4,6 +4,8 @@
#include "util/u_transfer.h"
#include "nouveau/nouveau_winsys.h"
struct pipe_resource;
struct nouveau_bo;
@@ -49,6 +51,12 @@ struct nv50_resource *nv50_resource(struct pipe_resource *resource)
return (struct nv50_resource *)resource;
}
/* is resource mapped into the GPU's address space (i.e. VRAM or GART) ? */
static INLINE boolean
nv50_resource_mapped_by_gpu(struct pipe_resource *resource)
{
return nv50_resource(resource)->bo->handle;
}
void
nv50_init_resource_functions(struct pipe_context *pcontext);
src/gallium/drivers/nv50/nv50_vbo.c
+2 -2
View File
@@ -412,7 +412,7 @@ nv50_draw_elements_instanced(struct pipe_context *pipe,
BEGIN_RING(chan, tesla, NV50TCL_VB_ELEMENT_BASE, 1);
OUT_RING (chan, indexBias);
if (!(indexBuffer->bind & PIPE_BIND_INDEX_BUFFER) || indexSize == 1) {
if (!nv50_resource_mapped_by_gpu(indexBuffer) || indexSize == 1) {
nv50_draw_elements_inline(pipe, indexBuffer, indexSize,
mode, start, count, startInstance,
instanceCount);
@@ -565,7 +565,7 @@ nv50_vbo_validate(struct nv50_context *nv50)
for (i = 0; i < nv50->vtxbuf_nr; i++) {
if (nv50->vtxbuf[i].stride &&
!(nv50->vtxbuf[i].buffer->bind & PIPE_BIND_VERTEX_BUFFER))
!nv50_resource_mapped_by_gpu(nv50->vtxbuf[i].buffer))
nv50->vbo_fifo = 0xffff;
}