From 1b7d7ebbab78063478a1b3b243cf3c56bed664f6 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 17 Mar 2022 12:15:37 -0400 Subject: [PATCH] pan/bi: Allow branch_offset on BLEND Required to model BLEND accurately on Valhall, where it encodes a special relative branch... Midgard style! Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/bifrost/compiler.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/panfrost/bifrost/compiler.h b/src/panfrost/bifrost/compiler.h index 62d86bd..f60a400 100644 --- a/src/panfrost/bifrost/compiler.h +++ b/src/panfrost/bifrost/compiler.h @@ -424,8 +424,6 @@ typedef struct { uint32_t fill; uint32_t index; uint32_t attribute_index; - int32_t byte_offset; - int32_t branch_offset; struct { uint32_t varying_index; @@ -437,6 +435,14 @@ typedef struct { struct { uint32_t sr_count; uint32_t sr_count_2; + + union { + /* Atomics effectively require all three */ + int32_t byte_offset; + + /* BLEND requires all three */ + int32_t branch_offset; + }; }; }; -- 2.7.4