Module: Mesa Branch: main Commit: 2fbedd442a32a4dd609ee73842a0dae48a737b01 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fbedd442a32a4dd609ee73842a0dae48a737b01
Author: Jesse Natalie <[email protected]> Date: Thu Apr 13 14:02:58 2023 -0700 util: Delete Offset() macro from u_memory.h Reviewed-by: Giancarlo Devich <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22494> --- src/gallium/drivers/llvmpipe/lp_state_setup.c | 2 +- src/mesa/state_tracker/st_draw_hw_select.c | 2 +- src/util/u_memory.h | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/lp_state_setup.c b/src/gallium/drivers/llvmpipe/lp_state_setup.c index 3b2438fab04..a4900e6d714 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_setup.c +++ b/src/gallium/drivers/llvmpipe/lp_state_setup.c @@ -773,7 +773,7 @@ lp_make_setup_variant_key(const struct llvmpipe_context *lp, key->pixel_center_half = lp->rasterizer->half_pixel_center; key->multisample = lp->rasterizer->multisample; key->twoside = lp->rasterizer->light_twoside; - key->size = Offset(struct lp_setup_variant_key, inputs[key->num_inputs]); + key->size = offsetof(struct lp_setup_variant_key, inputs[key->num_inputs]); key->color_slot = lp->color_slot[0]; key->bcolor_slot = lp->bcolor_slot[0]; diff --git a/src/mesa/state_tracker/st_draw_hw_select.c b/src/mesa/state_tracker/st_draw_hw_select.c index e802d2bbfb0..d7849ae9de3 100644 --- a/src/mesa/state_tracker/st_draw_hw_select.c +++ b/src/mesa/state_tracker/st_draw_hw_select.c @@ -61,7 +61,7 @@ struct geometry_constant { #define set_uniform_location(var, field, packed) \ do { \ - unsigned offset = Offset(struct geometry_constant, field); \ + unsigned offset = offsetof(struct geometry_constant, field); \ var->data.driver_location = offset >> (packed ? 2 : 4); \ var->data.location_frac = (offset >> 2) & 0x3; \ } while (0) diff --git a/src/util/u_memory.h b/src/util/u_memory.h index bc28cf44026..925659225f7 100644 --- a/src/util/u_memory.h +++ b/src/util/u_memory.h @@ -83,12 +83,6 @@ mem_dup(const void *src, size_t size) return dup; } - -/** - * Offset of a field in a struct, in bytes. - */ -#define Offset(TYPE, MEMBER) ((uintptr_t)&(((TYPE *)NULL)->MEMBER)) - /* TODO: this could be different on non-x86 architectures. */ #define CACHE_LINE_SIZE 64
