anv: fix push constant subgroup_id location

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 7c76125db2 ("anv: use 2 different buffers for surfaces/samplers in descriptor sets")
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25814>
(cherry picked from commit 3716bd704f)
This commit is contained in:
Lionel Landwerlin 2024-04-24 09:59:26 +03:00 committed by Eric Engestrom
parent c00fd82705
commit a0d2b531e0
2 changed files with 9 additions and 7 deletions

View file

@ -1524,7 +1524,7 @@
"description": "anv: fix push constant subgroup_id location",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "7c76125db25db9bdf5521baf7c848ccd4bd37b5f",
"notes": null

View file

@ -3390,6 +3390,12 @@ struct anv_push_constants {
*/
uint32_t surfaces_base_offset;
/* Robust access pushed registers. */
uint64_t push_reg_mask[MESA_SHADER_STAGES];
/** Ray query globals (RT_DISPATCH_GLOBALS) */
uint64_t ray_query_globals;
union {
struct {
/** Dynamic MSAA value */
@ -3410,16 +3416,12 @@ struct anv_push_constants {
*
* This is never set by software but is implicitly filled out when
* uploading the push constants for compute shaders.
*
* This *MUST* be the last field of the anv_push_constants structure.
*/
uint32_t subgroup_id;
} cs;
};
/* Robust access pushed registers. */
uint64_t push_reg_mask[MESA_SHADER_STAGES];
/** Ray query globals (RT_DISPATCH_GLOBALS) */
uint64_t ray_query_globals;
};
struct anv_surface_state {