Module: Mesa Branch: main Commit: 440adf79702684efd927ecf09deb4adb27ba51eb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=440adf79702684efd927ecf09deb4adb27ba51eb
Author: Faith Ekstrand <[email protected]> Date: Tue Nov 14 12:59:59 2023 -0600 nak: Properly prefix nak_xfb_info Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26197> --- src/nouveau/compiler/nak.h | 4 ++-- src/nouveau/compiler/nak_nir.c | 6 +++--- src/nouveau/compiler/nak_private.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nouveau/compiler/nak.h b/src/nouveau/compiler/nak.h index 70c808d6be1..20fe928cadf 100644 --- a/src/nouveau/compiler/nak.h +++ b/src/nouveau/compiler/nak.h @@ -63,7 +63,7 @@ enum PACKED nak_ts_prims { NAK_TS_PRIMS_TRIANGLES_CCW = 3, }; -struct nvk_xfb_info { +struct nak_xfb_info { uint32_t stride[4]; uint8_t stream[4]; uint8_t attr_count[4]; @@ -112,7 +112,7 @@ struct nak_shader_info { uint8_t clip_enable; uint8_t cull_enable; - struct nvk_xfb_info xfb; + struct nak_xfb_info xfb; /** Shader header for 3D stages */ uint32_t hdr[32]; diff --git a/src/nouveau/compiler/nak_nir.c b/src/nouveau/compiler/nak_nir.c index a336adf7613..fd01a46481e 100644 --- a/src/nouveau/compiler/nak_nir.c +++ b/src/nouveau/compiler/nak_nir.c @@ -522,13 +522,13 @@ nak_nir_lower_varyings(nir_shader *nir, nir_variable_mode modes) return progress; } -struct nvk_xfb_info +struct nak_xfb_info nak_xfb_from_nir(const struct nir_xfb_info *nir_xfb) { if (nir_xfb == NULL) - return (struct nvk_xfb_info) { }; + return (struct nak_xfb_info) { }; - struct nvk_xfb_info nak_xfb = { }; + struct nak_xfb_info nak_xfb = { }; u_foreach_bit(b, nir_xfb->buffers_written) { nak_xfb.stride[b] = nir_xfb->buffers[b].stride; diff --git a/src/nouveau/compiler/nak_private.h b/src/nouveau/compiler/nak_private.h index 7da483964f4..b81b2eaef81 100644 --- a/src/nouveau/compiler/nak_private.h +++ b/src/nouveau/compiler/nak_private.h @@ -111,7 +111,7 @@ nak_nir_has_one_subgroup(const nir_shader *nir) return wg_sz <= 32; } -struct nvk_xfb_info +struct nak_xfb_info nak_xfb_from_nir(const struct nir_xfb_info *nir_xfb); struct nak_io_addr_offset {
