nvc0: fix resource unmap after vertex push
This commit is contained in:
@@ -201,7 +201,6 @@ void
|
||||
nvc0_push_vbo(struct nvc0_context *nvc0, const struct pipe_draw_info *info)
|
||||
{
|
||||
struct push_context ctx;
|
||||
struct pipe_transfer *transfer = NULL;
|
||||
unsigned i, index_size;
|
||||
unsigned inst = info->instance_count;
|
||||
|
||||
@@ -267,12 +266,8 @@ nvc0_push_vbo(struct nvc0_context *nvc0, const struct pipe_draw_info *info)
|
||||
}
|
||||
|
||||
if (info->indexed)
|
||||
pipe_buffer_unmap(&nvc0->pipe, transfer);
|
||||
nvc0_resource_unmap(nvc0_resource(nvc0->idxbuf.buffer));
|
||||
|
||||
for (i = 0; i < nvc0->num_vtxbufs; ++i) {
|
||||
struct nvc0_resource *res = nvc0_resource(nvc0->vtxbuf[i].buffer);
|
||||
|
||||
if (res->bo)
|
||||
nouveau_bo_unmap(res->bo);
|
||||
}
|
||||
for (i = 0; i < nvc0->num_vtxbufs; ++i)
|
||||
nvc0_resource_unmap(nvc0_resource(nvc0->vtxbuf[i].buffer));
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
|
||||
#if 0 /* not used, kept for now to compare with util/translate */
|
||||
|
||||
#include "pipe/p_context.h"
|
||||
#include "pipe/p_state.h"
|
||||
#include "util/u_inlines.h"
|
||||
@@ -327,3 +329,5 @@ nvc0_push_vbo2(struct nvc0_context *nvc0, const struct pipe_draw_info *info)
|
||||
prim |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@@ -102,8 +102,7 @@ nvc0_resource_map_offset(struct nvc0_context *nvc0,
|
||||
static INLINE void
|
||||
nvc0_resource_unmap(struct nvc0_resource *res)
|
||||
{
|
||||
if (res->domain != 0 && 0)
|
||||
nouveau_bo_unmap(res->bo);
|
||||
/* no-op */
|
||||
}
|
||||
|
||||
#define NVC0_TILE_DIM_SHIFT(m, d) (((m) >> (d * 4)) & 0xf)
|
||||
|
||||
Reference in New Issue
Block a user