pan/va: Don't use staging index as a sideband

It would cause us to get incorrect disassembly when the syntax is flipped.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15182>
This commit is contained in:
Alyssa Rosenzweig 2022-02-25 16:26:57 -05:00 committed by Marge Bot
parent 49a4cc6af8
commit a58807fa95
1 changed files with 6 additions and 7 deletions

View File

@ -142,12 +142,16 @@ class Dest:
self.name = name
class Staging:
def __init__(self, read = False, write = False, index = 0, count = 0, flags = True, name = ""):
def __init__(self, read = False, write = False, count = 0, flags = True, name = ""):
self.name = name
self.read = read
self.write = write
self.count = count
self.flags = flags
self.start = 40
if write and not flags:
self.start = 16
# For compatibility
self.absneg = False
@ -158,13 +162,8 @@ class Staging:
self.lane = False
self.size = 32
assert(index < 2)
self.start = 40 if index == 0 else 16
if not flags:
self.encoded_flags = 0
elif index > 0:
self.encoded_flags = 0xC0
else:
self.encoded_flags = (0x80 if write else 0) | (0x40 if read else 0)
@ -236,7 +235,7 @@ def build_staging(i, el):
count = int(el.attrib.get('count', '0'))
flags = xmlbool(el.attrib.get('flags', 'true'))
return Staging(r, w, i, count, flags, el.text or '')
return Staging(r, w, count, flags, el.text or '')
def build_modifier(el):
name = el.attrib['name']