diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-09-02 05:18:14 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-09-02 05:18:14 +0000 |
commit | 5f66494d31f735486b8222ecfa0a0c9046e92543 (patch) | |
tree | f699ac8d7f6d510c30bded04f96a1209344f6a47 /lib/mesa/src/broadcom/qpu/qpu_pack.c | |
parent | 17a5b543e3479aaa779cc68345c46d437edd05d8 (diff) |
Import Mesa 22.1.7
Diffstat (limited to 'lib/mesa/src/broadcom/qpu/qpu_pack.c')
-rw-r--r-- | lib/mesa/src/broadcom/qpu/qpu_pack.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/mesa/src/broadcom/qpu/qpu_pack.c b/lib/mesa/src/broadcom/qpu/qpu_pack.c index eee1e9f95..94629aff4 100644 --- a/lib/mesa/src/broadcom/qpu/qpu_pack.c +++ b/lib/mesa/src/broadcom/qpu/qpu_pack.c @@ -256,13 +256,6 @@ v3d_qpu_sig_pack(const struct v3d_device_info *devinfo, return false; } -static inline unsigned -fui( float f ) -{ - union {float f; unsigned ui;} fi; - fi.f = f; - return fi.ui; -} static const uint32_t small_immediates[] = { 0, 1, 2, 3, @@ -425,8 +418,13 @@ v3d_qpu_flags_pack(const struct v3d_device_info *devinfo, if (flags_present & MUF) *packed_cond |= cond->muf - V3D_QPU_UF_ANDZ + 4; - if (flags_present & AC) - *packed_cond |= (cond->ac - V3D_QPU_COND_IFA) << 2; + if (flags_present & AC) { + if (*packed_cond & (1 << 6)) + *packed_cond |= cond->ac - V3D_QPU_COND_IFA; + else + *packed_cond |= (cond->ac - + V3D_QPU_COND_IFA) << 2; + } if (flags_present & MC) { if (*packed_cond & (1 << 6)) |