mirror of
https://github.com/blawar/GLideN64.git
synced 2024-06-25 22:09:35 +00:00
Auto-format sources.
This commit is contained in:
Sergey Lipskiy
parent
c4d434c87e
commit
60ee35116c
120
Combiner.cpp
120
Combiner.cpp
|
|
@ -126,21 +126,21 @@ void Combiner_Init()
|
|||
|
||||
switch (combiner.compiler)
|
||||
{
|
||||
case TEXTURE_ENV:
|
||||
Init_texture_env();
|
||||
break;
|
||||
case TEXTURE_ENV:
|
||||
Init_texture_env();
|
||||
break;
|
||||
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
Init_texture_env_combine();
|
||||
break;
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
Init_texture_env_combine();
|
||||
break;
|
||||
|
||||
case NV_REGISTER_COMBINERS:
|
||||
Init_NV_register_combiners();
|
||||
break;
|
||||
case NV_REGISTER_COMBINERS:
|
||||
Init_NV_register_combiners();
|
||||
break;
|
||||
|
||||
case GLSL_COMBINE:
|
||||
InitGLSLCombiner();
|
||||
break;
|
||||
case GLSL_COMBINE:
|
||||
InitGLSLCombiner();
|
||||
break;
|
||||
}
|
||||
combiner.root = NULL;
|
||||
}
|
||||
|
|
@ -149,17 +149,17 @@ void Combiner_UpdateCombineColors()
|
|||
{
|
||||
switch (combiner.compiler)
|
||||
{
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
Update_texture_env_combine_Colors( (TexEnvCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
Update_texture_env_combine_Colors( (TexEnvCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
|
||||
case NV_REGISTER_COMBINERS:
|
||||
Update_NV_register_combiners_Colors( (RegisterCombiners*)combiner.current->compiled );
|
||||
break;
|
||||
case NV_REGISTER_COMBINERS:
|
||||
Update_NV_register_combiners_Colors( (RegisterCombiners*)combiner.current->compiled );
|
||||
break;
|
||||
|
||||
case GLSL_COMBINE:
|
||||
UpdateGLSLCombinerColors( (GLSLCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
case GLSL_COMBINE:
|
||||
UpdateGLSLCombinerColors( (GLSLCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
}
|
||||
|
||||
gDP.changed &= ~CHANGED_COMBINE_COLORS;
|
||||
|
|
@ -378,25 +378,25 @@ CachedCombiner *Combiner_Compile( u64 mux )
|
|||
cached->combine.mux = combine.mux;
|
||||
cached->left = NULL;
|
||||
cached->right = NULL;
|
||||
|
||||
|
||||
// Send the simplified combiner to the hardware-specific compiler
|
||||
switch (combiner.compiler)
|
||||
{
|
||||
case TEXTURE_ENV:
|
||||
cached->compiled = (void*)Compile_texture_env( &color, &alpha );
|
||||
break;
|
||||
case TEXTURE_ENV:
|
||||
cached->compiled = (void*)Compile_texture_env( &color, &alpha );
|
||||
break;
|
||||
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
cached->compiled = (void*)Compile_texture_env_combine( &color, &alpha );
|
||||
break;
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
cached->compiled = (void*)Compile_texture_env_combine( &color, &alpha );
|
||||
break;
|
||||
|
||||
case NV_REGISTER_COMBINERS:
|
||||
cached->compiled = (void*)Compile_NV_register_combiners( &color, &alpha );
|
||||
break;
|
||||
case NV_REGISTER_COMBINERS:
|
||||
cached->compiled = (void*)Compile_NV_register_combiners( &color, &alpha );
|
||||
break;
|
||||
|
||||
case GLSL_COMBINE:
|
||||
cached->compiled = (void*)CompileGLSLCominer( &color, &alpha );
|
||||
break;
|
||||
case GLSL_COMBINE:
|
||||
cached->compiled = (void*)CompileGLSLCominer( &color, &alpha );
|
||||
break;
|
||||
}
|
||||
|
||||
return cached;
|
||||
|
|
@ -430,9 +430,9 @@ void Combiner_BeginTextureUpdate()
|
|||
{
|
||||
switch (combiner.compiler)
|
||||
{
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
BeginTextureUpdate_texture_env_combine();
|
||||
break;
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
BeginTextureUpdate_texture_env_combine();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -440,22 +440,22 @@ void Combiner_EndTextureUpdate()
|
|||
{
|
||||
switch (combiner.compiler)
|
||||
{
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
//EndTextureUpdate_texture_env_combine();
|
||||
Set_texture_env_combine( (TexEnvCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
//EndTextureUpdate_texture_env_combine();
|
||||
Set_texture_env_combine( (TexEnvCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
DWORD64 Combiner_EncodeCombineMode( WORD saRGB0, WORD sbRGB0, WORD mRGB0, WORD aRGB0,
|
||||
WORD saA0, WORD sbA0, WORD mA0, WORD aA0,
|
||||
WORD saRGB1, WORD sbRGB1, WORD mRGB1, WORD aRGB1,
|
||||
WORD saA1, WORD sbA1, WORD mA1, WORD aA1 )
|
||||
WORD saA0, WORD sbA0, WORD mA0, WORD aA0,
|
||||
WORD saRGB1, WORD sbRGB1, WORD mRGB1, WORD aRGB1,
|
||||
WORD saA1, WORD sbA1, WORD mA1, WORD aA1 )
|
||||
{
|
||||
return (((DWORD64)CCEncodeA[saRGB0] << 52) | ((DWORD64)CCEncodeB[sbRGB0] << 28) | ((DWORD64)CCEncodeC[mRGB0] << 47) | ((DWORD64)CCEncodeD[aRGB0] << 15) |
|
||||
((DWORD64)ACEncodeA[saA0] << 44) | ((DWORD64)ACEncodeB[sbA0] << 12) | ((DWORD64)ACEncodeC[mA0] << 41) | ((DWORD64)ACEncodeD[aA0] << 9) |
|
||||
((DWORD64)CCEncodeA[saRGB1] << 37) | ((DWORD64)CCEncodeB[sbRGB1] << 24) | ((DWORD64)CCEncodeC[mRGB1] ) | ((DWORD64)CCEncodeD[aRGB1] << 6) |
|
||||
((DWORD64)ACEncodeA[saA1] << 18) | ((DWORD64)ACEncodeB[sbA1] << 3) | ((DWORD64)ACEncodeC[mA1] << 18) | ((DWORD64)ACEncodeD[aA1] ));
|
||||
((DWORD64)ACEncodeA[saA0] << 44) | ((DWORD64)ACEncodeB[sbA0] << 12) | ((DWORD64)ACEncodeC[mA0] << 41) | ((DWORD64)ACEncodeD[aA0] << 9) |
|
||||
((DWORD64)CCEncodeA[saRGB1] << 37) | ((DWORD64)CCEncodeB[sbRGB1] << 24) | ((DWORD64)CCEncodeC[mRGB1] ) | ((DWORD64)CCEncodeD[aRGB1] << 6) |
|
||||
((DWORD64)ACEncodeA[saA1] << 18) | ((DWORD64)ACEncodeB[sbA1] << 3) | ((DWORD64)ACEncodeC[mA1] << 18) | ((DWORD64)ACEncodeD[aA1] ));
|
||||
}
|
||||
|
||||
void Combiner_SelectCombine( u64 mux )
|
||||
|
|
@ -464,7 +464,7 @@ void Combiner_SelectCombine( u64 mux )
|
|||
if ((gDP.otherMode.cycleType == G_CYC_1CYCLE) && (mux == 0x00ffe7ffffcf9fcf) && (cache.current[0]->frameBufferTexture))
|
||||
{
|
||||
mux = EncodeCombineMode( 0, 0, 0, 0, TEXEL0, 0, PRIMITIVE, 0,
|
||||
0, 0, 0, 0, TEXEL0, 0, PRIMITIVE, 0 );
|
||||
0, 0, 0, 0, TEXEL0, 0, PRIMITIVE, 0 );
|
||||
}
|
||||
|
||||
CachedCombiner *current = combiner.root;
|
||||
|
|
@ -503,21 +503,21 @@ void Combiner_SetCombineStates()
|
|||
{
|
||||
switch (combiner.compiler)
|
||||
{
|
||||
case TEXTURE_ENV:
|
||||
Set_texture_env( (TexEnv*)combiner.current->compiled );
|
||||
break;
|
||||
case TEXTURE_ENV:
|
||||
Set_texture_env( (TexEnv*)combiner.current->compiled );
|
||||
break;
|
||||
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
Set_texture_env_combine( (TexEnvCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
case TEXTURE_ENV_COMBINE:
|
||||
Set_texture_env_combine( (TexEnvCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
|
||||
case NV_REGISTER_COMBINERS:
|
||||
Set_NV_register_combiners( (RegisterCombiners*)combiner.current->compiled );
|
||||
break;
|
||||
case NV_REGISTER_COMBINERS:
|
||||
Set_NV_register_combiners( (RegisterCombiners*)combiner.current->compiled );
|
||||
break;
|
||||
|
||||
case GLSL_COMBINE:
|
||||
SetGLSLCombiner( (GLSLCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
case GLSL_COMBINE:
|
||||
SetGLSLCombiner( (GLSLCombiner*)combiner.current->compiled );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
112
Combiner.h
112
Combiner.h
|
|
@ -12,8 +12,8 @@
|
|||
#define GLSL_COMBINE 3
|
||||
|
||||
/*
|
||||
* G_SETCOMBINE: color combine modes
|
||||
*/
|
||||
* G_SETCOMBINE: color combine modes
|
||||
*/
|
||||
/* Color combiner constants: */
|
||||
#define G_CCMUX_COMBINED 0
|
||||
#define G_CCMUX_TEXEL0 1
|
||||
|
|
@ -50,15 +50,15 @@
|
|||
#define G_ACMUX_0 7
|
||||
|
||||
#define EncodeCombineMode( a0, b0, c0, d0, Aa0, Ab0, Ac0, Ad0, \
|
||||
a1, b1, c1, d1, Aa1, Ab1, Ac1, Ad1 ) \
|
||||
(u64)(((u64)(_SHIFTL( G_CCMUX_##a0, 20, 4 ) | _SHIFTL( G_CCMUX_##c0, 15, 5 ) | \
|
||||
_SHIFTL( G_ACMUX_##Aa0, 12, 3 ) | _SHIFTL( G_ACMUX_##Ac0, 9, 3 ) | \
|
||||
_SHIFTL( G_CCMUX_##a1, 5, 4 ) | _SHIFTL( G_CCMUX_##c1, 0, 5 )) << 32) | \
|
||||
(u64)(_SHIFTL( G_CCMUX_##b0, 28, 4 ) | _SHIFTL( G_CCMUX_##d0, 15, 3 ) | \
|
||||
_SHIFTL( G_ACMUX_##Ab0, 12, 3 ) | _SHIFTL( G_ACMUX_##Ad0, 9, 3 ) | \
|
||||
_SHIFTL( G_CCMUX_##b1, 24, 4 ) | _SHIFTL( G_ACMUX_##Aa1, 21, 3 ) | \
|
||||
_SHIFTL( G_ACMUX_##Ac1, 18, 3 ) | _SHIFTL( G_CCMUX_##d1, 6, 3 ) | \
|
||||
_SHIFTL( G_ACMUX_##Ab1, 3, 3 ) | _SHIFTL( G_ACMUX_##Ad1, 0, 3 )))
|
||||
a1, b1, c1, d1, Aa1, Ab1, Ac1, Ad1 ) \
|
||||
(u64)(((u64)(_SHIFTL( G_CCMUX_##a0, 20, 4 ) | _SHIFTL( G_CCMUX_##c0, 15, 5 ) | \
|
||||
_SHIFTL( G_ACMUX_##Aa0, 12, 3 ) | _SHIFTL( G_ACMUX_##Ac0, 9, 3 ) | \
|
||||
_SHIFTL( G_CCMUX_##a1, 5, 4 ) | _SHIFTL( G_CCMUX_##c1, 0, 5 )) << 32) | \
|
||||
(u64)(_SHIFTL( G_CCMUX_##b0, 28, 4 ) | _SHIFTL( G_CCMUX_##d0, 15, 3 ) | \
|
||||
_SHIFTL( G_ACMUX_##Ab0, 12, 3 ) | _SHIFTL( G_ACMUX_##Ad0, 9, 3 ) | \
|
||||
_SHIFTL( G_CCMUX_##b1, 24, 4 ) | _SHIFTL( G_ACMUX_##Aa1, 21, 3 ) | \
|
||||
_SHIFTL( G_ACMUX_##Ac1, 18, 3 ) | _SHIFTL( G_CCMUX_##d1, 6, 3 ) | \
|
||||
_SHIFTL( G_ACMUX_##Ab1, 3, 3 ) | _SHIFTL( G_ACMUX_##Ad1, 0, 3 )))
|
||||
|
||||
// Internal combiner commands
|
||||
#define LOAD 0
|
||||
|
|
@ -139,62 +139,62 @@ extern struct CombinerInfo
|
|||
|
||||
#define SetConstant( constant, color, alpha ) \
|
||||
switch (color) \
|
||||
{ \
|
||||
case PRIMITIVE: \
|
||||
constant.r = gDP.primColor.r; \
|
||||
constant.g = gDP.primColor.g; \
|
||||
constant.b = gDP.primColor.b; \
|
||||
break; \
|
||||
{ \
|
||||
case PRIMITIVE: \
|
||||
constant.r = gDP.primColor.r; \
|
||||
constant.g = gDP.primColor.g; \
|
||||
constant.b = gDP.primColor.b; \
|
||||
break; \
|
||||
case ENVIRONMENT: \
|
||||
constant.r = gDP.envColor.r; \
|
||||
constant.g = gDP.envColor.g; \
|
||||
constant.b = gDP.envColor.b; \
|
||||
break; \
|
||||
constant.r = gDP.envColor.r; \
|
||||
constant.g = gDP.envColor.g; \
|
||||
constant.b = gDP.envColor.b; \
|
||||
break; \
|
||||
case PRIMITIVE_ALPHA: \
|
||||
constant.r = gDP.primColor.a; \
|
||||
constant.g = gDP.primColor.a; \
|
||||
constant.b = gDP.primColor.a; \
|
||||
break; \
|
||||
constant.r = gDP.primColor.a; \
|
||||
constant.g = gDP.primColor.a; \
|
||||
constant.b = gDP.primColor.a; \
|
||||
break; \
|
||||
case ENV_ALPHA: \
|
||||
constant.r = gDP.envColor.a; \
|
||||
constant.g = gDP.envColor.a; \
|
||||
constant.b = gDP.envColor.a; \
|
||||
break; \
|
||||
constant.r = gDP.envColor.a; \
|
||||
constant.g = gDP.envColor.a; \
|
||||
constant.b = gDP.envColor.a; \
|
||||
break; \
|
||||
case PRIM_LOD_FRAC: \
|
||||
constant.r = gDP.primColor.l; \
|
||||
constant.g = gDP.primColor.l; \
|
||||
constant.b = gDP.primColor.l; \
|
||||
break; \
|
||||
constant.r = gDP.primColor.l; \
|
||||
constant.g = gDP.primColor.l; \
|
||||
constant.b = gDP.primColor.l; \
|
||||
break; \
|
||||
case ONE: \
|
||||
constant.r = 1.0f; \
|
||||
constant.g = 1.0f; \
|
||||
constant.b = 1.0f; \
|
||||
break; \
|
||||
constant.r = 1.0f; \
|
||||
constant.g = 1.0f; \
|
||||
constant.b = 1.0f; \
|
||||
break; \
|
||||
case ZERO: \
|
||||
constant.r = 0.0f; \
|
||||
constant.g = 0.0f; \
|
||||
constant.b = 0.0f; \
|
||||
break; \
|
||||
} \
|
||||
\
|
||||
constant.r = 0.0f; \
|
||||
constant.g = 0.0f; \
|
||||
constant.b = 0.0f; \
|
||||
break; \
|
||||
} \
|
||||
\
|
||||
switch (alpha) \
|
||||
{ \
|
||||
case PRIMITIVE_ALPHA: \
|
||||
constant.a = gDP.primColor.a; \
|
||||
break; \
|
||||
{ \
|
||||
case PRIMITIVE_ALPHA: \
|
||||
constant.a = gDP.primColor.a; \
|
||||
break; \
|
||||
case ENV_ALPHA: \
|
||||
constant.a = gDP.envColor.a; \
|
||||
break; \
|
||||
constant.a = gDP.envColor.a; \
|
||||
break; \
|
||||
case PRIM_LOD_FRAC: \
|
||||
constant.a = gDP.primColor.l; \
|
||||
break; \
|
||||
constant.a = gDP.primColor.l; \
|
||||
break; \
|
||||
case ONE: \
|
||||
constant.a = 1.0f; \
|
||||
break; \
|
||||
constant.a = 1.0f; \
|
||||
break; \
|
||||
case ZERO: \
|
||||
constant.a = 0.0f; \
|
||||
break; \
|
||||
}
|
||||
constant.a = 0.0f; \
|
||||
break; \
|
||||
}
|
||||
|
||||
void Combiner_Init();
|
||||
void Combiner_UpdateCombineColors();
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user