fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-03 12:08:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

pan/bi: Add missing message types

Browse source 
Names are not canonical but that's ok.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7081>
This commit is contained in:
Alyssa Rosenzweig 2020-10-02 13:57:59 -04:00
parent d2fac19999
commit 77a4e39100
4 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/panfrost/bifrost/bi_print_common.c
View file

@ -33,16 +33,21 @@ bi_clause_type_name(enum bifrost_clause_type T)
{
switch (T) {
case BIFROST_CLAUSE_NONE: return "";
case BIFROST_CLAUSE_LOAD_VARY: return "load_vary";
case BIFROST_CLAUSE_UBO: return "ubo";
case BIFROST_CLAUSE_VARYING: return "vary";
case BIFROST_CLAUSE_ATTRIBUTE: return "attr";
case BIFROST_CLAUSE_TEX: return "tex";
case BIFROST_CLAUSE_SSBO_LOAD: return "load";
case BIFROST_CLAUSE_SSBO_STORE: return "store";
case BIFROST_CLAUSE_VARTEX: return "vartex";
case BIFROST_CLAUSE_LOAD: return "load";
case BIFROST_CLAUSE_STORE: return "store";
case BIFROST_CLAUSE_ATOMIC: return "atomic";
case BIFROST_CLAUSE_BARRIER: return "barrier";
case BIFROST_CLAUSE_BLEND: return "blend";
case BIFROST_CLAUSE_FRAGZ: return "fragz";
case BIFROST_CLAUSE_TILE: return "tile";
case BIFROST_CLAUSE_Z_STENCIL: return "z_stencil";
case BIFROST_CLAUSE_ATEST: return "atest";
case BIFROST_CLAUSE_JOB: return "job";
case BIFROST_CLAUSE_64BIT: return "64";
default: return "??";
default: return "XXX reserved";
}
}

10
src/panfrost/bifrost/bi_schedule.c
View file

@ -53,24 +53,24 @@ bi_clause_type_for_ins(bi_instruction *ins)
case BI_LOAD_VAR:
if (bi_is_fragz(ins))
return BIFROST_CLAUSE_FRAGZ;
return BIFROST_CLAUSE_Z_STENCIL;
return BIFROST_CLAUSE_LOAD_VARY;
return BIFROST_CLAUSE_VARYING;
case BI_LOAD_UNIFORM:
case BI_LOAD_ATTR:
case BI_LOAD_VAR_ADDRESS:
return BIFROST_CLAUSE_UBO;
return BIFROST_CLAUSE_ATTRIBUTE;
case BI_TEX:
return BIFROST_CLAUSE_TEX;
case BI_LOAD:
return BIFROST_CLAUSE_SSBO_LOAD;
return BIFROST_CLAUSE_LOAD;
case BI_STORE:
case BI_STORE_VAR:
return BIFROST_CLAUSE_SSBO_STORE;
return BIFROST_CLAUSE_STORE;
case BI_BLEND:
return BIFROST_CLAUSE_BLEND;

16
src/panfrost/bifrost/bifrost.h
View file

@ -36,14 +36,20 @@ extern int bifrost_debug;
enum bifrost_clause_type {
BIFROST_CLAUSE_NONE = 0,
BIFROST_CLAUSE_LOAD_VARY = 1,
BIFROST_CLAUSE_UBO = 2,
BIFROST_CLAUSE_VARYING = 1,
BIFROST_CLAUSE_ATTRIBUTE = 2,
BIFROST_CLAUSE_TEX = 3,
BIFROST_CLAUSE_SSBO_LOAD = 5,
BIFROST_CLAUSE_SSBO_STORE = 6,
BIFROST_CLAUSE_VARTEX = 4,
BIFROST_CLAUSE_LOAD = 5,
BIFROST_CLAUSE_STORE = 6,
BIFROST_CLAUSE_ATOMIC = 7,
BIFROST_CLAUSE_BARRIER = 8,
BIFROST_CLAUSE_BLEND = 9,
BIFROST_CLAUSE_FRAGZ = 12,
BIFROST_CLAUSE_TILE = 10,
/* type 11 reserved */
BIFROST_CLAUSE_Z_STENCIL = 12,
BIFROST_CLAUSE_ATEST = 13,
BIFROST_CLAUSE_JOB = 14,
BIFROST_CLAUSE_64BIT = 15
};

6
src/panfrost/bifrost/test/bi_test_pack.c
View file

@ -126,7 +126,7 @@ bit_test_single(struct panfrost_device *dev,
}
clauses[0]->bundles[0].add = &ldubo;
clauses[0]->clause_type = BIFROST_CLAUSE_UBO;
clauses[0]->clause_type = BIFROST_CLAUSE_ATTRIBUTE;
if (fma)
clauses[1]->bundles[0].fma = ins;
@ -140,8 +140,8 @@ bit_test_single(struct panfrost_device *dev,
clauses[2]->bundles[0].add = &ldva;
clauses[3]->bundles[0].add = &st;
clauses[2]->clause_type = BIFROST_CLAUSE_UBO;
clauses[3]->clause_type = BIFROST_CLAUSE_SSBO_STORE;
clauses[2]->clause_type = BIFROST_CLAUSE_ATTRIBUTE;
clauses[3]->clause_type = BIFROST_CLAUSE_STORE;
panfrost_program prog;
bi_pack(ctx, &prog.compiled);