ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Code cleanup of Glide64/Combine.cpp

This commit is contained in:
zilmar 2016-01-20 20:14:28 +11:00
parent 6f71a37da5
commit 8b220f06bc
1 changed files with 14957 additions and 14961 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Glide64/Combine.cpp
View File

@ -630,7 +630,6 @@ COMBINE cmb;
percent = (float)(rdp.env_color&0xFF) / 255.0f, \
cmb.dc0_detailmax = cmb.dc1_detailmax = percent
// UNIMP - writes to the unimplemented log, if it's enabled
#ifdef UNIMP_LOG
#define UNIMPMODE() { \
@ -1415,7 +1414,6 @@ static void cc__t0_mul_prim__inter_env_using_enva ()
}
}
static void cc__t1_inter_t0_using_t1__mul_shade()
{
CCMB(GR_COMBINE_FUNCTION_SCALE_OTHER,
@ -4480,7 +4478,6 @@ static void cc__t0_inter_t1_using_shadea__sub_prim_mul_env_add_shade () //Aded
T0_INTER_T1_USING_SHADEA();
}
static void cc_t0_sub_prim_mul_env_add_prim() //Aded by Gonetz
{
CCMB(GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL,
@ -5025,7 +5022,6 @@ static void cc__t0_inter_t1_using_primlod__sub_env_mul_shade_add_env ()
T0_INTER_T1_USING_FACTOR(lod_frac);
}
static void cc_t0_sub_env_mul_enva_add_prim() //Aded by Gonetz
{
CCMB(GR_COMBINE_FUNCTION_SCALE_OTHER_ADD_LOCAL,
@ -5135,7 +5131,8 @@ static void cc_one_sub_prim_mul_t0a_add_prim ()
GR_CMBX_TEXTURE_ALPHA, 0,
GR_CMBX_B, 0);
CC_PRIM();
} else {
}
else {
CCMB(GR_COMBINE_FUNCTION_SCALE_OTHER,
GR_COMBINE_FACTOR_ONE,
GR_COMBINE_LOCAL_NONE,
@ -6956,7 +6953,6 @@ static void cc_env_sub_prim_mul__t0a_mul_t1a__add_prim ()
A_T0_MUL_T1();
}
static void cc_env_sub_prim_mul_prima_add_prim() //Aded by Gonetz
{
// * not guaranteed to work if another iterated alpha is set
@ -7161,7 +7157,6 @@ static void cc_shade_sub_t0_mul_shadea_add_t0 ()
USE_T0();
}
static void cc__t0_mul_shade_mul_shadea__add__t1_mul_one_sub_shadea()
{
// (t0-0)*shade+0, (cmb-t0)*shadea+t0
@ -8770,7 +8765,6 @@ static void cc__prim_mul_shade__inter_env_using__prim_mul_shade_alpha ()
MULSHADE_A_PRIM();
}
//****************************************************************
static void ac_one()
@ -10304,7 +10298,8 @@ static void ac_t0_sub_prim_mul_shade ()
GR_CMBX_ITALPHA, GR_FUNC_MODE_ZERO,
GR_CMBX_ZERO, 1,
GR_CMBX_ZERO, 0);
} else {
}
else {
ACMB(GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL,
GR_COMBINE_FACTOR_ONE,
GR_COMBINE_LOCAL_ITERATED,
@ -10329,7 +10324,8 @@ static void ac_t0_sub_prim_mul_shade_mul_env ()
GR_CMBX_CONSTANT_ALPHA, 0,
GR_CMBX_ZERO, 0);
CA_ENV();
} else {
}
else {
ACMB(GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL,
GR_COMBINE_FACTOR_ONE,
GR_COMBINE_LOCAL_ITERATED,
@ -10354,7 +10350,8 @@ static void ac_t0_sub_shade_mul_prim ()
GR_CMBX_ITALPHA, GR_FUNC_MODE_ZERO,
GR_CMBX_ZERO, 1,
GR_CMBX_ZERO, 0);
} else {
}
else {
ACMB(GR_COMBINE_FUNCTION_SCALE_OTHER_MINUS_LOCAL,
GR_COMBINE_FACTOR_ONE,
GR_COMBINE_LOCAL_ITERATED,
@ -15710,7 +15707,6 @@ void Combine ()
else
alpha_cmb_list[current].func();
if (color_combine == 0x69351fff) //text, PD, need to change texture alpha
{
A_USE_T1();