diff --git a/src/imagination/.clang-format b/src/imagination/.clang-format index 06387556813..30ed663d997 100644 --- a/src/imagination/.clang-format +++ b/src/imagination/.clang-format @@ -223,7 +223,6 @@ ForEachMacros: [ 'list_for_each_entry_safe_rev', 'list_pair_for_each_entry', 'pvr_csb_emit', - 'pvr_csb_emit_merge', 'pvr_csb_pack', 'nir_foreach_block', 'nir_foreach_block_safe', diff --git a/src/imagination/vulkan/pvr_csb.h b/src/imagination/vulkan/pvr_csb.h index b3308679a07..513582851a8 100644 --- a/src/imagination/vulkan/pvr_csb.h +++ b/src/imagination/vulkan/pvr_csb.h @@ -262,25 +262,6 @@ void pvr_csb_dump(const struct pvr_csb *csb, #define pvr_cmd_unpack(x) ROGUE_##x##_unpack #define pvr_cmd_enum_to_str(x) ROGUE_##x##_to_str -/** - * \brief Merges dwords0 and dwords1 arrays and stores the result into the - * control stream pointed by the csb object. - * - * \param[in] csb Control Stream Builder object. - * \param[in] dwords0 Dwords0 array. - * \param[in] dwords1 Dwords1 array. - */ -#define pvr_csb_emit_merge(csb, dwords0, dwords1) \ - do { \ - uint32_t *dw; \ - STATIC_ASSERT(ARRAY_SIZE(dwords0) == ARRAY_SIZE(dwords1)); \ - dw = pvr_csb_alloc_dwords(csb, ARRAY_SIZE(dwords0)); \ - if (!dw) \ - break; \ - for (uint32_t i = 0; i < ARRAY_SIZE(dwords0); i++) \ - dw[i] = (dwords0)[i] | (dwords1)[i]; \ - } while (0) - /** * \brief Packs a command/state into one or more dwords and stores them into * the control stream pointed by the csb object. @@ -302,22 +283,6 @@ void pvr_csb_dump(const struct pvr_csb *csb, _dst = NULL; \ })) -/** - * \brief Stores dword into the control stream pointed by the csb object. - * - * \param[in] csb Control Stream Builder object. - * \param[in] dword Dword to store into control stream. - */ -#define pvr_csb_emit_dword(csb, dword) \ - do { \ - uint32_t *dw; \ - STATIC_ASSERT(sizeof(dword) == sizeof(uint32_t)); \ - dw = pvr_csb_alloc_dwords(csb, 1U); \ - if (!dw) \ - break; \ - *dw = dword; \ - } while (0) - /** * \name Raw command/state buffer helpers. * These provide functionality to read or write control/state words from/to a