mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

asahi: unify naming for COUNTS structs 

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29247>
This commit is contained in:
Alyssa Rosenzweig 2024-04-22 19:51:56 -04:00
parent a173c2e38c
commit e5637f44b8
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/asahi/genxml/cmdbuf.xml
View File

@ -386,10 +386,11 @@
<struct name="Counts" size="4">
<field name="Unknown 0" size="1" start="0" type="hex" default="0"/>
<field name="Uniforms" size="3" start="1" type="uint" modifier="groups(64)"/>
<field name="Texture states" size="5" start="4" type="uint" modifier="groups(8)"/>
<field name="Sampler states" size="3" start="9" type="Sampler states"/>
<field name="Preshader GPRs" size="4" start="12" type="uint" modifier="groups(16)"/>
<field name="Uniform register count" size="3" start="1" type="uint" modifier="groups(64)"/>
<field name="Texture state register count" size="5" start="4" type="uint" modifier="groups(8)"/>
<field name="Sampler state register count" size="3" start="9" type="Sampler states"/>
<field name="Preshader register count" size="4" start="12" type="uint" modifier="groups(16)"/>
<field name="CF binding count" size="7" start="16" type="uint"/>
<!-- Only for fragment shaders -->
<field name="Unknown" size="16" start="16" type="hex"/>

8
src/gallium/drivers/asahi/agx_state.c
View File

@ -3217,10 +3217,10 @@ agx_build_bg_eot(struct agx_batch *batch, bool store, bool partial_render)
struct asahi_bg_eot ret = {.usc = t.gpu};
agx_pack(&ret.counts, COUNTS, cfg) {
cfg.uniforms = shader->info.push_count;
cfg.preshader_gprs = shader->info.nr_preamble_gprs;
cfg.texture_states = nr_tex;
cfg.sampler_states =
cfg.uniform_register_count = shader->info.push_count;
cfg.preshader_register_count = shader->info.nr_preamble_gprs;
cfg.texture_state_register_count = nr_tex;
cfg.sampler_state_register_count =
agx_translate_sampler_state_count(needs_sampler ? 1 : 0, false);
if (!store)