fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-14 04:30:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvc0: s/INLIN_RING/IMMED_RING

Browse source
This commit is contained in:
Christoph Bumiller 2010-12-19 22:49:50 +01:00
parent 608b3c4432
commit 9f2cf89957
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/nvc0/nvc0_push.c
View file

@ -261,7 +261,7 @@ nvc0_push_vbo(struct nvc0_context *nvc0, const struct pipe_draw_info *info)
assert(0);
break;
}
INLIN_RING(ctx.chan, RING_3D(VERTEX_END_GL), 0);
IMMED_RING(ctx.chan, RING_3D(VERTEX_END_GL), 0);
ctx.prim |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
}

4
src/gallium/drivers/nvc0/nvc0_push2.c
View file

@ -161,7 +161,7 @@ emit_edgeflag(struct push_context *ctx, boolean enabled)
{
struct nouveau_channel *chan = ctx->nvc0->screen->base.channel;
INLIN_RING(chan, RING_3D(EDGEFLAG_ENABLE), enabled);
IMMED_RING(chan, RING_3D(EDGEFLAG_ENABLE), enabled);
}
static void
@ -322,7 +322,7 @@ nvc0_push_vbo2(struct nvc0_context *nvc0, const struct pipe_draw_info *info)
emit_elt32(&ctx, info->start, info->count);
break;
}
INLIN_RING(nvc0->screen->base.channel, RING_3D(VERTEX_END_GL), 0);
IMMED_RING(nvc0->screen->base.channel, RING_3D(VERTEX_END_GL), 0);
prim |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
}

2
src/gallium/drivers/nvc0/nvc0_state_validate.c
View file

@ -249,7 +249,7 @@ nvc0_validate_clip(struct nvc0_context *nvc0)
BEGIN_RING(chan, RING_3D(VP_CLIP_DISTANCE_ENABLE), 1);
OUT_RING (chan, (1 << nvc0->clip.nr) - 1);
} else {
INLIN_RING(chan, RING_3D(VP_CLIP_DISTANCE_ENABLE), 0);
IMMED_RING(chan, RING_3D(VP_CLIP_DISTANCE_ENABLE), 0);
}
}

12
src/gallium/drivers/nvc0/nvc0_vbo.c
View file

@ -172,13 +172,13 @@ nvc0_vertex_arrays_validate(struct nvc0_context *nvc0)
if (unlikely(ve->pipe.instance_divisor)) {
if (!(nvc0->state.instance_bits & (1 << i))) {
INLIN_RING(chan, RING_3D(VERTEX_ARRAY_PER_INSTANCE(i)), 1);
IMMED_RING(chan, RING_3D(VERTEX_ARRAY_PER_INSTANCE(i)), 1);
}
BEGIN_RING(chan, RING_3D(VERTEX_ARRAY_DIVISOR(i)), 1);
OUT_RING (chan, ve->pipe.instance_divisor);
} else
if (unlikely(nvc0->state.instance_bits & (1 << i))) {
INLIN_RING(chan, RING_3D(VERTEX_ARRAY_PER_INSTANCE(i)), 0);
IMMED_RING(chan, RING_3D(VERTEX_ARRAY_PER_INSTANCE(i)), 0);
}
nvc0_bufctx_add_resident(nvc0, NVC0_BUFCTX_VERTEX, res, NOUVEAU_BO_RD);
@ -308,7 +308,7 @@ nvc0_draw_arrays(struct nvc0_context *nvc0,
BEGIN_RING(chan, RING_3D(VERTEX_BUFFER_FIRST), 2);
OUT_RING (chan, start);
OUT_RING (chan, count);
INLIN_RING(chan, RING_3D(VERTEX_END_GL), 0);
IMMED_RING(chan, RING_3D(VERTEX_END_GL), 0);
prim |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
}
@ -450,7 +450,7 @@ nvc0_draw_elements(struct nvc0_context *nvc0, boolean shorten,
OUT_RING (chan, index_size);
OUT_RING (chan, start);
OUT_RING (chan, count);
INLIN_RING(chan, RING_3D(VERTEX_END_GL), 0);
IMMED_RING(chan, RING_3D(VERTEX_END_GL), 0);
mode |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
}
@ -481,7 +481,7 @@ nvc0_draw_elements(struct nvc0_context *nvc0, boolean shorten,
assert(0);
return;
}
INLIN_RING(chan, RING_3D(VERTEX_END_GL), 0);
IMMED_RING(chan, RING_3D(VERTEX_END_GL), 0);
prim |= NVC0_3D_VERTEX_BEGIN_GL_INSTANCE_NEXT;
}
@ -540,7 +540,7 @@ nvc0_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
if (info->restart_index > 65535)
shorten = FALSE;
} else {
INLIN_RING(chan, RING_3D(PRIM_RESTART_ENABLE), 0);
IMMED_RING(chan, RING_3D(PRIM_RESTART_ENABLE), 0);
}
nvc0->state.prim_restart = info->primitive_restart;
} else

2
src/gallium/drivers/nvc0/nvc0_winsys.h
View file

@ -82,7 +82,7 @@ BEGIN_RING_1I(struct nouveau_channel *chan, uint32_t mthd, unsigned size)
/* inline-data */
static INLINE void
INLIN_RING(struct nouveau_channel *chan, uint32_t mthd, unsigned data)
IMMED_RING(struct nouveau_channel *chan, uint32_t mthd, unsigned data)
{
WAIT_RING(chan, 1);
OUT_RING (chan, (0x8 << 28) | (data << 16) | mthd);