summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorrobojumper <robojumper@gmail.com>2025-03-16 22:14:05 +0100
committerrobojumper <robojumper@gmail.com>2025-03-16 22:18:01 +0100
commitfd19da8ac80df2d8a48a40a69c7ea163d1f50ab0 (patch)
tree049ef361328ef3be5dfd71f8f5a693876f0ac29c /include
parent540abd8cd172a114dd24e7721b5e15c8a442dc49 (diff)
First CreateDisplayList attempt
Diffstat (limited to 'include')
-rw-r--r--include/egg/gfx/eggDrawGX.h5
-rw-r--r--include/rvl/OS/OSFastCast.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/include/egg/gfx/eggDrawGX.h b/include/egg/gfx/eggDrawGX.h
index 6fe69326..e72d2cf8 100644
--- a/include/egg/gfx/eggDrawGX.h
+++ b/include/egg/gfx/eggDrawGX.h
@@ -14,7 +14,7 @@ class DrawGX {
public:
// made up
struct DLData {
- void *mpList;
+ u8 *mpList;
u32 mLen;
};
@@ -83,6 +83,7 @@ public:
static GXTexMapID GetTexMapDefault();
static void LoadTexture(const EGG::ResTIMG *, GXTexMapID);
static void BeginDrawScreen(bool, bool, bool);
+ static void CreateDisplayList(EGG::Heap*);
static void DrawDL(enum DL, const nw4r::math::MTX34 &, GXColor);
static void SetVtxState(enum VtxType);
static void SetBlendMode(enum Blend);
@@ -93,7 +94,7 @@ public:
static Matrix34f s_cameraMtx;
- /* static ?? s_flag */
+ static u32 s_flag;
static GXColor BLACK;
static GXColor WHITE;
diff --git a/include/rvl/OS/OSFastCast.h b/include/rvl/OS/OSFastCast.h
index 9f86bac7..8780217f 100644
--- a/include/rvl/OS/OSFastCast.h
+++ b/include/rvl/OS/OSFastCast.h
@@ -10,7 +10,7 @@ extern "C" {
#define OS_GQR_TYPE_S8 6
#define OS_GQR_TYPE_S16 7
-static void OSInitFastCast(void) {
+static inline void OSInitFastCast(void) {
// clang-format off
asm {
li r3, 4