Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2025-02-16 21:58:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

m1n1.agx.cmdqueue: Rename Timestamp to TimeStamp

Browse source 
This avoids a conflict with Construct

Signed-off-by: Asahi Lina <lina@asahilina.net>
This commit is contained in:
Asahi Lina 2022-08-31 11:11:42 +09:00
parent 8a222a1346
commit 7889f056f9
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
proxyclient/m1n1/agx/render.py
View file

@ -385,9 +385,9 @@ class GPURenderer:
wc_3d.unk_buf2.unk_0 = 0
wc_3d.unk_buf2.unk_8 = 0
wc_3d.unk_buf2.unk_10 = 1
wc_3d.ts1 = Timestamp(0)
wc_3d.ts2 = Timestamp(self.ts3d_1._addr)
wc_3d.ts3 = Timestamp(self.ts3d_2._addr)
wc_3d.ts1 = TimeStamp(0)
wc_3d.ts2 = TimeStamp(self.ts3d_1._addr)
wc_3d.ts3 = TimeStamp(self.ts3d_2._addr)
wc_3d.unk_914 = 0
wc_3d.unk_918 = 0
wc_3d.unk_920 = 0
@ -700,9 +700,9 @@ class GPURenderer:
wc_ta.unk_3e8 = bytes(0x74)
wc_ta.unk_594 = WorkCommand0_UnkBuf()
wc_ta.ts1 = Timestamp(0)
wc_ta.ts2 = Timestamp(self.tsta_1._addr)
wc_ta.ts3 = Timestamp(self.tsta_2._addr)
wc_ta.ts1 = TimeStamp(0)
wc_ta.ts2 = TimeStamp(self.tsta_1._addr)
wc_ta.ts3 = TimeStamp(self.tsta_2._addr)
wc_ta.unk_5c4 = 0
wc_ta.unk_5c8 = 0
wc_ta.unk_5cc = 0

12
proxyclient/m1n1/fw/agx/cmdqueue.py
View file

@ -239,9 +239,9 @@ class WorkCommand3D(ConstructClass):
"struct_6" / Start3DStruct6,
"struct_7" / Start3DStruct7,
"unk_buf2" / WorkCommand1_UnkBuf2,
"ts1" / Timestamp,
"ts2" / Timestamp,
"ts3" / Timestamp,
"ts1" / TimeStamp,
"ts2" / TimeStamp,
"ts3" / TimeStamp,
"unk_914" / Int32ul,
"unk_918" / Int64ul,
"unk_920" / Int32ul,
@ -318,9 +318,9 @@ class WorkCommandTA(ConstructClass):
"unk_594" / WorkCommand0_UnkBuf,
"ts1" / Timestamp,
"ts2" / Timestamp,
"ts3" / Timestamp,
"ts1" / TimeStamp,
"ts2" / TimeStamp,
"ts3" / TimeStamp,
"unk_5c4" / Int32ul,
"unk_5c8" / Int32ul,

8
proxyclient/m1n1/fw/agx/microsequence.py
View file

@ -22,7 +22,7 @@ import textwrap
__all__ = []
class Timestamp(ConstructValueClass):
class TimeStamp(ConstructValueClass):
subcon = Int64ul
def __init__(self, value=0):
@ -721,11 +721,11 @@ class TimestampCmd(ConstructClass):
"unk_3" / Int8ul, # Sometimes 0x80
# all these pointers point to 0xfa0... addresses. Might be where the timestamp should be writen?
"ts0_addr" / Int64ul,
"ts0" / ROPointer(this.ts0_addr, Timestamp),
"ts0" / ROPointer(this.ts0_addr, TimeStamp),
"ts1_addr" / Int64ul,
"ts1" / ROPointer(this.ts1_addr, Timestamp),
"ts1" / ROPointer(this.ts1_addr, TimeStamp),
"ts2_addr" / Int64ul,
"ts2" / ROPointer(this.ts2_addr, Timestamp),
"ts2" / ROPointer(this.ts2_addr, TimeStamp),
"cmdqueue_ptr" / Int64ul,
"unk_24" / Int64ul,
Ver("13.0 beta4", "unkptr_2c_0" / Int64ul),