From 868377e4c7bc16bbd6271ac1184fa188af0b31ad Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 15 Sep 2025 16:03:16 -0700 Subject: [PATCH] brw: Delete program_string_id from brw program keys This is strictly a GL thing. iris can manage it in its own program keys without polluting the compiler with stuff nobody else cares about. We can also drop a lot of padding that was introduced in commit a18835a9ca455a228d8666c21838a27a8fb2eb1c which doesn't appear to be necessary. Reviewed-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/iris/iris_program.c | 1 - src/intel/compiler/brw/brw_compiler.h | 10 +++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index 8615035822f..0a6a2a4346f 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -66,7 +66,6 @@ vue_layout(bool separate_shader) .prefix.limit_trig_input_range = \ screen->driconf.limit_trig_input_range #define BRW_KEY_INIT(base_key, _vue_layout) \ - .base.program_string_id = (base_key).program_string_id, \ .base.limit_trig_input_range = (base_key).limit_trig_input_range, \ .base.vue_layout = _vue_layout diff --git a/src/intel/compiler/brw/brw_compiler.h b/src/intel/compiler/brw/brw_compiler.h index 4e5b9b234b1..d5fda73d1eb 100644 --- a/src/intel/compiler/brw/brw_compiler.h +++ b/src/intel/compiler/brw/brw_compiler.h @@ -249,8 +249,6 @@ enum brw_robustness_flags { }; struct brw_base_prog_key { - unsigned program_string_id; - /** Multiview mask * * Used to compute the number of position slots in the VUE @@ -270,7 +268,7 @@ struct brw_base_prog_key { */ bool limit_trig_input_range:1; - uint64_t padding:58; + uint32_t padding:26; }; /** @@ -332,7 +330,7 @@ struct brw_vs_prog_key { */ bool no_vf_slot_compaction : 1; - uint64_t padding : 62; + uint32_t padding:30; }; /** The program key for Tessellation Control Shaders. */ @@ -464,7 +462,7 @@ struct brw_cs_prog_key { */ bool lower_unaligned_dispatch:1; - uint64_t padding:63; + uint32_t padding:31; }; struct brw_bs_prog_key { @@ -475,8 +473,6 @@ struct brw_bs_prog_key { * shader. */ uint32_t pipeline_ray_flags; - - uint32_t padding; }; /* brw_any_prog_key is any of the keys that map to an API stage */