OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asahi: Use GenXML for main bind fragment

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11730>
This commit is contained in:
Alyssa Rosenzweig
2021-07-05 19:56:22 -04:00
committed by Marge Bot
parent 19bb9d278f
commit b8bc5ed297
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/asahi/lib/cmdbuf.xml
View File

@@ -390,7 +390,10 @@
specified in 32-bit word units. Intepretation per-shader stage. specified in 32-bit word units. Intepretation per-shader stage.
Probably actually 17 bytes. --> Probably actually 17 bytes. -->
<struct name="Bind pipeline" size="16"> <struct name="Bind pipeline" size="16">
<field name="Tag" size="32" start="0:0" type="hex" default="0x4000002e"/> <field name="Tag" size="32" start="0:0" type="hex" default="0x4000002e">
<value name="AGX_BIND_PIPELINE_VERTEX" value="0x4000002e"/>
<value name="AGX_BIND_PIPELINE_FRAGMENT" value="0x800000"/>
</field>
<field name="Unk 1" size="4" start="1:0" type="hex" default="0x2"/> <field name="Unk 1" size="4" start="1:0" type="hex" default="0x2"/>
<field name="Sampler count" start="1:4" size="5" type="uint"/> <field name="Sampler count" start="1:4" size="5" type="uint"/>
<field name="Texture count" start="1:9" size="3" type="uint"/> <field name="Texture count" start="1:9" size="3" type="uint"/>

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

@@ -1281,18 +1281,18 @@ agx_build_store_pipeline(struct agx_context *ctx, uint32_t code,
static uint64_t static uint64_t
demo_launch_fragment(struct agx_context *ctx, struct agx_pool *pool, uint32_t pipeline, uint32_t varyings, unsigned input_count) demo_launch_fragment(struct agx_context *ctx, struct agx_pool *pool, uint32_t pipeline, uint32_t varyings, unsigned input_count)
{ {
unsigned sampler_count = ctx->stage[PIPE_SHADER_FRAGMENT].texture_count; struct agx_ptr t = agx_pool_alloc_aligned(pool, AGX_BIND_PIPELINE_LENGTH, 64);
unsigned texture_count = ctx->stage[PIPE_SHADER_FRAGMENT].texture_count;
uint32_t unk[] = { agx_pack(t.cpu, BIND_PIPELINE, cfg) {
0x800000, cfg.tag = AGX_BIND_PIPELINE_FRAGMENT;
0x1002 | (texture_count << 9) | (sampler_count << 4) | (input_count << 16), // TODO: xmlify cfg.sampler_count = ctx->stage[PIPE_SHADER_FRAGMENT].texture_count;
pipeline, cfg.texture_count = ctx->stage[PIPE_SHADER_FRAGMENT].texture_count;
varyings, cfg.input_count = input_count;
0x0, cfg.pipeline = pipeline;
cfg.fs_varyings = varyings;
}; };
return agx_pool_upload(pool, unk, sizeof(unk)); return t.gpu;
} }
static uint64_t static uint64_t
@@ -1416,6 +1416,7 @@ agx_encode_state(struct agx_context *ctx, uint8_t *out,
bool is_lines) bool is_lines)
{ {
agx_pack(out, BIND_PIPELINE, cfg) { agx_pack(out, BIND_PIPELINE, cfg) {
cfg.tag = AGX_BIND_PIPELINE_VERTEX;
cfg.pipeline = pipeline_vertex; cfg.pipeline = pipeline_vertex;
cfg.vs_output_count_1 = ctx->vs->info.varyings.nr_slots; cfg.vs_output_count_1 = ctx->vs->info.varyings.nr_slots;
cfg.vs_output_count_2 = ctx->vs->info.varyings.nr_slots; cfg.vs_output_count_2 = ctx->vs->info.varyings.nr_slots;