mirror of
https://github.com/open-goal/jak-project
synced 2026-09-06 19:21:00 -04:00
fix missing bitfield (#811)
This commit is contained in:
+1
-1
@@ -680,7 +680,7 @@
|
||||
(format stream-2 "ERROR: dma-list data pointer invalid~%")
|
||||
(set! end-condition 'error)
|
||||
)
|
||||
(when (logtest? #x3ff0000 current-tag)
|
||||
(when (logtest? (the-as dma-tag #x3ff0000) current-tag)
|
||||
(format stream-2 "ERROR: dma tag has data in reserved bits ~X~%")
|
||||
(set! end-condition 'error)
|
||||
)
|
||||
|
||||
+8
-2
@@ -25,7 +25,10 @@
|
||||
)
|
||||
(dotimes (s2-0 (the-as int (-> fp-data shader-cnt)))
|
||||
(cond
|
||||
((and eye-ctrl (= (logand -256 (-> shader texture-id)) #x1cf06f00))
|
||||
((and
|
||||
eye-ctrl
|
||||
(= (logand (the-as texture-id -256) (-> shader texture-id)) #x1cf06f00)
|
||||
)
|
||||
(adgif-shader-login shader)
|
||||
(let ((eye-tex-block (get-eye-block (-> eye-ctrl eye-slot) 0)))
|
||||
(set! (-> shader tex0 tbp0) eye-tex-block)
|
||||
@@ -46,7 +49,10 @@
|
||||
)
|
||||
)
|
||||
)
|
||||
((and eye-ctrl (= (logand -256 (-> shader texture-id)) #x1cf07000))
|
||||
((and
|
||||
eye-ctrl
|
||||
(= (logand (the-as texture-id -256) (-> shader texture-id)) #x1cf07000)
|
||||
)
|
||||
(adgif-shader-login shader)
|
||||
(let ((eye-tex-block-2 (get-eye-block (-> eye-ctrl eye-slot) 1)))
|
||||
(set! (-> shader tex0 tbp0) eye-tex-block-2)
|
||||
|
||||
+3
-1
@@ -589,7 +589,9 @@
|
||||
(table-data-start (-> bsp-hdr texture-remap-table))
|
||||
(table-data-ptr table-data-start)
|
||||
(mask1 (the-as uint #xfffffff8))
|
||||
(masked-tex-id (logand (the-as uint #xffffff00) tex-id))
|
||||
(masked-tex-id
|
||||
(logand (new 'static 'texture-id :index #xfff :page #xfff) tex-id)
|
||||
)
|
||||
(table-data-end (&+ table-data-ptr (* table-size 8)))
|
||||
)
|
||||
(label cfg-2)
|
||||
|
||||
Reference in New Issue
Block a user