mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-17 21:35:11 +00:00
Code Issues Projects Releases Wiki Activity

git subrepo pull --force tools/ZAPD (#742)

Browse source 
subrepo:
  subdir:   "tools/ZAPD"
  merged:   "c4773301a"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "c4773301a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
This commit is contained in:
fig02 2021-03-27 23:57:14 -04:00 • committed by GitHub
parent b338f12498
commit 71bbaab485
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 66 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
tools/ZAPD/lib/libgfxd/uc_macrofn.c
View file

@ -274,15 +274,10 @@ UCFUNC int c_ltb(gfxd_macro_t *m, int n_macro, int id, int mdxt, int mtmem,
}
int width = (argvu(&m[6], 3) >> 2) + 1;
int height = (argvu(&m[6], 4) >> 2) + 1;
unsigned lrs = ((width * height + 1) * G_SIZ_BITS(siz) - 1) /
G_SIZ_BITS(G_SIZ_LDSIZ(siz)) - 1;
unsigned lrs = G_LDBLK_TXL(G_LTB_LRS(width, height, siz));
unsigned dxt = 0;
if (!mdxt)
{
dxt = (width * G_SIZ_BITS(siz) <= 64 ? (1 << 11) :
((1 << 11) + width * G_SIZ_BITS(siz) / 64 - 1) /
(width * G_SIZ_BITS(siz) / 64));
}
dxt = G_DXT(siz, width);
int line;
if (myuv)
line = (width + 7) / 8;
@ -592,7 +587,13 @@ UCFUNC int d_DPLoadBlock(gfxd_macro_t *m, uint32_t hi, uint32_t lo)
argu(m, 2, "ult", getfield(hi, 12, 0), gfxd_Coordi);
argu(m, 3, "lrs", getfield(lo, 12, 12), gfxd_Coordi);
argu(m, 4, "dxt", getfield(lo, 12, 0), gfxd_Dxt);
return 0;
if (argvu(m, 3) > G_TX_LDBLK_MAX_TXL) {
badarg(m, 3);
return -1;
}
else {
return 0;
}
}
UCFUNC int d_DPNoOp(gfxd_macro_t *m, uint32_t hi, uint32_t lo)