summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/drivers/nvc0/nvc0_push.c11
-rw-r--r--src/gallium/drivers/nvc0/nvc0_push2.c4
-rw-r--r--src/gallium/drivers/nvc0/nvc0_resource.h3
3 files changed, 8 insertions, 10 deletions
diff --git a/src/gallium/drivers/nvc0/nvc0_push.c b/src/gallium/drivers/nvc0/nvc0_push.c
index 779a477599..ccbb776447 100644
--- a/src/gallium/drivers/nvc0/nvc0_push.c
+++ b/src/gallium/drivers/nvc0/nvc0_push.c
@@ -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));
}
diff --git a/src/gallium/drivers/nvc0/nvc0_push2.c b/src/gallium/drivers/nvc0/nvc0_push2.c
index 1f4ba256c1..6f51600558 100644
--- a/src/gallium/drivers/nvc0/nvc0_push2.c
+++ b/src/gallium/drivers/nvc0/nvc0_push2.c
@@ -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
diff --git a/src/gallium/drivers/nvc0/nvc0_resource.h b/src/gallium/drivers/nvc0/nvc0_resource.h
index 0ffb9e8fa6..d33e2f0ed0 100644
--- a/src/gallium/drivers/nvc0/nvc0_resource.h
+++ b/src/gallium/drivers/nvc0/nvc0_resource.h
@@ -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)