mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 11:26:18 -04:00
[jak2] add vortex renderer (#2441)
Add the vortex renderer. The vortex texture isn't there yet (it uses the same texture as clouds), so it uses a checkerboard. But the colors/vertices seem right.
This commit is contained in:
water111
GitHub
parent
4f6b6e4c82
commit
976e08fe97
|
|
@ -38780,10 +38780,10 @@
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
;; (define-extern sort-vortex-data function)
|
;; (define-extern sort-vortex-data function)
|
||||||
;; (define-extern init-vortex-regs function)
|
(define-extern init-vortex-regs (function none))
|
||||||
;; (define-extern draw-large-polygon-vortex function)
|
;; (define-extern draw-large-polygon-vortex function)
|
||||||
;; (define-extern render-vortex-quad function)
|
(define-extern render-vortex-quad (function vortex-vertex dma-buffer vector none))
|
||||||
;; (define-extern update-vortex-data function)
|
(define-extern update-vortex-data (function float none))
|
||||||
(define-extern draw-vortex (function none))
|
(define-extern draw-vortex (function none))
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
|
||||||
|
|
@ -719,7 +719,10 @@
|
||||||
"ripple-execute-init",
|
"ripple-execute-init",
|
||||||
"ripple-apply-wave-table",
|
"ripple-apply-wave-table",
|
||||||
"ripple-matrix-scale",
|
"ripple-matrix-scale",
|
||||||
"(method 53 squid)"
|
"(method 53 squid)",
|
||||||
|
"init-vortex-regs",
|
||||||
|
"render-vortex-quad",
|
||||||
|
"draw-large-polygon-vortex"
|
||||||
],
|
],
|
||||||
|
|
||||||
"mips2c_jump_table_functions": {},
|
"mips2c_jump_table_functions": {},
|
||||||
|
|
|
||||||
|
|
@ -1696,5 +1696,6 @@
|
||||||
],
|
],
|
||||||
"mog2-course": [["L295", "uint64", true]],
|
"mog2-course": [["L295", "uint64", true]],
|
||||||
"jinx2-course": [["L306", "uint64", true]],
|
"jinx2-course": [["L306", "uint64", true]],
|
||||||
"grim2-course": [["L283", "uint64", true]]
|
"grim2-course": [["L283", "uint64", true]],
|
||||||
|
"vortex": [["L29", "vector"]]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11015,5 +11015,41 @@
|
||||||
[[68, 75], "a0", "dma-packet"],
|
[[68, 75], "a0", "dma-packet"],
|
||||||
[[79, 86], "a0", "(pointer uint32)"],
|
[[79, 86], "a0", "(pointer uint32)"],
|
||||||
[[87, 94], "a0", "(pointer vif-tag)"]
|
[[87, 94], "a0", "(pointer vif-tag)"]
|
||||||
|
],
|
||||||
|
"init-vortex-polys": [
|
||||||
|
[[34, 40], "t0", "(pointer float)"]
|
||||||
|
],
|
||||||
|
"draw-vortex": [
|
||||||
|
[[31, 38], "a0", "dma-packet"],
|
||||||
|
[[40, 47], "a0", "gs-gif-tag"],
|
||||||
|
[51, "a0", "(pointer gs-zbuf)"],
|
||||||
|
[53, "a0", "(pointer gs-reg64)"],
|
||||||
|
[55, "a0", "(pointer gs-test)"],
|
||||||
|
[57, "a0", "(pointer gs-reg64)"],
|
||||||
|
[59, "a0", "(pointer gs-rgbaq)"],
|
||||||
|
[61, "a0", "(pointer gs-reg64)"],
|
||||||
|
[70, "v1", "(pointer uint128)"],
|
||||||
|
[[75, 82], "a0", "vector4w"],
|
||||||
|
[[83, 89], "v1", "vector4w"],
|
||||||
|
[[93, 100], "a0", "dma-packet"],
|
||||||
|
[[102, 109], "a0", "gs-gif-tag"],
|
||||||
|
[125, "s2", "(pointer gs-tex0)"],
|
||||||
|
[127, "s2", "(pointer gs-reg64)"],
|
||||||
|
[129, "s2", "(pointer gs-tex1)"],
|
||||||
|
[131, "s2", "(pointer gs-reg64)"],
|
||||||
|
[132, "s2", "(pointer gs-clamp)"],
|
||||||
|
[134, "s2", "(pointer gs-reg64)"],
|
||||||
|
[136, "s2", "(pointer gs-alpha)"],
|
||||||
|
[138, "s2", "(pointer gs-reg64)"],
|
||||||
|
[139, "s2", "(pointer uint64)"],
|
||||||
|
[141, "s2", "(pointer gs-reg64)"],
|
||||||
|
[[154, 191], "s3", "dma-packet"],
|
||||||
|
[[192, 199], "a0", "dma-packet"],
|
||||||
|
[[201, 208], "a0", "gs-gif-tag"],
|
||||||
|
[212, "a0", "(pointer gs-alpha)"],
|
||||||
|
[214, "a0", "(pointer gs-reg64)"],
|
||||||
|
[216, "a0", "(pointer uint64)"],
|
||||||
|
[218, "a0", "(pointer gs-reg64)"],
|
||||||
|
[[227, 264], "s3", "dma-packet"]
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -435,7 +435,7 @@ std::vector<SpoolSubtitleRange> process_spool_subtitles(ObjectFileData& data,
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string write_spool_subtitles(
|
std::string write_spool_subtitles(
|
||||||
GameTextVersion version,
|
GameTextVersion,
|
||||||
const fs::path& image_out,
|
const fs::path& image_out,
|
||||||
const std::unordered_map<std::string, std::vector<SpoolSubtitleRange>>& data) {
|
const std::unordered_map<std::string, std::vector<SpoolSubtitleRange>>& data) {
|
||||||
// write!
|
// write!
|
||||||
|
|
@ -469,7 +469,7 @@ std::string write_spool_subtitles(
|
||||||
if (dump_images) {
|
if (dump_images) {
|
||||||
std::vector<u32> rgba_out;
|
std::vector<u32> rgba_out;
|
||||||
rgba_out.resize(msg.w * msg.h);
|
rgba_out.resize(msg.w * msg.h);
|
||||||
for (int px = 0; px < rgba_out.size(); ++px) {
|
for (int px = 0; px < (int)rgba_out.size(); ++px) {
|
||||||
int idx = px & 1 ? msg.data[px / 2] >> 4 : msg.data[px / 2] & 0xf;
|
int idx = px & 1 ? msg.data[px / 2] >> 4 : msg.data[px / 2] & 0xf;
|
||||||
rgba_out.at(px) = msg.palette[idx];
|
rgba_out.at(px) = msg.palette[idx];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,7 @@ set(RUNTIME_SOURCE
|
||||||
mips2c/jak2_functions/sparticle_launcher.cpp
|
mips2c/jak2_functions/sparticle_launcher.cpp
|
||||||
mips2c/jak2_functions/spatial_hash.cpp
|
mips2c/jak2_functions/spatial_hash.cpp
|
||||||
mips2c/jak2_functions/texture.cpp
|
mips2c/jak2_functions/texture.cpp
|
||||||
|
mips2c/jak2_functions/vortex.cpp
|
||||||
mips2c/jak2_functions/ocean.cpp
|
mips2c/jak2_functions/ocean.cpp
|
||||||
mips2c/jak2_functions/ocean_vu0.cpp
|
mips2c/jak2_functions/ocean_vu0.cpp
|
||||||
mips2c/jak2_functions/merc_blend_shape.cpp
|
mips2c/jak2_functions/merc_blend_shape.cpp
|
||||||
|
|
|
||||||
|
|
@ -726,6 +726,9 @@ void DirectRenderer::handle_ad(const u8* data,
|
||||||
ASSERT(render_state->version == GameVersion::Jak2); // hardcoded jak 2 scissor vals in handle
|
ASSERT(render_state->version == GameVersion::Jak2); // hardcoded jak 2 scissor vals in handle
|
||||||
handle_xyoffset(value);
|
handle_xyoffset(value);
|
||||||
break;
|
break;
|
||||||
|
case GsRegisterAddress::COLCLAMP:
|
||||||
|
ASSERT(value == 1);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
ASSERT_MSG(false, fmt::format("Address {} is not supported", register_address_name(addr)));
|
ASSERT_MSG(false, fmt::format("Address {} is not supported", register_address_name(addr)));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
362
game/mips2c/jak2_functions/vortex.cpp
Normal file
362
game/mips2c/jak2_functions/vortex.cpp
Normal file
|
|
@ -0,0 +1,362 @@
|
||||||
|
//--------------------------MIPS2C---------------------
|
||||||
|
// clang-format off
|
||||||
|
#include "game/mips2c/mips2c_private.h"
|
||||||
|
#include "game/kernel/jak2/kscheme.h"
|
||||||
|
#include "game/mips2c/jak2_functions/sky.h"
|
||||||
|
|
||||||
|
using ::jak2::intern_from_c;
|
||||||
|
namespace Mips2C::jak2 {
|
||||||
|
namespace init_vortex_regs {
|
||||||
|
struct Cache {
|
||||||
|
void* math_camera; // *math-camera*
|
||||||
|
void* sky_work; // *sky-work*
|
||||||
|
} cache;
|
||||||
|
|
||||||
|
u64 execute(void* ctxt) {
|
||||||
|
auto* c = (ExecutionContext*)ctxt;
|
||||||
|
c->copy_vfs_from_other(&sky_regs_vfs);
|
||||||
|
c->load_symbol2(v1, cache.math_camera); // lw v1, *math-camera*(s7)
|
||||||
|
c->load_symbol2(a0, cache.sky_work); // lw a0, *sky-work*(s7)
|
||||||
|
c->daddiu(a1, a0, 1008); // daddiu a1, a0, 1008
|
||||||
|
c->lwc1(f0, 908, v1); // lwc1 f0, 908(v1)
|
||||||
|
c->swc1(f0, 0, a1); // swc1 f0, 0(a1)
|
||||||
|
c->lwc1(f0, 128, v1); // lwc1 f0, 128(v1)
|
||||||
|
c->swc1(f0, 4, a1); // swc1 f0, 4(a1)
|
||||||
|
c->lwc1(f0, 124, v1); // lwc1 f0, 124(v1)
|
||||||
|
c->swc1(f0, 8, a1); // swc1 f0, 8(a1)
|
||||||
|
c->lui(a2, 17727); // lui a2, 17727
|
||||||
|
c->ori(a2, a2, 61440); // ori a2, a2, 61440
|
||||||
|
c->mtc1(f0, a2); // mtc1 f0, a2
|
||||||
|
c->swc1(f0, 12, a1); // swc1 f0, 12(a1)
|
||||||
|
c->lqc2(vf31, 572, v1); // lqc2 vf31, 572(v1)
|
||||||
|
c->lqc2(vf30, 588, v1); // lqc2 vf30, 588(v1)
|
||||||
|
c->lqc2(vf29, 604, v1); // lqc2 vf29, 604(v1)
|
||||||
|
c->lqc2(vf28, 620, v1); // lqc2 vf28, 620(v1)
|
||||||
|
c->lqc2(vf26, 796, v1); // lqc2 vf26, 796(v1)
|
||||||
|
c->lqc2(vf14, 780, v1); // lqc2 vf14, 780(v1)
|
||||||
|
c->lqc2(vf25, 812, v1); // lqc2 vf25, 812(v1)
|
||||||
|
c->lqc2(vf13, 1008, a0); // lqc2 vf13, 1008(a0)
|
||||||
|
c->lqc2(vf27, 992, a0); // lqc2 vf27, 992(a0)
|
||||||
|
c->vmove(DEST::xyzw, vf24, vf0); // vmove.xyzw vf24, vf0
|
||||||
|
c->mov128_gpr_vf(v1, vf24); // qmfc2.i v1, vf24
|
||||||
|
c->gprs[v0].du64[0] = 0; // or v0, r0, r0
|
||||||
|
//jr ra // jr ra
|
||||||
|
c->daddu(sp, sp, r0); // daddu sp, sp, r0
|
||||||
|
goto end_of_function; // return
|
||||||
|
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
end_of_function:
|
||||||
|
sky_regs_vfs.copy_vfs_from_other(c);
|
||||||
|
return c->gprs[v0].du64[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
void link() {
|
||||||
|
cache.math_camera = intern_from_c("*math-camera*").c();
|
||||||
|
cache.sky_work = intern_from_c("*sky-work*").c();
|
||||||
|
gLinkedFunctionTable.reg("init-vortex-regs", execute, 128);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace init_vortex_regs
|
||||||
|
} // namespace Mips2C
|
||||||
|
|
||||||
|
//--------------------------MIPS2C---------------------
|
||||||
|
// clang-format off
|
||||||
|
#include "game/mips2c/mips2c_private.h"
|
||||||
|
#include "game/kernel/jak2/kscheme.h"
|
||||||
|
using ::jak2::intern_from_c;
|
||||||
|
namespace Mips2C::jak2 {
|
||||||
|
namespace draw_large_polygon_vortex {
|
||||||
|
struct Cache {
|
||||||
|
void* clip_polygon_against_negative_hyperplane; // clip-polygon-against-negative-hyperplane
|
||||||
|
void* clip_polygon_against_positive_hyperplane; // clip-polygon-against-positive-hyperplane
|
||||||
|
} cache;
|
||||||
|
|
||||||
|
u64 execute(void* ctxt) {
|
||||||
|
auto* c = (ExecutionContext*)ctxt;
|
||||||
|
bool bc = false;
|
||||||
|
u32 call_addr = 0;
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->daddiu(sp, sp, -8); // daddiu sp, sp, -8
|
||||||
|
c->mov64(t6, s7); // or t6, s7, r0
|
||||||
|
c->sd(ra, 0, sp); // sd ra, 0(sp)
|
||||||
|
c->load_symbol2(t9, cache.clip_polygon_against_positive_hyperplane);// lw t9, clip-polygon-against-positive-hyperplane(s7)
|
||||||
|
c->mov64(a2, t4); // or a2, t4, r0
|
||||||
|
c->mov64(a3, t5); // or a3, t5, r0
|
||||||
|
call_addr = c->gprs[t9].du32[0]; // function call:
|
||||||
|
c->daddu(t2, a2, r0); // daddu t2, a2, r0
|
||||||
|
// c->jalr(call_addr); // jalr ra, t9
|
||||||
|
clip_polygon_against_positive_hyperplane::execute(ctxt);
|
||||||
|
bc = c->sgpr64(t0) == 0; // beq t0, r0, L15
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
if (bc) {goto block_11;} // branch non-likely
|
||||||
|
|
||||||
|
c->mov64(a2, t5); // or a2, t5, r0
|
||||||
|
c->mov64(a3, t4); // or a3, t4, r0
|
||||||
|
call_addr = c->gprs[t9].du32[0]; // function call:
|
||||||
|
c->daddiu(t2, a2, 4); // daddiu t2, a2, 4
|
||||||
|
// c->jalr(call_addr); // jalr ra, t9
|
||||||
|
clip_polygon_against_positive_hyperplane::execute(ctxt);
|
||||||
|
bc = c->sgpr64(t0) == 0; // beq t0, r0, L15
|
||||||
|
c->load_symbol2(t9, cache.clip_polygon_against_negative_hyperplane);// lw t9, clip-polygon-against-negative-hyperplane(s7)
|
||||||
|
if (bc) {goto block_11;} // branch non-likely
|
||||||
|
|
||||||
|
c->mov64(a2, t4); // or a2, t4, r0
|
||||||
|
c->mov64(a3, t5); // or a3, t5, r0
|
||||||
|
call_addr = c->gprs[t9].du32[0]; // function call:
|
||||||
|
c->daddu(t2, a2, r0); // daddu t2, a2, r0
|
||||||
|
// c->jalr(call_addr); // jalr ra, t9
|
||||||
|
clip_polygon_against_negative_hyperplane::execute(ctxt);
|
||||||
|
bc = c->sgpr64(t0) == 0; // beq t0, r0, L15
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
if (bc) {goto block_11;} // branch non-likely
|
||||||
|
|
||||||
|
c->mov64(a2, t5); // or a2, t5, r0
|
||||||
|
c->mov64(a3, t4); // or a3, t4, r0
|
||||||
|
call_addr = c->gprs[t9].du32[0]; // function call:
|
||||||
|
c->daddiu(t2, a2, 4); // daddiu t2, a2, 4
|
||||||
|
// c->jalr(call_addr); // jalr ra, t9
|
||||||
|
clip_polygon_against_negative_hyperplane::execute(ctxt);
|
||||||
|
bc = c->sgpr64(t0) == 0; // beq t0, r0, L15
|
||||||
|
c->lw(a3, 4, a1); // lw a3, 4(a1)
|
||||||
|
if (bc) {goto block_11;} // branch non-likely
|
||||||
|
|
||||||
|
bc = c->sgpr64(t6) == c->sgpr64(s7); // beq t6, s7, L13
|
||||||
|
c->mov64(a2, t4); // or a2, t4, r0
|
||||||
|
if (bc) {goto block_8;} // branch non-likely
|
||||||
|
|
||||||
|
c->sqc2(vf27, 0, a3); // sqc2 vf27, 0(a3)
|
||||||
|
c->daddiu(a3, a3, 16); // daddiu a3, a3, 16
|
||||||
|
c->sw(t0, -16, a3); // sw t0, -16(a3)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
|
||||||
|
block_6:
|
||||||
|
c->lqc2(vf1, 0, a2); // lqc2 vf1, 0(a2)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->lqc2(vf2, 16, a2); // lqc2 vf2, 16(a2)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->lqc2(vf3, 32, a2); // lqc2 vf3, 32(a2)
|
||||||
|
c->vdiv(vf0, BC::w, vf1, BC::w); // vdiv Q, vf0.w, vf1.w
|
||||||
|
c->vmul(DEST::xyzw, vf1, vf1, vf26); // vmul.xyzw vf1, vf1, vf26
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vftoi0(DEST::xyzw, vf3, vf3); // vftoi0.xyzw vf3, vf3
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vadd(DEST::xyzw, vf2, vf2, vf24); // vadd.xyzw vf2, vf2, vf24
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vwaitq(); // vwaitq
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vmulq(DEST::xyz, vf1, vf1); // vmulq.xyz vf1, vf1, Q
|
||||||
|
c->sqc2(vf3, 16, a3); // sqc2 vf3, 16(a3)
|
||||||
|
c->vmulq(DEST::xyzw, vf2, vf2); // vmulq.xyzw vf2, vf2, Q
|
||||||
|
c->daddiu(a2, a2, 48); // daddiu a2, a2, 48
|
||||||
|
c->vadd(DEST::xyzw, vf1, vf1, vf25); // vadd.xyzw vf1, vf1, vf25
|
||||||
|
c->daddiu(a3, a3, 48); // daddiu a3, a3, 48
|
||||||
|
c->vmax_bc(DEST::z, BC::z, vf1, vf1, vf0); // vmaxz.z vf1, vf1, vf0
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vmini_bc(DEST::w, BC::z, vf1, vf1, vf13); // vminiz.w vf1, vf1, vf13
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vmax_bc(DEST::w, BC::y, vf1, vf1, vf13); // vmaxy.w vf1, vf1, vf13
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf2, -48, a3); // sqc2 vf2, -48(a3)
|
||||||
|
c->daddiu(t0, t0, -1); // daddiu t0, t0, -1
|
||||||
|
c->vftoi4(DEST::xyzw, vf1, vf1); // vftoi4.xyzw vf1, vf1
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
bc = c->sgpr64(t0) != 0; // bne t0, r0, L12
|
||||||
|
c->sqc2(vf1, -16, a3); // sqc2 vf1, -16(a3)
|
||||||
|
if (bc) {goto block_6;} // branch non-likely
|
||||||
|
|
||||||
|
c->sw(a3, 4, a1); // sw a3, 4(a1)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->ld(ra, 0, sp); // ld ra, 0(sp)
|
||||||
|
c->daddiu(v0, s7, 4); // daddiu v0, s7, 4
|
||||||
|
//jr ra // jr ra
|
||||||
|
c->daddiu(sp, sp, 8); // daddiu sp, sp, 8
|
||||||
|
goto end_of_function; // return
|
||||||
|
|
||||||
|
|
||||||
|
block_8:
|
||||||
|
c->sqc2(vf27, 0, a3); // sqc2 vf27, 0(a3)
|
||||||
|
c->daddiu(a3, a3, 16); // daddiu a3, a3, 16
|
||||||
|
c->sw(t0, -16, a3); // sw t0, -16(a3)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf15, 0, a2); // sqc2 vf15, 0(a2)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf15, 192, a2); // sqc2 vf15, 192(a2)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf16, 48, a2); // sqc2 vf16, 48(a2)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf17, 96, a2); // sqc2 vf17, 96(a2)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf18, 144, a2); // sqc2 vf18, 144(a2)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
|
||||||
|
block_9:
|
||||||
|
c->lqc2(vf1, 0, a2); // lqc2 vf1, 0(a2)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->lqc2(vf3, 32, a2); // lqc2 vf3, 32(a2)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->lqc2(vf2, 16, a2); // lqc2 vf2, 16(a2)
|
||||||
|
c->vdiv(vf13, BC::x, vf1, BC::w); // vdiv Q, vf13.x, vf1.w
|
||||||
|
c->vftoi0(DEST::xyzw, vf3, vf3); // vftoi0.xyzw vf3, vf3
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vadd(DEST::xyzw, vf2, vf2, vf24); // vadd.xyzw vf2, vf2, vf24
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vwaitq(); // vwaitq
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vmulq(DEST::xyz, vf1, vf1); // vmulq.xyz vf1, vf1, Q
|
||||||
|
c->sqc2(vf3, 16, a3); // sqc2 vf3, 16(a3)
|
||||||
|
c->vmulq(DEST::xyzw, vf2, vf2); // vmulq.xyzw vf2, vf2, Q
|
||||||
|
c->daddiu(a2, a2, 48); // daddiu a2, a2, 48
|
||||||
|
c->vadd(DEST::xyzw, vf1, vf1, vf25); // vadd.xyzw vf1, vf1, vf25
|
||||||
|
c->daddiu(a3, a3, 48); // daddiu a3, a3, 48
|
||||||
|
c->vmax_bc(DEST::z, BC::z, vf1, vf1, vf0); // vmaxz.z vf1, vf1, vf0
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vmini_bc(DEST::w, BC::z, vf1, vf1, vf13); // vminiz.w vf1, vf1, vf13
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->vmax_bc(DEST::w, BC::y, vf1, vf1, vf13); // vmaxy.w vf1, vf1, vf13
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf2, -48, a3); // sqc2 vf2, -48(a3)
|
||||||
|
c->daddiu(t0, t0, -1); // daddiu t0, t0, -1
|
||||||
|
c->vftoi4(DEST::xyzw, vf1, vf1); // vftoi4.xyzw vf1, vf1
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
bc = c->sgpr64(t0) != 0; // bne t0, r0, L14
|
||||||
|
c->sqc2(vf1, -16, a3); // sqc2 vf1, -16(a3)
|
||||||
|
if (bc) {goto block_9;} // branch non-likely
|
||||||
|
|
||||||
|
c->sw(a3, 4, a1); // sw a3, 4(a1)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->ld(ra, 0, sp); // ld ra, 0(sp)
|
||||||
|
c->daddiu(v0, s7, 4); // daddiu v0, s7, 4
|
||||||
|
//jr ra // jr ra
|
||||||
|
c->daddiu(sp, sp, 8); // daddiu sp, sp, 8
|
||||||
|
goto end_of_function; // return
|
||||||
|
|
||||||
|
|
||||||
|
block_11:
|
||||||
|
c->ld(ra, 0, sp); // ld ra, 0(sp)
|
||||||
|
c->mov64(v0, s7); // or v0, s7, r0
|
||||||
|
//jr ra // jr ra
|
||||||
|
c->daddiu(sp, sp, 8); // daddiu sp, sp, 8
|
||||||
|
goto end_of_function; // return
|
||||||
|
|
||||||
|
//jr ra // jr ra
|
||||||
|
c->daddu(sp, sp, r0); // daddu sp, sp, r0
|
||||||
|
goto end_of_function; // return
|
||||||
|
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
end_of_function:
|
||||||
|
return c->gprs[v0].du64[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
void link() {
|
||||||
|
cache.clip_polygon_against_negative_hyperplane = intern_from_c("clip-polygon-against-negative-hyperplane").c();
|
||||||
|
cache.clip_polygon_against_positive_hyperplane = intern_from_c("clip-polygon-against-positive-hyperplane").c();
|
||||||
|
gLinkedFunctionTable.reg("draw-large-polygon-vortex", execute, 128);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace draw_large_polygon_vortex
|
||||||
|
} // namespace Mips2C
|
||||||
|
|
||||||
|
|
||||||
|
//--------------------------MIPS2C---------------------
|
||||||
|
// clang-format off
|
||||||
|
#include "game/mips2c/mips2c_private.h"
|
||||||
|
#include "game/kernel/jak2/kscheme.h"
|
||||||
|
using ::jak2::intern_from_c;
|
||||||
|
namespace Mips2C::jak2 {
|
||||||
|
namespace render_vortex_quad {
|
||||||
|
struct Cache {
|
||||||
|
void* fake_scratchpad_data; // *fake-scratchpad-data*
|
||||||
|
void* draw_large_polygon_vortex; // draw-large-polygon-vortex
|
||||||
|
} cache;
|
||||||
|
|
||||||
|
u64 execute(void* ctxt) {
|
||||||
|
auto* c = (ExecutionContext*)ctxt;
|
||||||
|
c->copy_vfs_from_other(&sky_regs_vfs);
|
||||||
|
c->mov64(v1, a0); // or v1, a0, r0
|
||||||
|
get_fake_spad_addr2(t4, cache.fake_scratchpad_data, 0, c);// lui t4, 28672
|
||||||
|
c->ori(t4, t4, 12288); // ori t4, t4, 12288
|
||||||
|
get_fake_spad_addr2(t5, cache.fake_scratchpad_data, 0, c);// lui t5, 28672
|
||||||
|
c->ori(t5, t5, 14336); // ori t5, t5, 14336
|
||||||
|
c->mov64(a3, t4); // or a3, t4, r0
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->lqc2(vf1, 0, a0); // lqc2 vf1, 0(a0)
|
||||||
|
c->addiu(t0, r0, 4); // addiu t0, r0, 4
|
||||||
|
c->lqc2(vf2, 16, a0); // lqc2 vf2, 16(a0)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->lqc2(vf3, 0, a2); // lqc2 vf3, 0(a2)
|
||||||
|
c->vmula_bc(DEST::xyzw, BC::x, vf31, vf1); // vmulax.xyzw acc, vf31, vf1
|
||||||
|
c->lqc2(vf4, 32, a0); // lqc2 vf4, 32(a0)
|
||||||
|
c->vmadda_bc(DEST::xyzw, BC::y, vf30, vf1); // vmadday.xyzw acc, vf30, vf1
|
||||||
|
c->lqc2(vf5, 48, a0); // lqc2 vf5, 48(a0)
|
||||||
|
c->vmadda_bc(DEST::xyzw, BC::z, vf29, vf1); // vmaddaz.xyzw acc, vf29, vf1
|
||||||
|
c->lqc2(vf6, 0, a2); // lqc2 vf6, 0(a2)
|
||||||
|
c->vmadd_bc(DEST::xyzw, BC::w, vf15, vf28, vf1); // vmaddw.xyzw vf15, vf28, vf1
|
||||||
|
c->lqc2(vf7, 64, a0); // lqc2 vf7, 64(a0)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->lqc2(vf8, 80, a0); // lqc2 vf8, 80(a0)
|
||||||
|
c->vmula_bc(DEST::xyzw, BC::x, vf31, vf4); // vmulax.xyzw acc, vf31, vf4
|
||||||
|
c->lqc2(vf9, 0, a2); // lqc2 vf9, 0(a2)
|
||||||
|
c->vmadda_bc(DEST::xyzw, BC::y, vf30, vf4); // vmadday.xyzw acc, vf30, vf4
|
||||||
|
c->lqc2(vf10, 96, a0); // lqc2 vf10, 96(a0)
|
||||||
|
c->vmadda_bc(DEST::xyzw, BC::z, vf29, vf4); // vmaddaz.xyzw acc, vf29, vf4
|
||||||
|
c->lqc2(vf11, 112, a0); // lqc2 vf11, 112(a0)
|
||||||
|
c->vmadd_bc(DEST::xyzw, BC::w, vf16, vf28, vf4); // vmaddw.xyzw vf16, vf28, vf4
|
||||||
|
c->lqc2(vf12, 0, a2); // lqc2 vf12, 0(a2)
|
||||||
|
c->vmul(DEST::xyzw, vf1, vf15, vf14); // vmul.xyzw vf1, vf15, vf14
|
||||||
|
c->sqc2(vf2, 16, a3); // sqc2 vf2, 16(a3)
|
||||||
|
c->vmula_bc(DEST::xyzw, BC::x, vf31, vf7); // vmulax.xyzw acc, vf31, vf7
|
||||||
|
c->sqc2(vf3, 32, a3); // sqc2 vf3, 32(a3)
|
||||||
|
c->vmadda_bc(DEST::xyzw, BC::y, vf30, vf7); // vmadday.xyzw acc, vf30, vf7
|
||||||
|
c->sqc2(vf5, 64, a3); // sqc2 vf5, 64(a3)
|
||||||
|
c->vmadda_bc(DEST::xyzw, BC::z, vf29, vf7); // vmaddaz.xyzw acc, vf29, vf7
|
||||||
|
c->sqc2(vf6, 80, a3); // sqc2 vf6, 80(a3)
|
||||||
|
c->vmadd_bc(DEST::xyzw, BC::w, vf17, vf28, vf7); // vmaddw.xyzw vf17, vf28, vf7
|
||||||
|
c->sqc2(vf8, 112, a3); // sqc2 vf8, 112(a3)
|
||||||
|
c->vmul(DEST::xyzw, vf4, vf16, vf14); // vmul.xyzw vf4, vf16, vf14
|
||||||
|
c->sqc2(vf9, 128, a3); // sqc2 vf9, 128(a3)
|
||||||
|
c->vmula_bc(DEST::xyzw, BC::x, vf31, vf10); // vmulax.xyzw acc, vf31, vf10
|
||||||
|
c->sqc2(vf11, 160, a3); // sqc2 vf11, 160(a3)
|
||||||
|
c->vmadda_bc(DEST::xyzw, BC::y, vf30, vf10); // vmadday.xyzw acc, vf30, vf10
|
||||||
|
c->sqc2(vf12, 176, a3); // sqc2 vf12, 176(a3)
|
||||||
|
c->vmadda_bc(DEST::xyzw, BC::z, vf29, vf10); // vmaddaz.xyzw acc, vf29, vf10
|
||||||
|
c->sqc2(vf2, 208, a3); // sqc2 vf2, 208(a3)
|
||||||
|
c->vmadd_bc(DEST::xyzw, BC::w, vf18, vf28, vf10); // vmaddw.xyzw vf18, vf28, vf10
|
||||||
|
c->sqc2(vf3, 224, a3); // sqc2 vf3, 224(a3)
|
||||||
|
c->vmul(DEST::xyzw, vf7, vf17, vf14); // vmul.xyzw vf7, vf17, vf14
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf1, 0, a3); // sqc2 vf1, 0(a3)
|
||||||
|
c->vmul(DEST::xyzw, vf10, vf18, vf14); // vmul.xyzw vf10, vf18, vf14
|
||||||
|
c->sqc2(vf1, 192, a3); // sqc2 vf1, 192(a3)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf4, 48, a3); // sqc2 vf4, 48(a3)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf7, 96, a3); // sqc2 vf7, 96(a3)
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
c->sqc2(vf10, 144, a3); // sqc2 vf10, 144(a3)
|
||||||
|
c->load_symbol2(t9, cache.draw_large_polygon_vortex);// lw t9, draw-large-polygon-vortex(s7)
|
||||||
|
// Unknown instr: jr t9
|
||||||
|
draw_large_polygon_vortex::execute(ctxt);
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
//jr ra // jr ra
|
||||||
|
c->daddu(sp, sp, r0); // daddu sp, sp, r0
|
||||||
|
goto end_of_function; // return
|
||||||
|
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
// nop // sll r0, r0, 0
|
||||||
|
end_of_function:
|
||||||
|
return c->gprs[v0].du64[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
void link() {
|
||||||
|
cache.fake_scratchpad_data = intern_from_c("*fake-scratchpad-data*").c();
|
||||||
|
cache.draw_large_polygon_vortex = intern_from_c("draw-large-polygon-vortex").c();
|
||||||
|
gLinkedFunctionTable.reg("render-vortex-quad", execute, 128);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace render_vortex_quad
|
||||||
|
} // namespace Mips2C
|
||||||
|
|
@ -217,6 +217,9 @@ namespace ripple_create_wave_table { extern void link(); }
|
||||||
namespace ripple_apply_wave_table { extern void link(); }
|
namespace ripple_apply_wave_table { extern void link(); }
|
||||||
namespace ripple_matrix_scale { extern void link(); }
|
namespace ripple_matrix_scale { extern void link(); }
|
||||||
namespace method_53_squid { extern void link(); }
|
namespace method_53_squid { extern void link(); }
|
||||||
|
namespace init_vortex_regs { extern void link(); }
|
||||||
|
namespace draw_large_polygon_vortex { extern void link(); }
|
||||||
|
namespace render_vortex_quad { extern void link(); }
|
||||||
|
|
||||||
}
|
}
|
||||||
// clang-format on
|
// clang-format on
|
||||||
|
|
@ -363,7 +366,10 @@ PerGameVersion<std::unordered_map<std::string, std::vector<void (*)()>>> gMips2C
|
||||||
{"ripple",
|
{"ripple",
|
||||||
{jak2::ripple_execute_init::link, jak2::ripple_create_wave_table::link,
|
{jak2::ripple_execute_init::link, jak2::ripple_create_wave_table::link,
|
||||||
jak2::ripple_apply_wave_table::link, jak2::ripple_matrix_scale::link}},
|
jak2::ripple_apply_wave_table::link, jak2::ripple_matrix_scale::link}},
|
||||||
{"squid-setup", {jak2::method_53_squid::link}}}};
|
{"squid-setup", {jak2::method_53_squid::link}},
|
||||||
|
{"vortex",
|
||||||
|
{jak2::init_vortex_regs::link, jak2::draw_large_polygon_vortex::link,
|
||||||
|
jak2::render_vortex_quad::link}}}};
|
||||||
|
|
||||||
void LinkedFunctionTable::reg(const std::string& name, u64 (*exec)(void*), u32 stack_size) {
|
void LinkedFunctionTable::reg(const std::string& name, u64 (*exec)(void*), u32 stack_size) {
|
||||||
const auto& it = m_executes.insert({name, {exec, Ptr<u8>()}});
|
const auto& it = m_executes.insert({name, {exec, Ptr<u8>()}});
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,8 @@
|
||||||
;; name in dgo: drawable
|
;; name in dgo: drawable
|
||||||
;; dgos: ENGINE, GAME
|
;; dgos: ENGINE, GAME
|
||||||
|
|
||||||
|
(define-extern draw-vortex (function none))
|
||||||
|
|
||||||
;; DECOMP BEGINS
|
;; DECOMP BEGINS
|
||||||
|
|
||||||
(defmacro spr-work ()
|
(defmacro spr-work ()
|
||||||
|
|
@ -1458,7 +1460,7 @@
|
||||||
;; draw the sky
|
;; draw the sky
|
||||||
(with-profiler 'sky *profile-sky-color*
|
(with-profiler 'sky *profile-sky-color*
|
||||||
(if (-> *sky-work* draw-vortex)
|
(if (-> *sky-work* draw-vortex)
|
||||||
(format 0 "no vortex.~%");(draw-vortex)
|
(draw-vortex)
|
||||||
(draw *sky-work*)
|
(draw *sky-work*)
|
||||||
)
|
)
|
||||||
(flush-cache 0)
|
(flush-cache 0)
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -7,3 +7,187 @@
|
||||||
|
|
||||||
;; DECOMP BEGINS
|
;; DECOMP BEGINS
|
||||||
|
|
||||||
|
;; ERROR: function has no type analysis. Cannot decompile.
|
||||||
|
|
||||||
|
(def-mips2c init-vortex-regs (function none))
|
||||||
|
|
||||||
|
(def-mips2c draw-large-polygon-vortex function)
|
||||||
|
|
||||||
|
(def-mips2c render-vortex-quad (function vortex-vertex dma-buffer vector none))
|
||||||
|
|
||||||
|
(defun update-vortex-data ((arg0 float))
|
||||||
|
(when (not (paused?))
|
||||||
|
(+! (-> *vortex-work* off-s-0) (the int (* 4.0 arg0)))
|
||||||
|
(+! (-> *vortex-work* off-t-0) (the int (* -8.0 arg0)))
|
||||||
|
(+! (-> *vortex-work* off-s-1) (the int (* 4.0 arg0)))
|
||||||
|
(+! (-> *vortex-work* off-t-1) (the int (* -8.0 arg0)))
|
||||||
|
)
|
||||||
|
0
|
||||||
|
(none)
|
||||||
|
)
|
||||||
|
|
||||||
|
;; ERROR: Failed store: (s.w! (+ v1-76 8) 0) at op 268
|
||||||
|
(defun draw-vortex ()
|
||||||
|
(rlet ((vf27 :class vf))
|
||||||
|
(when (and (logtest? (-> *display* vu1-enable-user) (vu1-renderer-mask sky))
|
||||||
|
(logtest? (-> *texture-pool* texture-enable-user) (texture-enable-mask sky))
|
||||||
|
)
|
||||||
|
(let ((gp-0 (-> *display* frames (-> *display* on-screen) global-buf base)))
|
||||||
|
(update-vortex-data 60.0)
|
||||||
|
(with-dma-buffer-add-bucket ((s4-0 (-> *display* frames (-> *display* on-screen) global-buf))
|
||||||
|
(bucket-id sky-draw)
|
||||||
|
)
|
||||||
|
(let ((v1-17 s4-0))
|
||||||
|
(let ((a0-6 (the-as dma-packet (-> v1-17 base))))
|
||||||
|
(set! (-> a0-6 dma) (new 'static 'dma-tag :qwc #x4 :id (dma-tag-id cnt)))
|
||||||
|
(set! (-> a0-6 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> a0-6 vif1) (new 'static 'vif-tag :imm #x4 :cmd (vif-cmd direct) :msk #x1))
|
||||||
|
(set! (-> v1-17 base) (the-as pointer (&+ a0-6 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-18 s4-0))
|
||||||
|
(let ((a0-8 (the-as gs-gif-tag (-> v1-18 base))))
|
||||||
|
(set! (-> a0-8 tag) (new 'static 'gif-tag64 :nloop #x1 :eop #x1 :nreg #x3))
|
||||||
|
(set! (-> a0-8 regs) GIF_REGS_ALL_AD)
|
||||||
|
(set! (-> v1-18 base) (the-as pointer (&+ a0-8 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-19 s4-0))
|
||||||
|
(let ((a0-10 (-> v1-19 base)))
|
||||||
|
(set! (-> (the-as (pointer gs-zbuf) a0-10) 0) (new 'static 'gs-zbuf :zbp #x130 :psm (gs-psm ct24)))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-10) 1) (gs-reg64 zbuf-1))
|
||||||
|
(set! (-> (the-as (pointer gs-test) a0-10) 2)
|
||||||
|
(new 'static 'gs-test :ate #x1 :atst (gs-atest always) :zte #x1 :ztst (gs-ztest always))
|
||||||
|
)
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-10) 3) (gs-reg64 test-1))
|
||||||
|
(set! (-> (the-as (pointer gs-rgbaq) a0-10) 4) (new 'static 'gs-rgbaq :b #x40 :q 1.0))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-10) 5) (gs-reg64 rgbaq))
|
||||||
|
(set! (-> v1-19 base) (&+ a0-10 48))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-20 (-> s4-0 base)))
|
||||||
|
(set! (-> (the-as (pointer uint128) v1-20)) (-> *sky-work* sprite-tmpl dma-vif quad))
|
||||||
|
(set! (-> (the-as (pointer uint128) v1-20) 1) (-> *sky-work* sprite-tmpl quad 1))
|
||||||
|
)
|
||||||
|
(&+! (-> s4-0 base) 32)
|
||||||
|
(let ((v1-23 (-> s4-0 base)))
|
||||||
|
(set-vector! (the-as vector4w (&+ v1-23 0)) #x7000 #x7300 0 0)
|
||||||
|
(set-vector! (the-as vector4w (&+ v1-23 16)) #x9000 #x8d00 0 0)
|
||||||
|
)
|
||||||
|
(&+! (-> s4-0 base) 32)
|
||||||
|
(let ((v1-27 s4-0))
|
||||||
|
(let ((a0-19 (the-as dma-packet (-> v1-27 base))))
|
||||||
|
(set! (-> a0-19 dma) (new 'static 'dma-tag :qwc #x6 :id (dma-tag-id cnt)))
|
||||||
|
(set! (-> a0-19 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> a0-19 vif1) (new 'static 'vif-tag :imm #x6 :cmd (vif-cmd direct) :msk #x1))
|
||||||
|
(set! (-> v1-27 base) (the-as pointer (&+ a0-19 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-28 s4-0))
|
||||||
|
(let ((a0-21 (the-as gs-gif-tag (-> v1-28 base))))
|
||||||
|
(set! (-> a0-21 tag) (new 'static 'gif-tag64 :nloop #x1 :eop #x1 :nreg #x5))
|
||||||
|
(set! (-> a0-21 regs) GIF_REGS_ALL_AD)
|
||||||
|
(set! (-> v1-28 base) (the-as pointer (&+ a0-21 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((s3-0 s4-0))
|
||||||
|
(let ((s2-0 (-> s3-0 base)))
|
||||||
|
(set! (-> (the-as (pointer gs-tex0) s2-0) 0) (new 'static 'gs-tex0
|
||||||
|
:tbp0 #x100
|
||||||
|
:tbw #x2
|
||||||
|
:psm #x1b
|
||||||
|
:tcc #x1
|
||||||
|
:cbp #x300
|
||||||
|
:cld #x1
|
||||||
|
:th (log2 128)
|
||||||
|
:tw (log2 128)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 1) (gs-reg64 tex0-1))
|
||||||
|
(set! (-> (the-as (pointer gs-tex1) s2-0) 2) (new 'static 'gs-tex1 :mmag #x1 :mmin #x1))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 3) (gs-reg64 tex1-1))
|
||||||
|
(set! (-> (the-as (pointer gs-clamp) s2-0) 4) (new 'static 'gs-clamp))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 5) (gs-reg64 clamp-1))
|
||||||
|
(set! (-> (the-as (pointer gs-alpha) s2-0) 6) (new 'static 'gs-alpha :b #x1 :d #x1))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 7) (gs-reg64 alpha-1))
|
||||||
|
(set! (-> (the-as (pointer uint64) s2-0) 8) (the-as uint 0))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 9) (gs-reg64 texflush))
|
||||||
|
(set! (-> s3-0 base) (&+ s2-0 80))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(init-vortex-regs)
|
||||||
|
;;(.lvf vf27 (&-> *vortex-work* giftag quad))
|
||||||
|
(set-sky-vf27 (&-> *vortex-work* giftag quad))
|
||||||
|
|
||||||
|
(set-tex-offset (the-as int (-> *vortex-work* off-s-0)) (the-as int (-> *vortex-work* off-t-0)))
|
||||||
|
(let ((s3-1 (the-as dma-packet (-> s4-0 base))))
|
||||||
|
(&+! (-> s4-0 base) 16)
|
||||||
|
(let ((s2-1 *vortex-poly*))
|
||||||
|
(dotimes (s1-2 304)
|
||||||
|
(render-vortex-quad (-> s2-1 (* s1-2 4)) s4-0 (new 'static 'vector :z 128.0 :w 128.0))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(close-sky-buffer s4-0)
|
||||||
|
(let ((v1-54 (/ (+ (- -16 (the-as int s3-1)) (the-as int (-> s4-0 base))) 16)))
|
||||||
|
(set! (-> s3-1 dma) (new 'static 'dma-tag :id (dma-tag-id cnt) :qwc v1-54))
|
||||||
|
(set! (-> s3-1 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> s3-1 vif1) (new 'static 'vif-tag :cmd (vif-cmd direct) :msk #x1 :imm v1-54))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-58 s4-0))
|
||||||
|
(let ((a0-32 (the-as dma-packet (-> v1-58 base))))
|
||||||
|
(set! (-> a0-32 dma) (new 'static 'dma-tag :qwc #x3 :id (dma-tag-id cnt)))
|
||||||
|
(set! (-> a0-32 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> a0-32 vif1) (new 'static 'vif-tag :imm #x3 :cmd (vif-cmd direct) :msk #x1))
|
||||||
|
(set! (-> v1-58 base) (the-as pointer (&+ a0-32 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-59 s4-0))
|
||||||
|
(let ((a0-34 (the-as gs-gif-tag (-> v1-59 base))))
|
||||||
|
(set! (-> a0-34 tag) (new 'static 'gif-tag64 :nloop #x1 :eop #x1 :nreg #x2))
|
||||||
|
(set! (-> a0-34 regs) GIF_REGS_ALL_AD)
|
||||||
|
(set! (-> v1-59 base) (the-as pointer (&+ a0-34 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-60 s4-0))
|
||||||
|
(let ((a0-36 (-> v1-60 base)))
|
||||||
|
(set! (-> (the-as (pointer gs-alpha) a0-36) 0) (new 'static 'gs-alpha :b #x2 :d #x1))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-36) 1) (gs-reg64 alpha-1))
|
||||||
|
(set! (-> (the-as (pointer uint64) a0-36) 2) (the-as uint 1))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-36) 3) (gs-reg64 colclamp))
|
||||||
|
(set! (-> v1-60 base) (&+ a0-36 32))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(set-tex-offset (the-as int (-> *vortex-work* off-s-1)) (the-as int (-> *vortex-work* off-t-1)))
|
||||||
|
(let ((s3-2 (the-as dma-packet (-> s4-0 base))))
|
||||||
|
(&+! (-> s4-0 base) 16)
|
||||||
|
(let ((s2-2 *vortex-poly*))
|
||||||
|
(dotimes (s1-3 304)
|
||||||
|
(render-vortex-quad (-> s2-2 (* s1-3 4)) s4-0 (new 'static 'vector :x 144.0 :y 128.0 :z 255.0 :w 128.0))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(close-sky-buffer s4-0)
|
||||||
|
(let ((v1-72 (/ (+ (- -16 (the-as int s3-2)) (the-as int (-> s4-0 base))) 16)))
|
||||||
|
(set! (-> s3-2 dma) (new 'static 'dma-tag :id (dma-tag-id cnt) :qwc v1-72))
|
||||||
|
(set! (-> s3-2 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> s3-2 vif1) (new 'static 'vif-tag :cmd (vif-cmd direct) :msk #x1 :imm v1-72))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-83 *dma-mem-usage*))
|
||||||
|
(when (nonzero? v1-83)
|
||||||
|
(set! (-> v1-83 length) (max 89 (-> v1-83 length)))
|
||||||
|
(set! (-> v1-83 data 88 name) "sky")
|
||||||
|
(+! (-> v1-83 data 88 count) 1)
|
||||||
|
(+! (-> v1-83 data 88 used)
|
||||||
|
(&- (-> *display* frames (-> *display* on-screen) global-buf base) (the-as uint gp-0))
|
||||||
|
)
|
||||||
|
(set! (-> v1-83 data 88 total) (-> v1-83 data 88 used))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
0
|
||||||
|
(none)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
|
||||||
2710
test/decompiler/reference/jak2/levels/intro/vortex-data_REF.gc
generated
vendored
Normal file
2710
test/decompiler/reference/jak2/levels/intro/vortex-data_REF.gc
generated
vendored
Normal file
File diff suppressed because it is too large
Load diff
201
test/decompiler/reference/jak2/levels/intro/vortex_REF.gc
generated
vendored
Normal file
201
test/decompiler/reference/jak2/levels/intro/vortex_REF.gc
generated
vendored
Normal file
|
|
@ -0,0 +1,201 @@
|
||||||
|
;;-*-Lisp-*-
|
||||||
|
(in-package goal)
|
||||||
|
|
||||||
|
;; definition for function sort-vortex-data
|
||||||
|
;; ERROR: function has no type analysis. Cannot decompile.
|
||||||
|
|
||||||
|
;; definition for function init-vortex-regs
|
||||||
|
;; INFO: function output is handled by mips2c
|
||||||
|
(def-mips2c init-vortex-regs (function none))
|
||||||
|
|
||||||
|
;; definition for function draw-large-polygon-vortex
|
||||||
|
;; INFO: function output is handled by mips2c
|
||||||
|
(def-mips2c draw-large-polygon-vortex function)
|
||||||
|
|
||||||
|
;; definition for function render-vortex-quad
|
||||||
|
;; INFO: function output is handled by mips2c
|
||||||
|
(def-mips2c render-vortex-quad (function vortex-vertex dma-buffer vector none))
|
||||||
|
|
||||||
|
;; definition for function update-vortex-data
|
||||||
|
;; WARN: Return type mismatch int vs none.
|
||||||
|
(defun update-vortex-data ((arg0 float))
|
||||||
|
(when (not (paused?))
|
||||||
|
(+! (-> *vortex-work* off-s-0) (the int (* 4.0 arg0)))
|
||||||
|
(+! (-> *vortex-work* off-t-0) (the int (* -8.0 arg0)))
|
||||||
|
(+! (-> *vortex-work* off-s-1) (the int (* 4.0 arg0)))
|
||||||
|
(+! (-> *vortex-work* off-t-1) (the int (* -8.0 arg0)))
|
||||||
|
)
|
||||||
|
0
|
||||||
|
(none)
|
||||||
|
)
|
||||||
|
|
||||||
|
;; definition for function draw-vortex
|
||||||
|
;; INFO: Used lq/sq
|
||||||
|
;; WARN: Return type mismatch int vs none.
|
||||||
|
;; ERROR: Failed store: (s.w! (+ v1-76 8) 0) at op 268
|
||||||
|
(defun draw-vortex ()
|
||||||
|
(rlet ((vf27 :class vf))
|
||||||
|
(when (and (logtest? (-> *display* vu1-enable-user) (vu1-renderer-mask sky))
|
||||||
|
(logtest? (-> *texture-pool* texture-enable-user) (texture-enable-mask sky))
|
||||||
|
)
|
||||||
|
(let ((gp-0 (-> *display* frames (-> *display* on-screen) global-buf base)))
|
||||||
|
(update-vortex-data 60.0)
|
||||||
|
(with-dma-buffer-add-bucket ((s4-0 (-> *display* frames (-> *display* on-screen) global-buf))
|
||||||
|
(bucket-id sky-draw)
|
||||||
|
)
|
||||||
|
(let ((v1-17 s4-0))
|
||||||
|
(let ((a0-6 (the-as dma-packet (-> v1-17 base))))
|
||||||
|
(set! (-> a0-6 dma) (new 'static 'dma-tag :qwc #x4 :id (dma-tag-id cnt)))
|
||||||
|
(set! (-> a0-6 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> a0-6 vif1) (new 'static 'vif-tag :imm #x4 :cmd (vif-cmd direct) :msk #x1))
|
||||||
|
(set! (-> v1-17 base) (the-as pointer (&+ a0-6 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-18 s4-0))
|
||||||
|
(let ((a0-8 (the-as gs-gif-tag (-> v1-18 base))))
|
||||||
|
(set! (-> a0-8 tag) (new 'static 'gif-tag64 :nloop #x1 :eop #x1 :nreg #x3))
|
||||||
|
(set! (-> a0-8 regs) GIF_REGS_ALL_AD)
|
||||||
|
(set! (-> v1-18 base) (the-as pointer (&+ a0-8 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-19 s4-0))
|
||||||
|
(let ((a0-10 (-> v1-19 base)))
|
||||||
|
(set! (-> (the-as (pointer gs-zbuf) a0-10) 0) (new 'static 'gs-zbuf :zbp #x130 :psm (gs-psm ct24)))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-10) 1) (gs-reg64 zbuf-1))
|
||||||
|
(set! (-> (the-as (pointer gs-test) a0-10) 2)
|
||||||
|
(new 'static 'gs-test :ate #x1 :atst (gs-atest always) :zte #x1 :ztst (gs-ztest always))
|
||||||
|
)
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-10) 3) (gs-reg64 test-1))
|
||||||
|
(set! (-> (the-as (pointer gs-rgbaq) a0-10) 4) (new 'static 'gs-rgbaq :b #x40 :q 1.0))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-10) 5) (gs-reg64 rgbaq))
|
||||||
|
(set! (-> v1-19 base) (&+ a0-10 48))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-20 (-> s4-0 base)))
|
||||||
|
(set! (-> (the-as (pointer uint128) v1-20)) (-> *sky-work* sprite-tmpl dma-vif quad))
|
||||||
|
(set! (-> (the-as (pointer uint128) v1-20) 1) (-> *sky-work* sprite-tmpl quad 1))
|
||||||
|
)
|
||||||
|
(&+! (-> s4-0 base) 32)
|
||||||
|
(let ((v1-23 (-> s4-0 base)))
|
||||||
|
(set-vector! (the-as vector4w (&+ v1-23 0)) #x7000 #x7300 0 0)
|
||||||
|
(set-vector! (the-as vector4w (&+ v1-23 16)) #x9000 #x8d00 0 0)
|
||||||
|
)
|
||||||
|
(&+! (-> s4-0 base) 32)
|
||||||
|
(let ((v1-27 s4-0))
|
||||||
|
(let ((a0-19 (the-as dma-packet (-> v1-27 base))))
|
||||||
|
(set! (-> a0-19 dma) (new 'static 'dma-tag :qwc #x6 :id (dma-tag-id cnt)))
|
||||||
|
(set! (-> a0-19 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> a0-19 vif1) (new 'static 'vif-tag :imm #x6 :cmd (vif-cmd direct) :msk #x1))
|
||||||
|
(set! (-> v1-27 base) (the-as pointer (&+ a0-19 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-28 s4-0))
|
||||||
|
(let ((a0-21 (the-as gs-gif-tag (-> v1-28 base))))
|
||||||
|
(set! (-> a0-21 tag) (new 'static 'gif-tag64 :nloop #x1 :eop #x1 :nreg #x5))
|
||||||
|
(set! (-> a0-21 regs) GIF_REGS_ALL_AD)
|
||||||
|
(set! (-> v1-28 base) (the-as pointer (&+ a0-21 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((s3-0 s4-0))
|
||||||
|
(let ((s2-0 (-> s3-0 base)))
|
||||||
|
(set! (-> (the-as (pointer gs-tex0) s2-0) 0) (new 'static 'gs-tex0
|
||||||
|
:tbp0 #x100
|
||||||
|
:tbw #x2
|
||||||
|
:psm #x1b
|
||||||
|
:tcc #x1
|
||||||
|
:cbp #x300
|
||||||
|
:cld #x1
|
||||||
|
:th (log2 128)
|
||||||
|
:tw (log2 128)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 1) (gs-reg64 tex0-1))
|
||||||
|
(set! (-> (the-as (pointer gs-tex1) s2-0) 2) (new 'static 'gs-tex1 :mmag #x1 :mmin #x1))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 3) (gs-reg64 tex1-1))
|
||||||
|
(set! (-> (the-as (pointer gs-clamp) s2-0) 4) (new 'static 'gs-clamp))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 5) (gs-reg64 clamp-1))
|
||||||
|
(set! (-> (the-as (pointer gs-alpha) s2-0) 6) (new 'static 'gs-alpha :b #x1 :d #x1))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 7) (gs-reg64 alpha-1))
|
||||||
|
(set! (-> (the-as (pointer uint64) s2-0) 8) (the-as uint 0))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) s2-0) 9) (gs-reg64 texflush))
|
||||||
|
(set! (-> s3-0 base) (&+ s2-0 80))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(init-vortex-regs)
|
||||||
|
(.lvf vf27 (&-> *vortex-work* giftag quad))
|
||||||
|
(set-tex-offset (the-as int (-> *vortex-work* off-s-0)) (the-as int (-> *vortex-work* off-t-0)))
|
||||||
|
(let ((s3-1 (the-as dma-packet (-> s4-0 base))))
|
||||||
|
(&+! (-> s4-0 base) 16)
|
||||||
|
(let ((s2-1 *vortex-poly*))
|
||||||
|
(dotimes (s1-2 304)
|
||||||
|
(render-vortex-quad (-> s2-1 (* s1-2 4)) s4-0 (new 'static 'vector :z 128.0 :w 128.0))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(close-sky-buffer s4-0)
|
||||||
|
(let ((v1-54 (/ (+ (- -16 (the-as int s3-1)) (the-as int (-> s4-0 base))) 16)))
|
||||||
|
(set! (-> s3-1 dma) (new 'static 'dma-tag :id (dma-tag-id cnt) :qwc v1-54))
|
||||||
|
(set! (-> s3-1 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> s3-1 vif1) (new 'static 'vif-tag :cmd (vif-cmd direct) :msk #x1 :imm v1-54))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-58 s4-0))
|
||||||
|
(let ((a0-32 (the-as dma-packet (-> v1-58 base))))
|
||||||
|
(set! (-> a0-32 dma) (new 'static 'dma-tag :qwc #x3 :id (dma-tag-id cnt)))
|
||||||
|
(set! (-> a0-32 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> a0-32 vif1) (new 'static 'vif-tag :imm #x3 :cmd (vif-cmd direct) :msk #x1))
|
||||||
|
(set! (-> v1-58 base) (the-as pointer (&+ a0-32 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-59 s4-0))
|
||||||
|
(let ((a0-34 (the-as gs-gif-tag (-> v1-59 base))))
|
||||||
|
(set! (-> a0-34 tag) (new 'static 'gif-tag64 :nloop #x1 :eop #x1 :nreg #x2))
|
||||||
|
(set! (-> a0-34 regs) GIF_REGS_ALL_AD)
|
||||||
|
(set! (-> v1-59 base) (the-as pointer (&+ a0-34 16)))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-60 s4-0))
|
||||||
|
(let ((a0-36 (-> v1-60 base)))
|
||||||
|
(set! (-> (the-as (pointer gs-alpha) a0-36) 0) (new 'static 'gs-alpha :b #x2 :d #x1))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-36) 1) (gs-reg64 alpha-1))
|
||||||
|
(set! (-> (the-as (pointer uint64) a0-36) 2) (the-as uint 1))
|
||||||
|
(set! (-> (the-as (pointer gs-reg64) a0-36) 3) (gs-reg64 colclamp))
|
||||||
|
(set! (-> v1-60 base) (&+ a0-36 32))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(set-tex-offset (the-as int (-> *vortex-work* off-s-1)) (the-as int (-> *vortex-work* off-t-1)))
|
||||||
|
(let ((s3-2 (the-as dma-packet (-> s4-0 base))))
|
||||||
|
(&+! (-> s4-0 base) 16)
|
||||||
|
(let ((s2-2 *vortex-poly*))
|
||||||
|
(dotimes (s1-3 304)
|
||||||
|
(render-vortex-quad (-> s2-2 (* s1-3 4)) s4-0 (new 'static 'vector :x 144.0 :y 128.0 :z 255.0 :w 128.0))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(close-sky-buffer s4-0)
|
||||||
|
(let ((v1-72 (/ (+ (- -16 (the-as int s3-2)) (the-as int (-> s4-0 base))) 16)))
|
||||||
|
(set! (-> s3-2 dma) (new 'static 'dma-tag :id (dma-tag-id cnt) :qwc v1-72))
|
||||||
|
(set! (-> s3-2 vif0) (new 'static 'vif-tag))
|
||||||
|
(set! (-> s3-2 vif1) (new 'static 'vif-tag :cmd (vif-cmd direct) :msk #x1 :imm v1-72))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
(let ((v1-83 *dma-mem-usage*))
|
||||||
|
(when (nonzero? v1-83)
|
||||||
|
(set! (-> v1-83 length) (max 89 (-> v1-83 length)))
|
||||||
|
(set! (-> v1-83 data 88 name) "sky")
|
||||||
|
(+! (-> v1-83 data 88 count) 1)
|
||||||
|
(+! (-> v1-83 data 88 used)
|
||||||
|
(&- (-> *display* frames (-> *display* on-screen) global-buf base) (the-as uint gp-0))
|
||||||
|
)
|
||||||
|
(set! (-> v1-83 data 88 total) (-> v1-83 data 88 used))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
0
|
||||||
|
(none)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -306,7 +306,8 @@
|
||||||
"(method 14 nav-graph)",
|
"(method 14 nav-graph)",
|
||||||
"target-pilot-init",
|
"target-pilot-init",
|
||||||
"(method 224 crimson-guard)", // .mula.s
|
"(method 224 crimson-guard)", // .mula.s
|
||||||
"metalkor-egg-reaction" // .mula.s
|
"metalkor-egg-reaction", // .mula.s
|
||||||
|
"init-vortex-polys"
|
||||||
],
|
],
|
||||||
|
|
||||||
"skip_compile_states": {
|
"skip_compile_states": {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue