From 3ff4768692bc47e3ea0fcbcd0b747034b24ce893 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Fri, 24 Nov 2023 12:20:44 -0800 Subject: [PATCH] d3d12: Fix multidimensional array ordering Apparently my C multimensional array syntax was rusty. Fixes: a6740ee7 ("d3d12: Fix indexing of local_reference_state") Part-of: (cherry picked from commit 1924cdc2898b0a14a8afd13db3a06dab9e1d032e) --- .pick_status.json | 2 +- src/gallium/drivers/d3d12/d3d12_bufmgr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6f00101..15f8be3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -84,7 +84,7 @@ "description": "d3d12: Fix multidimensional array ordering", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a6740ee7a4de17ce05fa10c872d6a6f08b39b77c", "notes": null diff --git a/src/gallium/drivers/d3d12/d3d12_bufmgr.h b/src/gallium/drivers/d3d12/d3d12_bufmgr.h index ee70fa6..78f716f 100644 --- a/src/gallium/drivers/d3d12/d3d12_bufmgr.h +++ b/src/gallium/drivers/d3d12/d3d12_bufmgr.h @@ -71,7 +71,7 @@ struct d3d12_bo { uint8_t local_reference_mask[16]; d3d12_context_state_table_entry local_context_states[16]; - uint8_t local_reference_state[8][16]; + uint8_t local_reference_state[16][8]; }; struct d3d12_buffer { -- 2.7.4