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

[Video] rename grAlphaCombineExt to gfxAlphaCombineExt

This commit is contained in:
zilmar 2017-05-24 20:59:02 +10:00
parent 3aeab8fb77
commit d4e61af937
4 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Project64-video/Renderer/OGLEScombiner.cpp
View File

@ -1904,16 +1904,11 @@ void gfxColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode, GrCCUColor_t b,
need_to_compile = 1; need_to_compile = 1;
} }
FX_ENTRY void FX_CALL void gfxAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode, GrACUColor_t b, GrCombineMode_t b_mode, GrACUColor_t c, FxBool c_invert, GrACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert)
grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
GrACUColor_t b, GrCombineMode_t b_mode,
GrACUColor_t c, FxBool c_invert,
GrACUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert)
{ {
WriteTrace(TraceGlitch, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); WriteTrace(TraceGlitch, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
if (invert) WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : inverted result"); if (invert) WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : inverted result");
if (shift) WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : shift = %d", shift); if (shift) WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : shift = %d", shift);
alpha_combiner_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) | alpha_combiner_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) |
((b & 0x1F) << 7) | ((b_mode & 3) << 12) | ((b & 0x1F) << 7) | ((b_mode & 3) << 12) |
@ -1937,7 +1932,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float as_a = vFrontColor.a; \n"); strcat(fragment_shader_alpha_combiner, "float as_a = vFrontColor.a; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : a = %x", a); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : a = %x", a);
strcat(fragment_shader_alpha_combiner, "float as_a = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float as_a = 0.0; \n");
} }
@ -1956,7 +1951,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float a_a = -as_a; \n"); strcat(fragment_shader_alpha_combiner, "float a_a = -as_a; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : a_mode = %x", a_mode); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : a_mode = %x", a_mode);
strcat(fragment_shader_alpha_combiner, "float a_a = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float a_a = 0.0; \n");
} }
@ -1975,7 +1970,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float as_b = vFrontColor.a; \n"); strcat(fragment_shader_alpha_combiner, "float as_b = vFrontColor.a; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : b = %x", b); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : b = %x", b);
strcat(fragment_shader_alpha_combiner, "float as_b = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float as_b = 0.0; \n");
} }
@ -1994,7 +1989,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float a_b = -as_b; \n"); strcat(fragment_shader_alpha_combiner, "float a_b = -as_b; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : b_mode = %x", b_mode); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : b_mode = %x", b_mode);
strcat(fragment_shader_alpha_combiner, "float a_b = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float a_b = 0.0; \n");
} }
@ -2022,7 +2017,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float a_c = vFrontColor.a; \n"); strcat(fragment_shader_alpha_combiner, "float a_c = vFrontColor.a; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : c = %x", c); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : c = %x", c);
strcat(fragment_shader_alpha_combiner, "float a_c = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float a_c = 0.0; \n");
} }
@ -2044,7 +2039,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float a_d = as_b; \n"); strcat(fragment_shader_alpha_combiner, "float a_d = as_b; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : d = %x", d); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : d = %x", d);
strcat(fragment_shader_alpha_combiner, "float a_d = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float a_d = 0.0; \n");
} }

23
Source/Project64-video/Renderer/OGLcombiner.cpp
View File

