AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "pvr: Make pvr_cmd_pack() macro clearly internal"

Browse Source 
This reverts commit 27c57b8650.

The driver doesn't always pack or emit words directly. In some
cases it might be desirable to store the struct equivalent for the
control word and emit/pack at a later stage. Thus reverting to
expose pvr_cmd_pack().
One such use case is in the following commit.

Signed-off-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com>
Reviewed-by: Rajnesh Kanwal <rajnesh.kanwal@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18124>
This commit is contained in:
Karmjit Mahil
2022-08-04 14:00:57 +01:00
parent d8f41f8d55
commit 7f39dbffd5
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/imagination/vulkan/pvr_csb.h
+3 -7
View File
@@ -129,11 +129,7 @@ VkResult pvr_csb_emit_terminate(struct pvr_csb *csb);
#define PVRX(x) ROGUE_##x
#define pvr_cmd_length(x) PVRX(x##_length)
#define pvr_cmd_header(x) PVRX(x##_header)
/* This helper is internal to this header. It should only be used as part of
* the pvr_csb_*() macros below.
*/
#define __pvr_cmd_pack(x) PVRX(x##_pack)
#define pvr_cmd_pack(x) PVRX(x##_pack)
/**
* \brief Packs a command/state into one or more dwords and stores them in the
@@ -152,7 +148,7 @@ VkResult pvr_csb_emit_terminate(struct pvr_csb *csb);
__builtin_expect(_loop_terminate != NULL, 1); \
({ \
STATIC_ASSERT(sizeof(*(_dst)) == pvr_cmd_length(cmd) * 4); \
__pvr_cmd_pack(cmd)((_dst), &name); \
pvr_cmd_pack(cmd)((_dst), &name); \
_loop_terminate = NULL; \
}))
@@ -192,7 +188,7 @@ VkResult pvr_csb_emit_terminate(struct pvr_csb *csb);
*_dst = pvr_csb_alloc_dwords(csb, pvr_cmd_length(cmd)); \
__builtin_expect(_dst != NULL, 1); \
({ \
__pvr_cmd_pack(cmd)(_dst, &name); \
pvr_cmd_pack(cmd)(_dst, &name); \
_dst = NULL; \
}))