mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

anv: avoid requirement to put flush_data as first field 

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29057>
This commit is contained in:
Lionel Landwerlin 2024-04-28 12:39:56 +03:00 committed by Marge Bot
parent ae6d20815a
commit 63c4d24f7d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/vulkan/anv_private.h
View File

@ -6046,9 +6046,6 @@ void anv_astc_emu_process(struct anv_cmd_buffer *cmd_buffer,
* (vkQueueBeginDebugUtilsLabelEXT/vkQueueEndDebugUtilsLabelEXT)
*/
struct anv_utrace_submit {
/* Needs to be the first field */
struct intel_ds_flush_data ds;
/* Batch stuff to implement of copy of timestamps recorded in another
* buffer.
*/
@ -6056,6 +6053,9 @@ struct anv_utrace_submit {
struct anv_batch batch;
struct util_dynarray batch_bos;
/* structure used by the perfetto glue */
struct intel_ds_flush_data ds;
/* Stream for temporary allocations */
struct anv_state_stream dynamic_state_stream;
struct anv_state_stream general_state_stream;

6
src/intel/vulkan/anv_utrace.c
View File

@ -78,7 +78,8 @@ anv_utrace_delete_submit(struct u_trace_context *utctx, void *submit_data)
{
struct anv_device *device =
container_of(utctx, struct anv_device, ds.trace_context);
struct anv_utrace_submit *submit = submit_data;
struct anv_utrace_submit *submit =
container_of(submit_data, struct anv_utrace_submit, ds);
intel_ds_flush_data_fini(&submit->ds);
@ -441,7 +442,8 @@ anv_utrace_read_ts(struct u_trace_context *utctx,
struct anv_device *device =
container_of(utctx, struct anv_device, ds.trace_context);
struct anv_bo *bo = timestamps;
struct anv_utrace_submit *submit = flush_data;
struct anv_utrace_submit *submit =
container_of(flush_data, struct anv_utrace_submit, ds);
/* Only need to stall on results for the first entry: */
if (idx == 0) {