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

v3d: Rename primitives to prims in the XML to match CLIF names.

Browse source 
This makes us match up with the V3D HW team's names a bit more.
This commit is contained in:
Eric Anholt 2018-07-30 12:55:31 -07:00
parent 6237c64049
commit 3a8550ad06
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/broadcom/cle/v3d_packet_v33.xml
View file

@ -426,7 +426,7 @@
<packet code="31" name="Transform Feedback Flush and Count"/>
<packet code="32" name="Indexed Primitive List" cl="B" max_ver="33">
<packet code="32" name="Indexed Prim List" cl="B" max_ver="33">
<field name="Minimum index" size="32" start="104" type="uint"/>
<field name="Enable Primitive Restarts" size="1" start="103" type="bool"/>
<field name="Maximum index" size="31" start="72" type="uint"/>
@ -442,7 +442,7 @@
<field name="mode" size="5" start="0" type="Primitive"/>
</packet>
<packet code="32" name="Indexed Primitive List" cl="B" min_ver="41">
<packet code="32" name="Indexed Prim List" cl="B" min_ver="41">
<field name="Index Offset" size="32" start="40" type="uint"/>
<field name="Enable Primitive Restarts" size="1" start="39" type="bool"/>
@ -457,7 +457,7 @@
<field name="mode" size="6" start="0" type="Primitive"/>
</packet>
<packet code="34" name="Indexed Instanced Primitive List" cl="B" max_ver="33">
<packet code="34" name="Indexed Instanced Prim List" cl="B" max_ver="33">
<field name="Enable Primitive Restarts" size="1" start="135" type="bool"/>
<field name="Maximum index" size="31" start="104" type="uint"/>
<field name="Address of Indices List" size="32" start="72" type="address"/>
@ -473,7 +473,7 @@
<field name="mode" size="5" start="0" type="Primitive"/>
</packet>
<packet code="34" name="Indexed Instanced Primitive List" cl="B" min_ver="41">
<packet code="34" name="Indexed Instanced Prim List" cl="B" min_ver="41">
<field name="Index Offset" size="32" start="72" type="uint"/>
<field name="Number of Instances" size="32" start="40" type="uint"/>
<field name="Enable Primitive Restarts" size="1" start="39" type="bool"/>
@ -488,14 +488,14 @@
<field name="mode" size="6" start="0" type="Primitive"/>
</packet>
<packet code="36" name="Vertex Array Primitives" cl="B">
<packet code="36" name="Vertex Array Prims" cl="B">
<field name="Index of First Vertex" size="32" start="40" type="uint"/>
<field name="Length" size="32" start="8" type="uint"/>
<field name="mode" size="8" start="0" type="Primitive"/>
</packet>
<packet code="38" name="Vertex Array Instanced Primitives" cl="B">
<packet code="38" name="Vertex Array Instanced Prims" cl="B">
<field name="Index of First Vertex" size="32" start="72" type="uint"/>
<field name="Number of Instances" size="32" start="40" type="uint"/>
<field name="Instance Length" size="32" start="8" type="uint"/>
@ -514,7 +514,7 @@
<field name="Size" size="32" start="32" type="uint"/>
</packet>
<packet code="56" name="Primitive List Format">
<packet code="56" name="Prim List Format">
<field name="tri strip or fan" size="1" start="7" type="bool"/>
<field name="primitive type" size="6" start="0" type="uint">
<value name="List Points" value="0"/>

8
src/gallium/drivers/v3d/v3dx_draw.c
View file

@ -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;

2
src/gallium/drivers/v3d/v3dx_rcl.c
View file

@ -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;
}