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

panfrost: Set defaults for deprecated DCD fields

Browse source 
There are always set to true. Don't pollute the driver code with them, make
their existence a local detail to pre-Valhall XML and that's it.

Functional change: "four components per vertex" is now set on vertex job DCDs.
This should be a no-op.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15123>
This commit is contained in:
Alyssa Rosenzweig 2022-02-08 13:49:40 -05:00 • committed by Marge Bot
parent bd3d7e33b6
commit 1eb3dbafdb
9 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/panfrost/pan_cmdstream.c
View file

@ -2754,10 +2754,6 @@ panfrost_draw_emit_tiler(struct panfrost_batch *batch,
section = pan_section_ptr(job, TILER_JOB, DRAW);
pan_pack(section, DRAW, cfg) {
cfg.four_components_per_vertex = true;
cfg.draw_descriptor_is_64b = true;
cfg.front_face_ccw = rast->front_ccw;
/*
* From the Gallium documentation,
* pipe_rasterizer_state::cull_face "indicates which faces of
@ -2768,6 +2764,7 @@ panfrost_draw_emit_tiler(struct panfrost_batch *batch,
*/
cfg.cull_front_face = polygon && (rast->cull_face & PIPE_FACE_FRONT);
cfg.cull_back_face = polygon && (rast->cull_face & PIPE_FACE_BACK);
cfg.front_face_ccw = rast->front_ccw;
cfg.position = pos;
cfg.state = batch->rsd[PIPE_SHADER_FRAGMENT];
cfg.attributes = batch->attribs[PIPE_SHADER_FRAGMENT];

4
src/panfrost/lib/genxml/v4.xml
View file

@ -524,8 +524,8 @@
</struct>
<struct name="Draw" size="30" align="64">
<field name="Four Components Per Vertex" size="1" start="0:0" type="bool"/>
<field name="Draw Descriptor Is 64b" size="1" start="0:1" type="bool"/>
<field name="Four Components Per Vertex" size="1" start="0:0" type="bool" default="true"/>
<field name="Draw Descriptor Is 64b" size="1" start="0:1" type="bool" default="true"/>
<field name="Texture Descriptor Is 64b" size="1" start="0:2" type="bool" default="true"/>
<field name="Occlusion query" size="2" start="0:3" type="Occlusion Mode" default="Disabled"/>
<field name="Front face CCW" size="1" start="0:5" type="bool"/>

4
src/panfrost/lib/genxml/v5.xml
View file

@ -545,8 +545,8 @@
</struct>
<struct name="Draw" size="30" align="64">
<field name="Four Components Per Vertex" size="1" start="0:0" type="bool"/>
<field name="Draw Descriptor Is 64b" size="1" start="0:1" type="bool"/>
<field name="Four Components Per Vertex" size="1" start="0:0" type="bool" default="true"/>
<field name="Draw Descriptor Is 64b" size="1" start="0:1" type="bool" default="true"/>
<field name="Texture Descriptor Is 64b" size="1" start="0:2" type="bool" default="true"/>
<field name="Occlusion query" size="2" start="0:3" type="Occlusion Mode" default="Disabled"/>
<field name="Front face CCW" size="1" start="0:5" type="bool"/>

4
src/panfrost/lib/genxml/v6.xml
View file

@ -601,8 +601,8 @@
</struct>
<struct name="Draw" size="32" align="64">
<field name="Four Components Per Vertex" size="1" start="0:0" type="bool"/>
<field name="Draw Descriptor Is 64b" size="1" start="0:1" type="bool"/>
<field name="Four Components Per Vertex" size="1" start="0:0" type="bool" default="true"/>
<field name="Draw Descriptor Is 64b" size="1" start="0:1" type="bool" default="true"/>
<field name="Occlusion query" size="2" start="0:3" type="Occlusion Mode" default="Disabled"/>
<field name="Front face CCW" size="1" start="0:5" type="bool"/>
<field name="Cull front face" size="1" start="0:6" type="bool"/>

4
src/panfrost/lib/genxml/v7.xml
View file

@ -644,8 +644,8 @@
</struct>
<struct name="Draw" size="32" align="64">
<field name="Four Components Per Vertex" size="1" start="0:0" type="bool"/>
<field name="Draw Descriptor Is 64b" size="1" start="0:1" type="bool"/>
<field name="Four Components Per Vertex" size="1" start="0:0" type="bool" default="true"/>
<field name="Draw Descriptor Is 64b" size="1" start="0:1" type="bool" default="true"/>
<field name="Occlusion query" size="2" start="0:3" type="Occlusion Mode" default="Disabled"/>
<field name="Front face CCW" size="1" start="0:5" type="bool"/>
<field name="Cull front face" size="1" start="0:6" type="bool"/>

4
src/panfrost/lib/pan_blitter.c
View file

@ -955,8 +955,6 @@ pan_preload_emit_dcd(struct pan_pool *pool,
void *out, bool always_write)
{
pan_pack(out, DRAW, cfg) {
cfg.four_components_per_vertex = true;
cfg.draw_descriptor_is_64b = true;
cfg.thread_storage = tsd;
cfg.state = rsd;
@ -999,8 +997,6 @@ pan_blit_emit_dcd(struct pan_pool *pool,
void *out)
{
pan_pack(out, DRAW, cfg) {
cfg.four_components_per_vertex = true;
cfg.draw_descriptor_is_64b = true;
cfg.thread_storage = tsd;
cfg.state = rsd;

2
src/panfrost/vulkan/panvk_vX_cs.c
View file

@ -451,8 +451,6 @@ panvk_emit_tiler_dcd(const struct panvk_pipeline *pipeline,
void *dcd)
{
pan_pack(dcd, DRAW, cfg) {
cfg.four_components_per_vertex = true;
cfg.draw_descriptor_is_64b = true;
cfg.front_face_ccw = pipeline->rast.front_ccw;
cfg.cull_front_face = pipeline->rast.cull_front_face;
cfg.cull_back_face = pipeline->rast.cull_back_face;

2
src/panfrost/vulkan/panvk_vX_meta_clear.c
View file

@ -282,8 +282,6 @@ panvk_meta_clear_attachment_emit_dcd(struct pan_pool *pool,
void *out)
{
pan_pack(out, DRAW, cfg) {
cfg.four_components_per_vertex = true;
cfg.draw_descriptor_is_64b = true;
cfg.thread_storage = tsd;
cfg.state = rsd;
cfg.push_uniforms = push_constants;

2
src/panfrost/vulkan/panvk_vX_meta_copy.c
View file

@ -128,8 +128,6 @@ panvk_meta_copy_emit_dcd(struct pan_pool *pool,
void *out)
{
pan_pack(out, DRAW, cfg) {
cfg.four_components_per_vertex = true;
cfg.draw_descriptor_is_64b = true;
cfg.thread_storage = tsd;
cfg.state = rsd;
cfg.uniform_buffers = ubos;