diff options
| author | Eric Anholt <[email protected]> | 2018-07-30 12:55:31 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2018-07-30 14:29:01 -0700 |
| commit | 3a8550ad06ecac6f4aac53807e416fc045cd871d (patch) | |
| tree | 55e3821205a4a37bf418318a2dcd13adef5820b9 /src/gallium | |
| parent | 6237c6404941e81ce5bde4dd350fad64564ba67b (diff) | |
v3d: Rename primitives to prims in the XML to match CLIF names.
This makes us match up with the V3D HW team's names a bit more.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/v3d/v3dx_draw.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/v3d/v3dx_rcl.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/v3d/v3dx_draw.c b/src/gallium/drivers/v3d/v3dx_draw.c index af079bd0d5a..03762e529df 100644 --- a/src/gallium/drivers/v3d/v3dx_draw.c +++ b/src/gallium/drivers/v3d/v3dx_draw.c @@ -521,7 +521,7 @@ v3d_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) #endif if (info->instance_count > 1) { - cl_emit(&job->bcl, INDEXED_INSTANCED_PRIMITIVE_LIST, prim) { + cl_emit(&job->bcl, INDEXED_INSTANCED_PRIM_LIST, prim) { prim.index_type = ffs(info->index_size) - 1; #if V3D_VERSION >= 40 prim.index_offset = offset; @@ -537,7 +537,7 @@ v3d_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) prim.instance_length = info->count; } } else { - cl_emit(&job->bcl, INDEXED_PRIMITIVE_LIST, prim) { + cl_emit(&job->bcl, INDEXED_PRIM_LIST, prim) { prim.index_type = ffs(info->index_size) - 1; prim.length = info->count; #if V3D_VERSION >= 40 @@ -558,14 +558,14 @@ v3d_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) pipe_resource_reference(&prsc, NULL); } else { if (info->instance_count > 1) { - cl_emit(&job->bcl, VERTEX_ARRAY_INSTANCED_PRIMITIVES, prim) { + cl_emit(&job->bcl, VERTEX_ARRAY_INSTANCED_PRIMS, prim) { prim.mode = info->mode | prim_tf_enable; prim.index_of_first_vertex = info->start; prim.number_of_instances = info->instance_count; prim.instance_length = info->count; } } else { - cl_emit(&job->bcl, VERTEX_ARRAY_PRIMITIVES, prim) { + cl_emit(&job->bcl, VERTEX_ARRAY_PRIMS, prim) { prim.mode = info->mode | prim_tf_enable; prim.length = info->count; prim.index_of_first_vertex = info->start; diff --git a/src/gallium/drivers/v3d/v3dx_rcl.c b/src/gallium/drivers/v3d/v3dx_rcl.c index ae7daf9375e..c6aac7ebbc7 100644 --- a/src/gallium/drivers/v3d/v3dx_rcl.c +++ b/src/gallium/drivers/v3d/v3dx_rcl.c @@ -417,7 +417,7 @@ v3d_rcl_emit_generic_per_tile_list(struct v3d_job *job, int last_cbuf) /* The binner starts out writing tiles assuming that the initial mode * is triangles, so make sure that's the case. */ - cl_emit(cl, PRIMITIVE_LIST_FORMAT, fmt) { + cl_emit(cl, PRIM_LIST_FORMAT, fmt) { fmt.primitive_type = LIST_TRIANGLES; } |