diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2025-02-21 16:03:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-21 17:03:51 -0700 |
| commit | 8c6ae625aef6d07741cd8925f422f43ae24b198c (patch) | |
| tree | 741fafdf5cf11006a23a9019451082c269fe4922 /lib/ultralib/src/gu/loadtextureblockmipmap.c | |
| parent | f013a028f42a1b11134bc5f22f28e9f48236b6f0 (diff) | |
Ultralib Update (#233)
* git subrepo pull (merge) lib/ultralib
subrepo:
subdir: "lib/ultralib"
merged: "74f0eee"
upstream:
origin: "git@github.com:decompals/ultralib.git"
branch: "main"
commit: "2717d45"
git-subrepo:
version: "0.4.9"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "cce3d93"
* New ultralib fixes
* Update some includes in tools
* git subrepo commit (merge) lib/ultralib
subrepo:
subdir: "lib/ultralib"
merged: "3a702eaf"
upstream:
origin: "git@github.com:decompals/ultralib.git"
branch: "main"
commit: "48f9f908"
git-subrepo:
version: "0.4.9"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "ea10886"
* Update warnings file
Diffstat (limited to 'lib/ultralib/src/gu/loadtextureblockmipmap.c')
| -rw-r--r-- | lib/ultralib/src/gu/loadtextureblockmipmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ultralib/src/gu/loadtextureblockmipmap.c b/lib/ultralib/src/gu/loadtextureblockmipmap.c index 30ffc65..3381c72 100644 --- a/lib/ultralib/src/gu/loadtextureblockmipmap.c +++ b/lib/ultralib/src/gu/loadtextureblockmipmap.c @@ -16,7 +16,7 @@ #include "guint.h" #include <stdio.h> #include "ultra64.h" -#include "macros.h" +#include "PRinternal/macros.h" // TODO: this comes from a header #ident "$Revision: 1.49 $" @@ -44,7 +44,7 @@ struct Tile }; /* tram mipmaps */ -static struct Tile mipmap[MM_MAX_LEVEL+1] ALIGNED(8); +static struct Tile mipmap[MM_MAX_LEVEL+1] ALIGNED(0x8); static struct texelSizeParams sizeParams[4] = { 16, 3, 1, 0, 8, 2, 2, 1, |