@ -1867,16 +1867,11 @@ void gfxColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode, GrCCUColor_t b,
need_to_compile = 1; need_to_compile = 1;
} }
FX_ENTRY void FX_CALL void gfxAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode, GrACUColor_t b, GrCombineMode_t b_mode, GrACUColor_t c, FxBool c_invert, GrACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert)
grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
GrACUColor_t b, GrCombineMode_t b_mode,
GrACUColor_t c, FxBool c_invert,
GrACUColor_t d, FxBool d_invert,
FxU32 shift, FxBool invert)
{ {
WriteTrace(TraceGlitch, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert); WriteTrace(TraceGlitch, TraceDebug, "a: %d a_mode: %d b: %d b_mode: %d c: %d c_invert: %d d: %d d_invert: %d shift: %d invert: %d", a, a_mode, b, b_mode, c, c_invert, d, d_invert, shift, invert);
if (invert) WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : inverted result"); if (invert) WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : inverted result");
if (shift) WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : shift = %d", shift); if (shift) WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : shift = %d", shift);
alpha_combiner_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) | alpha_combiner_key = 0x80000000 | (a & 0x1F) | ((a_mode & 3) << 5) |
((b & 0x1F) << 7) | ((b_mode & 3) << 12) | ((b & 0x1F) << 7) | ((b_mode & 3) << 12) |
@ -1900,7 +1895,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float as_a = gl_Color.a; \n"); strcat(fragment_shader_alpha_combiner, "float as_a = gl_Color.a; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : a = %x", a); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : a = %x", a);
strcat(fragment_shader_alpha_combiner, "float as_a = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float as_a = 0.0; \n");
} }
@ -1919,7 +1914,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float a_a = -as_a; \n"); strcat(fragment_shader_alpha_combiner, "float a_a = -as_a; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : a_mode = %x", a_mode); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : a_mode = %x", a_mode);
strcat(fragment_shader_alpha_combiner, "float a_a = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float a_a = 0.0; \n");
} }
@ -1938,7 +1933,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float as_b = gl_Color.a; \n"); strcat(fragment_shader_alpha_combiner, "float as_b = gl_Color.a; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : b = %x", b); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : b = %x", b);
strcat(fragment_shader_alpha_combiner, "float as_b = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float as_b = 0.0; \n");
} }
@ -1957,7 +1952,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float a_b = -as_b; \n"); strcat(fragment_shader_alpha_combiner, "float a_b = -as_b; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : b_mode = %x", b_mode); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : b_mode = %x", b_mode);
strcat(fragment_shader_alpha_combiner, "float a_b = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float a_b = 0.0; \n");
} }
@ -1985,7 +1980,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float a_c = gl_Color.a; \n"); strcat(fragment_shader_alpha_combiner, "float a_c = gl_Color.a; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : c = %x", c); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : c = %x", c);
strcat(fragment_shader_alpha_combiner, "float a_c = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float a_c = 0.0; \n");
} }
@ -2007,7 +2002,7 @@ grAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode,
strcat(fragment_shader_alpha_combiner, "float a_d = as_b; \n"); strcat(fragment_shader_alpha_combiner, "float a_d = as_b; \n");
break; break;
default: default:
WriteTrace(TraceGlitch, TraceWarning, "grAlphaCombineExt : d = %x", d); WriteTrace(TraceGlitch, TraceWarning, "gfxAlphaCombineExt : d = %x", d);
strcat(fragment_shader_alpha_combiner, "float a_d = 0.0; \n"); strcat(fragment_shader_alpha_combiner, "float a_d = 0.0; \n");
} }

1
Source/Project64-video/Renderer/Renderer.h
View File

@ -37,6 +37,7 @@ void gfxChromakeyMode(GrChromakeyMode_t mode);
void gfxChromakeyValue(GrColor_t value); void gfxChromakeyValue(GrColor_t value);
void gfxStippleMode(GrStippleMode_t mode); void gfxStippleMode(GrStippleMode_t mode);
void gfxColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode, GrCCUColor_t b, GrCombineMode_t b_mode, GrCCUColor_t c, FxBool c_invert, GrCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert); void gfxColorCombineExt(GrCCUColor_t a, GrCombineMode_t a_mode, GrCCUColor_t b, GrCombineMode_t b_mode, GrCCUColor_t c, FxBool c_invert, GrCCUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
void gfxAlphaCombineExt(GrACUColor_t a, GrCombineMode_t a_mode, GrACUColor_t b, GrCombineMode_t b_mode, GrACUColor_t c, FxBool c_invert, GrACUColor_t d, FxBool d_invert, FxU32 shift, FxBool invert);
extern uint32_t nbTextureUnits; extern uint32_t nbTextureUnits;
extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y; extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;

2
Source/Project64-video/TexCache.cpp
View File

@ -678,7 +678,7 @@ void TexCache()
if (!(cmb.cmb_ext_use & COMBINE_EXT_ALPHA)) if (!(cmb.cmb_ext_use & COMBINE_EXT_ALPHA))
AlphaCombinerToExtension(); AlphaCombinerToExtension();
gfxColorCombineExt(cmb.c_ext_a, cmb.c_ext_a_mode, cmb.c_ext_b, cmb.c_ext_b_mode, cmb.c_ext_c, cmb.c_ext_c_invert, cmb.c_ext_d, cmb.c_ext_d_invert, 0, 0); gfxColorCombineExt(cmb.c_ext_a, cmb.c_ext_a_mode, cmb.c_ext_b, cmb.c_ext_b_mode, cmb.c_ext_c, cmb.c_ext_c_invert, cmb.c_ext_d, cmb.c_ext_d_invert, 0, 0);
grAlphaCombineExt(cmb.a_ext_a, cmb.a_ext_a_mode, cmb.a_ext_b, cmb.a_ext_b_mode, cmb.a_ext_c, cmb.a_ext_c_invert, cmb.a_ext_d, cmb.a_ext_d_invert, 0, 0); gfxAlphaCombineExt(cmb.a_ext_a, cmb.a_ext_a_mode, cmb.a_ext_b, cmb.a_ext_b_mode, cmb.a_ext_c, cmb.a_ext_c_invert, cmb.a_ext_d, cmb.a_ext_d_invert, 0, 0);
} }
else else
{ {