From 4bab6123a76187ece9a1d462df427429f41dc09c Mon Sep 17 00:00:00 2001 From: Reonu Date: Tue, 29 Jun 2021 15:54:53 +0100 Subject: [PATCH] improved the DISABLE_AA define --- include/n64/PR/gbi.h | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/include/n64/PR/gbi.h b/include/n64/PR/gbi.h index eea18d5b..702a9933 100644 --- a/include/n64/PR/gbi.h +++ b/include/n64/PR/gbi.h @@ -21,6 +21,7 @@ #define _GBI_H_ #include +#include /* * To use the F3DEX ucodes, define F3DEX_GBI before include this file. @@ -942,6 +943,68 @@ #define RM_CUSTOM_AA_ZB_XLU_SURF(clk) \ RM_AA_ZB_XLU_SURF(clk) | Z_UPD +#ifdef DISABLE_AA + +#define G_RM_AA_ZB_OPA_SURF RM_ZB_OPA_SURF(1) +#define G_RM_AA_ZB_OPA_SURF2 RM_ZB_OPA_SURF(2) +#define G_RM_AA_ZB_XLU_SURF RM_ZB_XLU_SURF(1) +#define G_RM_AA_ZB_XLU_SURF2 RM_ZB_XLU_SURF(2) +#define G_RM_AA_ZB_OPA_DECAL RM_ZB_OPA_DECAL(1) +#define G_RM_AA_ZB_OPA_DECAL2 RM_ZB_OPA_DECAL(2) +#define G_RM_AA_ZB_XLU_DECAL RM_ZB_XLU_DECAL(1) +#define G_RM_AA_ZB_XLU_DECAL2 RM_ZB_XLU_DECAL(2) +#define G_RM_AA_ZB_OPA_INTER RM_AA_ZB_OPA_INTER(1) +#define G_RM_AA_ZB_OPA_INTER2 RM_AA_ZB_OPA_INTER(2) +#define G_RM_AA_ZB_XLU_INTER RM_AA_ZB_XLU_INTER(1) +#define G_RM_AA_ZB_XLU_INTER2 RM_AA_ZB_XLU_INTER(2) +#define G_RM_AA_ZB_XLU_LINE RM_AA_ZB_XLU_LINE(1) +#define G_RM_AA_ZB_XLU_LINE2 RM_AA_ZB_XLU_LINE(2) +#define G_RM_AA_ZB_DEC_LINE RM_AA_ZB_DEC_LINE(1) +#define G_RM_AA_ZB_DEC_LINE2 RM_AA_ZB_DEC_LINE(2) +#define G_RM_AA_ZB_TEX_EDGE RM_AA_ZB_TEX_EDGE(1) +#define G_RM_AA_ZB_TEX_EDGE2 RM_AA_ZB_TEX_EDGE(2) +#define G_RM_AA_ZB_TEX_INTER RM_AA_ZB_TEX_INTER(1) +#define G_RM_AA_ZB_TEX_INTER2 RM_AA_ZB_TEX_INTER(2) +#define G_RM_AA_ZB_SUB_SURF RM_AA_ZB_SUB_SURF(1) +#define G_RM_AA_ZB_SUB_SURF2 RM_AA_ZB_SUB_SURF(2) +#define G_RM_AA_ZB_PCL_SURF RM_ZB_PCL_SURF(1) +#define G_RM_AA_ZB_PCL_SURF2 RM_ZB_PCL_SURF(2) +#define G_RM_AA_ZB_OPA_TERR RM_AA_ZB_OPA_TERR(1) +#define G_RM_AA_ZB_OPA_TERR2 RM_AA_ZB_OPA_TERR(2) +#define G_RM_AA_ZB_TEX_TERR RM_AA_ZB_TEX_TERR(1) +#define G_RM_AA_ZB_TEX_TERR2 RM_AA_ZB_TEX_TERR(2) +#define G_RM_AA_ZB_SUB_TERR RM_AA_ZB_SUB_TERR(1) +#define G_RM_AA_ZB_SUB_TERR2 RM_AA_ZB_SUB_TERR(2) + +#define G_RM_RA_ZB_OPA_SURF RM_RA_ZB_OPA_SURF(1) +#define G_RM_RA_ZB_OPA_SURF2 RM_RA_ZB_OPA_SURF(2) +#define G_RM_RA_ZB_OPA_DECAL RM_RA_ZB_OPA_DECAL(1) +#define G_RM_RA_ZB_OPA_DECAL2 RM_RA_ZB_OPA_DECAL(2) +#define G_RM_RA_ZB_OPA_INTER RM_RA_ZB_OPA_INTER(1) +#define G_RM_RA_ZB_OPA_INTER2 RM_RA_ZB_OPA_INTER(2) + +#define G_RM_AA_OPA_SURF RM_OPA_SURF(1) +#define G_RM_AA_OPA_SURF2 RM_OPA_SURF(2) +#define G_RM_AA_XLU_SURF RM_XLU_SURF(1) +#define G_RM_AA_XLU_SURF2 RM_XLU_SURF(2) +#define G_RM_AA_XLU_LINE RM_AA_XLU_LINE(1) +#define G_RM_AA_XLU_LINE2 RM_AA_XLU_LINE(2) +#define G_RM_AA_DEC_LINE RM_AA_DEC_LINE(1) +#define G_RM_AA_DEC_LINE2 RM_AA_DEC_LINE(2) +#define G_RM_AA_TEX_EDGE RM_TEX_EDGE(1) +#define G_RM_AA_TEX_EDGE2 RM_TEX_EDGE(2) +#define G_RM_AA_SUB_SURF RM_AA_SUB_SURF(1) +#define G_RM_AA_SUB_SURF2 RM_AA_SUB_SURF(2) +#define G_RM_AA_PCL_SURF RM_PCL_SURF(1) +#define G_RM_AA_PCL_SURF2 RM_PCL_SURF(2) +#define G_RM_AA_OPA_TERR RM_AA_OPA_TERR(1) +#define G_RM_AA_OPA_TERR2 RM_AA_OPA_TERR(2) +#define G_RM_AA_TEX_TERR RM_AA_TEX_TERR(1) +#define G_RM_AA_TEX_TERR2 RM_AA_TEX_TERR(2) +#define G_RM_AA_SUB_TERR RM_AA_SUB_TERR(1) +#define G_RM_AA_SUB_TERR2 RM_AA_SUB_TERR(2) + +#else #define G_RM_AA_ZB_OPA_SURF RM_AA_ZB_OPA_SURF(1) #define G_RM_AA_ZB_OPA_SURF2 RM_AA_ZB_OPA_SURF(2) @@ -1002,6 +1065,8 @@ #define G_RM_AA_SUB_TERR RM_AA_SUB_TERR(1) #define G_RM_AA_SUB_TERR2 RM_AA_SUB_TERR(2) +#endif + #define G_RM_RA_OPA_SURF RM_RA_OPA_SURF(1) #define G_RM_RA_OPA_SURF2 RM_RA_OPA_SURF(2)