pan/mdg: Fix definition of UBO unpack

Needed to link the disassembler separate from the rest of the compiler,
as in out-of-tree pandecode builds. Which I haven't done for Midgard in
well over a year, enough time for this to bit rot.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14185>
This commit is contained in:
Alyssa Rosenzweig
2021-12-13 22:25:46 -05:00
committed by Marge Bot
parent a026d2d11c
commit d92e353a11
2 changed files with 16 additions and 13 deletions

View File

@@ -377,10 +377,24 @@ midgard_ldst_comp(unsigned reg, unsigned component, unsigned size)
return component;
}
/* Packs/unpacks a ubo index immediate */
/* Packs/unpacks a ubo index immediate. The unpack must be defined here so it
* can be used with the disassembler, which need not be linked with the main
* compiler.
*/
void midgard_pack_ubo_index_imm(midgard_load_store_word *word, unsigned index);
unsigned midgard_unpack_ubo_index_imm(midgard_load_store_word word);
static inline unsigned
midgard_unpack_ubo_index_imm(midgard_load_store_word word)
{
unsigned ubo = word.arg_comp |
(word.arg_reg << 2) |
(word.bitsize_toggle << 5) |
(word.index_format << 6);
return ubo;
}
/* Packs/unpacks varying parameters.
* FIXME: IMPORTANT: We currently handle varying mode weirdly, by passing all

View File

@@ -53,17 +53,6 @@ midgard_pack_ubo_index_imm(midgard_load_store_word *word, unsigned index)
word->index_format = (index >> 6) & 0x3;
}
unsigned
midgard_unpack_ubo_index_imm(midgard_load_store_word word)
{
unsigned ubo = word.arg_comp |
(word.arg_reg << 2) |
(word.bitsize_toggle << 5) |
(word.index_format << 6);
return ubo;
}
void midgard_pack_varying_params(midgard_load_store_word *word, midgard_varying_params p)
{
/* Currently these parameters are not supported. */