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

Cocoa Port: 

- Expose 6xBRZ pixel scaler in the UI. (Related to r5377.)
- Fix a tiny blending bug in the 5xBRZ fragment shader.
This commit is contained in:
rogerman 2016-03-05 01:45:54 +00:00
parent 86eff9d3f0
commit d4ff390287
3 changed files with 1042 additions and 466 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

489
desmume/src/cocoa/OGLDisplayOutput.cpp
View File

@ -2917,8 +2917,8 @@ static const char *Scaler4xBRZFragShader_110 = {"\
dst[ 9] = mix(dst[ 9], blendPix, 0.25);\n\
dst[ 2] = mix(dst[ 2], blendPix, 1.0/3.0);\n\
dst[12] = mix(dst[12], blendPix, 1.00);\n\
dst[11] = mix(dst[11], blendPix, 1.00);\n\
dst[13] = mix(dst[13], blendPix, 1.00);\n\
dst[11] = mix(dst[11], blendPix, 1.00);\n\
}\n\
else\n\
{\n\
@ -2956,8 +2956,8 @@ static const char *Scaler4xBRZFragShader_110 = {"\
{\n\
// Blend corner\n\
dst[12] = mix(dst[12], blendPix, 0.6848532563);\n\
dst[11] = mix(dst[11], blendPix, 0.08677704501);\n\
dst[13] = mix(dst[13], blendPix, 0.08677704501);\n\
dst[11] = mix(dst[11], blendPix, 0.08677704501);\n\
}\n\
*/\n\
}\n\
@ -3448,12 +3448,12 @@ static const char *Scaler5xBRZFragShader_110 = {"\
dst[16] = mix(dst[16], blendPix, 0.25);\n\
dst[ 3] = mix(dst[ 3], blendPix, 0.25);\n\
dst[15] = mix(dst[15], blendPix, 0.75);\n\
dst[ 2] = mix(dst[ 2], blendPix, 2.0/3.0);\n\
dst[10] = mix(dst[10], blendPix, 1.00);\n\
dst[11] = mix(dst[11], blendPix, 1.00);\n\
dst[12] = mix(dst[12], blendPix, 1.00);\n\
dst[14] = mix(dst[14], blendPix, 1.00);\n\
dst[13] = mix(dst[13], blendPix, 1.00);\n\
dst[12] = mix(dst[12], blendPix, 1.00);\n\
dst[ 2] = mix(dst[ 2], blendPix, 2.0/3.0);\n\
}\n\
else\n\
{\n\
@ -3489,7 +3489,7 @@ static const char *Scaler5xBRZFragShader_110 = {"\
// Blend line diagonal\n\
dst[14] = mix(dst[14], blendPix, 0.125);\n\
dst[ 2] = mix(dst[ 2], blendPix, 0.125);\n\
dst[ 9] = mix(dst[ 9], blendPix, 0.125);\n\
dst[10] = mix(dst[10], blendPix, 0.125);\n\
dst[13] = mix(dst[13], blendPix, 0.875);\n\
dst[11] = mix(dst[11], blendPix, 0.875);\n\
dst[12] = mix(dst[12], blendPix, 1.000);\n\
@ -3500,8 +3500,8 @@ static const char *Scaler5xBRZFragShader_110 = {"\
{\n\
// Blend corner\n\
dst[12] = mix(dst[12], blendPix, 0.8631434088);\n\
dst[13] = mix(dst[13], blendPix, 0.2306749731);\n\
dst[11] = mix(dst[11], blendPix, 0.2306749731);\n\
dst[13] = mix(dst[13], blendPix, 0.2306749731);\n\
}\n\
}\n\
*/\n\
@ -3663,8 +3663,8 @@ static const char *Scaler5xBRZFragShader_110 = {"\
dst[ 1] = mix(dst[ 1], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[ 2] = mix(dst[ 2], blendPix, (needBlend && doLineBlend) ? ((haveShallowLine) ? ((haveSteepLine) ? 2.0/3.0 : 0.750) : ((haveSteepLine) ? 0.750 : 0.125)) : 0.000);\n\
dst[ 3] = mix(dst[ 3], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
dst[ 9] = mix(dst[ 9], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 0.750 : ((haveShallowLine) ? 0.000 : 0.125)) : 0.000);\n\
dst[10] = mix(dst[10], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[ 9] = mix(dst[ 9], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.750 : 0.000);\n\
dst[10] = mix(dst[10], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.250 : 0.125)) : 0.000);\n\
dst[11] = mix(dst[11], blendPix, (needBlend) ? ((doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.875 : 1.000) : 0.2306749731) : 0.000);\n\
dst[12] = mix(dst[12], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.8631434088) : 0.000);\n\
dst[13] = mix(dst[13], blendPix, (needBlend) ? ((doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.875 : 1.000) : 0.2306749731) : 0.000);\n\
@ -3688,8 +3688,8 @@ static const char *Scaler5xBRZFragShader_110 = {"\
dst[ 7] = mix(dst[ 7], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[ 8] = mix(dst[ 8], blendPix, (needBlend && doLineBlend) ? ((haveShallowLine) ? ((haveSteepLine) ? 2.0/3.0 : 0.750) : ((haveSteepLine) ? 0.750 : 0.125)) : 0.000);\n\
dst[ 1] = mix(dst[ 1], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
dst[21] = mix(dst[21], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 0.750 : ((haveShallowLine) ? 0.000 : 0.125)) : 0.000);\n\
dst[22] = mix(dst[22], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[21] = mix(dst[21], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.750 : 0.000);\n\
dst[22] = mix(dst[22], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.250 : 0.125)) : 0.000);\n\
dst[23] = mix(dst[23], blendPix, (needBlend) ? ((doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.875 : 1.000) : 0.2306749731) : 0.000);\n\
dst[24] = mix(dst[24], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.8631434088) : 0.000);\n\
dst[ 9] = mix(dst[ 9], blendPix, (needBlend) ? ((doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.875 : 1.000) : 0.2306749731) : 0.000);\n\
@ -3713,8 +3713,8 @@ static const char *Scaler5xBRZFragShader_110 = {"\
dst[ 5] = mix(dst[ 5], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[ 6] = mix(dst[ 6], blendPix, (needBlend && doLineBlend) ? ((haveShallowLine) ? ((haveSteepLine) ? 2.0/3.0 : 0.750) : ((haveSteepLine) ? 0.750 : 0.125)) : 0.000);\n\
dst[ 7] = mix(dst[ 7], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
dst[17] = mix(dst[17], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 0.750 : ((haveShallowLine) ? 0.000 : 0.125)) : 0.000);\n\
dst[18] = mix(dst[18], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[17] = mix(dst[17], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.750 : 0.000);\n\
dst[18] = mix(dst[18], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.250 : 0.125)) : 0.000);\n\
dst[19] = mix(dst[19], blendPix, (needBlend) ? ((doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.875 : 1.000) : 0.2306749731) : 0.000);\n\
dst[20] = mix(dst[20], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.8631434088) : 0.000);\n\
dst[21] = mix(dst[21], blendPix, (needBlend) ? ((doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.875 : 1.000) : 0.2306749731) : 0.000);\n\
@ -3738,8 +3738,8 @@ static const char *Scaler5xBRZFragShader_110 = {"\
dst[ 3] = mix(dst[ 3], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[ 4] = mix(dst[ 4], blendPix, (needBlend && doLineBlend) ? ((haveShallowLine) ? ((haveSteepLine) ? 2.0/3.0 : 0.750) : ((haveSteepLine) ? 0.750 : 0.125)) : 0.000);\n\
dst[ 5] = mix(dst[ 5], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
dst[13] = mix(dst[13], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 0.750 : ((haveShallowLine) ? 0.000 : 0.125)) : 0.000);\n\
dst[14] = mix(dst[14], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[13] = mix(dst[13], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.750 : 0.000);\n\
dst[14] = mix(dst[14], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.250 : 0.125)) : 0.000);\n\
dst[15] = mix(dst[15], blendPix, (needBlend) ? ((doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.875 : 1.000) : 0.2306749731) : 0.000);\n\
dst[16] = mix(dst[16], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.8631434088) : 0.000);\n\
dst[17] = mix(dst[17], blendPix, (needBlend) ? ((doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.875 : 1.000) : 0.2306749731) : 0.000);\n\
@ -3761,6 +3761,441 @@ static const char *Scaler5xBRZFragShader_110 = {"\
}\n\
"};
static const char *Scaler6xBRZFragShader_110 = {"\
#define BLEND_NONE 0\n\
#define BLEND_NORMAL 1\n\
#define BLEND_DOMINANT 2\n\
#define LUMINANCE_WEIGHT 1.0\n\
#define EQUAL_COLOR_TOLERANCE 30.0/255.0\n\
#define STEEP_DIRECTION_THRESHOLD 2.2\n\
#define DOMINANT_DIRECTION_THRESHOLD 3.6\n\
#define M_PI 3.1415926535897932384626433832795\n\
\n\
// Let's not even bother trying to support GPUs below Mid-tier.\n\
// The xBRZ pixel scalers are already pretty hefty as-is, and\n\
// this shader, having to calculate 25 pixel locations, is the\n\
// heftiest of all of them. Trust me -- older GPUs just can't\n\
// handle this one.\n\
\n\
VARYING vec2 texCoord[25];\n\
uniform sampler2DRect tex;\n\
\n\
float reduce(const vec3 color)\n\
{\n\
return dot(color, vec3(65536.0, 256.0, 1.0));\n\
}\n\
\n\
float DistYCbCr(const vec3 pixA, const vec3 pixB)\n\
{\n\
const vec3 w = vec3(0.2627, 0.6780, 0.0593);\n\
const float scaleB = 0.5 / (1.0 - w.b);\n\
const float scaleR = 0.5 / (1.0 - w.r);\n\
vec3 diff = pixA - pixB;\n\
float Y = dot(diff, w);\n\
float Cb = scaleB * (diff.b - Y);\n\
float Cr = scaleR * (diff.r - Y);\n\
\n\
return sqrt( ((LUMINANCE_WEIGHT*Y) * (LUMINANCE_WEIGHT*Y)) + (Cb * Cb) + (Cr * Cr) );\n\
}\n\
\n\
bool IsPixEqual(const vec3 pixA, const vec3 pixB)\n\
{\n\
return (DistYCbCr(pixA, pixB) < EQUAL_COLOR_TOLERANCE);\n\
}\n\
\n\
bool IsBlendingNeeded(const ivec4 blend)\n\
{\n\
return any(notEqual(blend, ivec4(BLEND_NONE)));\n\
}\n\
\n\
/*\n\
// Let's keep xBRZ's original blending logic around for reference.\n\
void ScalePixel(const ivec4 blend, const vec3 k[9], inout vec3 dst[25])\n\
{\n\
if (blend[2] == BLEND_NONE)\n\
{\n\
return;\n\
}\n\
\n\
vec3 blendPix = ( DistYCbCr(k[0], k[1]) <= DistYCbCr(k[0], k[3]) ) ? k[1] : k[3];\n\
\n\
if ( DoLineBlend(blend, k) )\n\
{\n\
float v0 = reduce(k[0]);\n\
float v4 = reduce(k[4]);\n\
float v5 = reduce(k[5]);\n\
float v7 = reduce(k[7]);\n\
float v8 = reduce(k[8]);\n\
\n\
float dist_01_04 = DistYCbCr(k[1], k[4]);\n\
float dist_03_08 = DistYCbCr(k[3], k[8]);\n\
bool haveShallowLine = (STEEP_DIRECTION_THRESHOLD * dist_01_04 <= dist_03_08) && (v0 != v4) && (v5 != v4);\n\
bool haveSteepLine = (STEEP_DIRECTION_THRESHOLD * dist_03_08 <= dist_01_04) && (v0 != v8) && (v7 != v8);\n\
\n\
if (haveShallowLine)\n\
{\n\
if (haveSteepLine)\n\
{\n\
// Blend line steep and shallow\n\
dst[25] = mix(dst[25], blendPix, 0.25);\n\
dst[10] = mix(dst[10], blendPix, 0.25);\n\
dst[26] = mix(dst[26], blendPix, 0.75);\n\
dst[11] = mix(dst[11], blendPix, 0.75);\n\
dst[35] = mix(dst[35], blendPix, 0.25);\n\
dst[14] = mix(dst[14], blendPix, 0.25);\n\
dst[34] = mix(dst[34], blendPix, 0.75);\n\
dst[13] = mix(dst[13], blendPix, 0.75);\n\
dst[27] = mix(dst[27], blendPix, 1.00);\n\
dst[28] = mix(dst[28], blendPix, 1.00);\n\
dst[29] = mix(dst[29], blendPix, 1.00);\n\
dst[30] = mix(dst[30], blendPix, 1.00);\n\
dst[12] = mix(dst[12], blendPix, 1.00);\n\
dst[31] = mix(dst[31], blendPix, 1.00);\n\
dst[33] = mix(dst[33], blendPix, 1.00);\n\
dst[32] = mix(dst[32], blendPix, 1.00);\n\
}\n\
else\n\
{\n\
// Blend line shallow\n\
dst[35] = mix(dst[35], blendPix, 0.25);\n\
dst[14] = mix(dst[14], blendPix, 0.25);\n\
dst[11] = mix(dst[11], blendPix, 0.25);\n\
dst[34] = mix(dst[34], blendPix, 0.75);\n\
dst[13] = mix(dst[13], blendPix, 0.75);\n\
dst[28] = mix(dst[28], blendPix, 0.75);\n\
dst[33] = mix(dst[33], blendPix, 1.00);\n\
dst[32] = mix(dst[32], blendPix, 1.00);\n\
dst[31] = mix(dst[31], blendPix, 1.00);\n\
dst[30] = mix(dst[30], blendPix, 1.00);\n\
dst[12] = mix(dst[12], blendPix, 1.00);\n\
dst[29] = mix(dst[29], blendPix, 1.00);\n\
}\n\
}\n\
else\n\
{\n\
if (haveSteepLine)\n\
{\n\
// Blend line steep\n\
dst[25] = mix(dst[25], blendPix, 0.25);\n\
dst[10] = mix(dst[10], blendPix, 0.25);\n\
dst[13] = mix(dst[13], blendPix, 0.25);\n\
dst[26] = mix(dst[26], blendPix, 0.75);\n\
dst[11] = mix(dst[11], blendPix, 0.75);\n\
dst[32] = mix(dst[32], blendPix, 0.75);\n\
dst[27] = mix(dst[27], blendPix, 1.00);\n\
dst[28] = mix(dst[28], blendPix, 1.00);\n\
dst[29] = mix(dst[29], blendPix, 1.00);\n\
dst[30] = mix(dst[30], blendPix, 1.00);\n\
dst[12] = mix(dst[12], blendPix, 1.00);\n\
dst[31] = mix(dst[31], blendPix, 1.00);\n\
}\n\
else\n\
{\n\
// Blend line diagonal\n\
dst[32] = mix(dst[32], blendPix, 0.50);\n\
dst[12] = mix(dst[12], blendPix, 0.50);\n\
dst[28] = mix(dst[28], blendPix, 0.50);\n\
dst[29] = mix(dst[29], blendPix, 1.00);\n\
dst[30] = mix(dst[30], blendPix, 1.00);\n\
dst[31] = mix(dst[31], blendPix, 1.00);\n\
}\n\
}\n\
}\n\
else\n\
{\n\
// Blend corner\n\
dst[30] = mix(dst[30], blendPix, 0.9711013910);\n\
dst[29] = mix(dst[29], blendPix, 0.4236372243);\n\
dst[31] = mix(dst[31], blendPix, 0.4236372243);\n\
dst[32] = mix(dst[32], blendPix, 0.05652034508);\n\
dst[28] = mix(dst[28], blendPix, 0.05652034508);\n\
}\n\
}\n\
*/\n\
//---------------------------------------\n\
// Input Pixel Mapping: --|21|22|23|--\n\
// 19|06|07|08|09\n\
// 18|05|00|01|10\n\
// 17|04|03|02|11\n\
// --|15|14|13|--\n\
//\n\
// Output Pixel Mapping: 20|21|22|23|24|25\n\
// 19|06|07|08|09|26\n\
// 18|05|00|01|10|27\n\
// 17|04|03|02|11|28\n\
// 16|15|14|13|12|29\n\
// 35|34|33|32|31|30\n\
\n\
void main()\n\
{\n\
vec3 src[25];\n\
src[ 0] = SAMPLE3_TEX_RECT(tex, texCoord[ 0]).rgb;\n\
src[ 1] = SAMPLE3_TEX_RECT(tex, texCoord[ 1]).rgb;\n\
src[ 2] = SAMPLE3_TEX_RECT(tex, texCoord[ 2]).rgb;\n\
src[ 3] = SAMPLE3_TEX_RECT(tex, texCoord[ 3]).rgb;\n\
src[ 4] = SAMPLE3_TEX_RECT(tex, texCoord[ 4]).rgb;\n\
src[ 5] = SAMPLE3_TEX_RECT(tex, texCoord[ 5]).rgb;\n\
src[ 6] = SAMPLE3_TEX_RECT(tex, texCoord[ 6]).rgb;\n\
src[ 7] = SAMPLE3_TEX_RECT(tex, texCoord[ 7]).rgb;\n\
src[ 8] = SAMPLE3_TEX_RECT(tex, texCoord[ 8]).rgb;\n\
src[ 9] = SAMPLE3_TEX_RECT(tex, texCoord[ 9]).rgb;\n\
src[10] = SAMPLE3_TEX_RECT(tex, texCoord[10]).rgb;\n\
src[11] = SAMPLE3_TEX_RECT(tex, texCoord[11]).rgb;\n\
src[12] = SAMPLE3_TEX_RECT(tex, texCoord[12]).rgb;\n\
src[13] = SAMPLE3_TEX_RECT(tex, texCoord[13]).rgb;\n\
src[14] = SAMPLE3_TEX_RECT(tex, texCoord[14]).rgb;\n\
src[15] = SAMPLE3_TEX_RECT(tex, texCoord[15]).rgb;\n\
src[16] = SAMPLE3_TEX_RECT(tex, texCoord[16]).rgb;\n\
src[17] = SAMPLE3_TEX_RECT(tex, texCoord[17]).rgb;\n\
src[18] = SAMPLE3_TEX_RECT(tex, texCoord[18]).rgb;\n\
src[19] = SAMPLE3_TEX_RECT(tex, texCoord[19]).rgb;\n\
src[20] = SAMPLE3_TEX_RECT(tex, texCoord[20]).rgb;\n\
src[21] = SAMPLE3_TEX_RECT(tex, texCoord[21]).rgb;\n\
src[22] = SAMPLE3_TEX_RECT(tex, texCoord[22]).rgb;\n\
src[23] = SAMPLE3_TEX_RECT(tex, texCoord[23]).rgb;\n\
src[24] = SAMPLE3_TEX_RECT(tex, texCoord[24]).rgb;\n\
\n\
float v[9];\n\
v[0] = reduce(src[0]);\n\
v[1] = reduce(src[1]);\n\
v[2] = reduce(src[2]);\n\
v[3] = reduce(src[3]);\n\
v[4] = reduce(src[4]);\n\
v[5] = reduce(src[5]);\n\
v[6] = reduce(src[6]);\n\
v[7] = reduce(src[7]);\n\
v[8] = reduce(src[8]);\n\
\n\
ivec4 blendResult = ivec4(BLEND_NONE);\n\
\n\
// Preprocess corners\n\
// Pixel Tap Mapping: --|--|--|--|--\n\
// --|--|07|08|--\n\
// --|05|00|01|10\n\
// --|04|03|02|11\n\
// --|--|14|13|--\n\
\n\
// Corner (1, 1)\n\
if ( !((v[0] == v[1] && v[3] == v[2]) || (v[0] == v[3] && v[1] == v[2])) )\n\
{\n\
float dist_03_01 = DistYCbCr(src[ 4], src[ 0]) + DistYCbCr(src[ 0], src[ 8]) + DistYCbCr(src[14], src[ 2]) + DistYCbCr(src[ 2], src[10]) + (4.0 * DistYCbCr(src[ 3], src[ 1]));\n\
float dist_00_02 = DistYCbCr(src[ 5], src[ 3]) + DistYCbCr(src[ 3], src[13]) + DistYCbCr(src[ 7], src[ 1]) + DistYCbCr(src[ 1], src[11]) + (4.0 * DistYCbCr(src[ 0], src[ 2]));\n\
bool dominantGradient = (DOMINANT_DIRECTION_THRESHOLD * dist_03_01) < dist_00_02;\n\
blendResult[2] = ((dist_03_01 < dist_00_02) && (v[0] != v[1]) && (v[0] != v[3])) ? ((dominantGradient) ? BLEND_DOMINANT : BLEND_NORMAL) : BLEND_NONE;\n\
}\n\
\n\
\n\
// Pixel Tap Mapping: --|--|--|--|--\n\
// --|06|07|--|--\n\
// 18|05|00|01|--\n\
// 17|04|03|02|--\n\
// --|15|14|--|--\n\
// Corner (0, 1)\n\
if ( !((v[5] == v[0] && v[4] == v[3]) || (v[5] == v[4] && v[0] == v[3])) )\n\
{\n\
float dist_04_00 = DistYCbCr(src[17], src[ 5]) + DistYCbCr(src[ 5], src[ 7]) + DistYCbCr(src[15], src[ 3]) + DistYCbCr(src[ 3], src[ 1]) + (4.0 * DistYCbCr(src[ 4], src[ 0]));\n\
float dist_05_03 = DistYCbCr(src[18], src[ 4]) + DistYCbCr(src[ 4], src[14]) + DistYCbCr(src[ 6], src[ 0]) + DistYCbCr(src[ 0], src[ 2]) + (4.0 * DistYCbCr(src[ 5], src[ 3]));\n\
bool dominantGradient = (DOMINANT_DIRECTION_THRESHOLD * dist_05_03) < dist_04_00;\n\
blendResult[3] = ((dist_04_00 > dist_05_03) && (v[0] != v[5]) && (v[0] != v[3])) ? ((dominantGradient) ? BLEND_DOMINANT : BLEND_NORMAL) : BLEND_NONE;\n\
}\n\
\n\
// Pixel Tap Mapping: --|--|22|23|--\n\
// --|06|07|08|09\n\
// --|05|00|01|10\n\
// --|--|03|02|--\n\
// --|--|--|--|--\n\
// Corner (1, 0)\n\
if ( !((v[7] == v[8] && v[0] == v[1]) || (v[7] == v[0] && v[8] == v[1])) )\n\
{\n\
float dist_00_08 = DistYCbCr(src[ 5], src[ 7]) + DistYCbCr(src[ 7], src[23]) + DistYCbCr(src[ 3], src[ 1]) + DistYCbCr(src[ 1], src[ 9]) + (4.0 * DistYCbCr(src[ 0], src[ 8]));\n\
float dist_07_01 = DistYCbCr(src[ 6], src[ 0]) + DistYCbCr(src[ 0], src[ 2]) + DistYCbCr(src[22], src[ 8]) + DistYCbCr(src[ 8], src[10]) + (4.0 * DistYCbCr(src[ 7], src[ 1]));\n\
bool dominantGradient = (DOMINANT_DIRECTION_THRESHOLD * dist_07_01) < dist_00_08;\n\
blendResult[1] = ((dist_00_08 > dist_07_01) && (v[0] != v[7]) && (v[0] != v[1])) ? ((dominantGradient) ? BLEND_DOMINANT : BLEND_NORMAL) : BLEND_NONE;\n\
}\n\
\n\
// Pixel Tap Mapping: --|21|22|--|--\n\
// 19|06|07|08|--\n\
// 18|05|00|01|--\n\
// --|04|03|--|--\n\
// --|--|--|--|--\n\
// Corner (0, 0)\n\
if ( !((v[6] == v[7] && v[5] == v[0]) || (v[6] == v[5] && v[7] == v[0])) )\n\
{\n\
float dist_05_07 = DistYCbCr(src[18], src[ 6]) + DistYCbCr(src[ 6], src[22]) + DistYCbCr(src[ 4], src[ 0]) + DistYCbCr(src[ 0], src[ 8]) + (4.0 * DistYCbCr(src[ 5], src[ 7]));\n\
float dist_06_00 = DistYCbCr(src[19], src[ 5]) + DistYCbCr(src[ 5], src[ 3]) + DistYCbCr(src[21], src[ 7]) + DistYCbCr(src[ 7], src[ 1]) + (4.0 * DistYCbCr(src[ 6], src[ 0]));\n\
bool dominantGradient = (DOMINANT_DIRECTION_THRESHOLD * dist_05_07) < dist_06_00;\n\
blendResult[0] = ((dist_05_07 < dist_06_00) && (v[0] != v[5]) && (v[0] != v[7])) ? ((dominantGradient) ? BLEND_DOMINANT : BLEND_NORMAL) : BLEND_NONE;\n\
}\n\
\n\
vec3 dst[36];\n\
dst[ 0] = src[0];\n\
dst[ 1] = src[0];\n\
dst[ 2] = src[0];\n\
dst[ 3] = src[0];\n\
dst[ 4] = src[0];\n\
dst[ 5] = src[0];\n\
dst[ 6] = src[0];\n\
dst[ 7] = src[0];\n\
dst[ 8] = src[0];\n\
dst[ 9] = src[0];\n\
dst[10] = src[0];\n\
dst[11] = src[0];\n\
dst[12] = src[0];\n\
dst[13] = src[0];\n\
dst[14] = src[0];\n\
dst[15] = src[0];\n\
dst[16] = src[0];\n\
dst[17] = src[0];\n\
dst[18] = src[0];\n\
dst[19] = src[0];\n\
dst[20] = src[0];\n\
dst[21] = src[0];\n\
dst[22] = src[0];\n\
dst[23] = src[0];\n\
dst[24] = src[0];\n\
dst[25] = src[0];\n\
dst[26] = src[0];\n\
dst[27] = src[0];\n\
dst[28] = src[0];\n\
dst[29] = src[0];\n\
dst[30] = src[0];\n\
dst[31] = src[0];\n\
dst[32] = src[0];\n\
dst[33] = src[0];\n\
dst[34] = src[0];\n\
dst[35] = src[0];\n\
\n\
// Scale pixel\n\
if (IsBlendingNeeded(blendResult))\n\
{\n\
float dist_01_04 = DistYCbCr(src[1], src[4]);\n\
float dist_03_08 = DistYCbCr(src[3], src[8]);\n\
bool haveShallowLine = (STEEP_DIRECTION_THRESHOLD * dist_01_04 <= dist_03_08) && (v[0] != v[4]) && (v[5] != v[4]);\n\
bool haveSteepLine = (STEEP_DIRECTION_THRESHOLD * dist_03_08 <= dist_01_04) && (v[0] != v[8]) && (v[7] != v[8]);\n\
bool needBlend = (blendResult[2] != BLEND_NONE);\n\
bool doLineBlend = ( blendResult[2] >= BLEND_DOMINANT ||\n\
!((blendResult[1] != BLEND_NONE && !IsPixEqual(src[0], src[4])) ||\n\
(blendResult[3] != BLEND_NONE && !IsPixEqual(src[0], src[8])) ||\n\
(IsPixEqual(src[4], src[3]) && IsPixEqual(src[3], src[2]) && IsPixEqual(src[2], src[1]) && IsPixEqual(src[1], src[8]) && !IsPixEqual(src[0], src[2])) ) );\n\
\n\
vec3 blendPix = ( DistYCbCr(src[0], src[1]) <= DistYCbCr(src[0], src[3]) ) ? src[1] : src[3];\n\
dst[10] = mix(dst[10], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[11] = mix(dst[11], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 0.750 : ((haveShallowLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[12] = mix(dst[12], blendPix, (needBlend && doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.500 : 1.000) : 0.000);\n\
dst[13] = mix(dst[13], blendPix, (needBlend && doLineBlend) ? ((haveShallowLine) ? 0.750 : ((haveSteepLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[14] = mix(dst[14], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
dst[25] = mix(dst[25], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[26] = mix(dst[26], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.750 : 0.000);\n\
dst[27] = mix(dst[27], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 1.000 : 0.000);\n\
dst[28] = mix(dst[28], blendPix, (needBlend) ? ((doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.750 : 0.500)) : 0.05652034508) : 0.000);\n\
dst[29] = mix(dst[29], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.4236372243) : 0.000);\n\
dst[30] = mix(dst[30], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.9711013910) : 0.000);\n\
dst[31] = mix(dst[31], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.4236372243) : 0.000);\n\
dst[32] = mix(dst[32], blendPix, (needBlend) ? ((doLineBlend) ? ((haveShallowLine) ? 1.000 : ((haveSteepLine) ? 0.750 : 0.500)) : 0.05652034508) : 0.000);\n\
dst[33] = mix(dst[33], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 1.000 : 0.000);\n\
dst[34] = mix(dst[34], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.750 : 0.000);\n\
dst[35] = mix(dst[35], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
\n\
\n\
dist_01_04 = DistYCbCr(src[7], src[2]);\n\
dist_03_08 = DistYCbCr(src[1], src[6]);\n\
haveShallowLine = (STEEP_DIRECTION_THRESHOLD * dist_01_04 <= dist_03_08) && (v[0] != v[2]) && (v[3] != v[2]);\n\
haveSteepLine = (STEEP_DIRECTION_THRESHOLD * dist_03_08 <= dist_01_04) && (v[0] != v[6]) && (v[5] != v[6]);\n\
needBlend = (blendResult[1] != BLEND_NONE);\n\
doLineBlend = ( blendResult[1] >= BLEND_DOMINANT ||\n\
!((blendResult[0] != BLEND_NONE && !IsPixEqual(src[0], src[2])) ||\n\
(blendResult[2] != BLEND_NONE && !IsPixEqual(src[0], src[6])) ||\n\
(IsPixEqual(src[2], src[1]) && IsPixEqual(src[1], src[8]) && IsPixEqual(src[8], src[7]) && IsPixEqual(src[7], src[6]) && !IsPixEqual(src[0], src[8])) ) );\n\
\n\
blendPix = ( DistYCbCr(src[0], src[7]) <= DistYCbCr(src[0], src[1]) ) ? src[7] : src[1];\n\
dst[ 7] = mix(dst[ 7], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[ 8] = mix(dst[ 8], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 0.750 : ((haveShallowLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[ 9] = mix(dst[ 9], blendPix, (needBlend && doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.500 : 1.000) : 0.000);\n\
dst[10] = mix(dst[10], blendPix, (needBlend && doLineBlend) ? ((haveShallowLine) ? 0.750 : ((haveSteepLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[11] = mix(dst[11], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
dst[20] = mix(dst[20], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[21] = mix(dst[21], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.750 : 0.000);\n\
dst[22] = mix(dst[22], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 1.000 : 0.000);\n\
dst[23] = mix(dst[23], blendPix, (needBlend) ? ((doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.750 : 0.500)) : 0.05652034508) : 0.000);\n\
dst[24] = mix(dst[24], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.4236372243) : 0.000);\n\
dst[25] = mix(dst[25], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.9711013910) : 0.000);\n\
dst[26] = mix(dst[26], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.4236372243) : 0.000);\n\
dst[27] = mix(dst[27], blendPix, (needBlend) ? ((doLineBlend) ? ((haveShallowLine) ? 1.000 : ((haveSteepLine) ? 0.750 : 0.500)) : 0.05652034508) : 0.000);\n\
dst[28] = mix(dst[28], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 1.000 : 0.000);\n\
dst[29] = mix(dst[29], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.750 : 0.000);\n\
dst[30] = mix(dst[30], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
\n\
\n\
dist_01_04 = DistYCbCr(src[5], src[8]);\n\
dist_03_08 = DistYCbCr(src[7], src[4]);\n\
haveShallowLine = (STEEP_DIRECTION_THRESHOLD * dist_01_04 <= dist_03_08) && (v[0] != v[8]) && (v[1] != v[8]);\n\
haveSteepLine = (STEEP_DIRECTION_THRESHOLD * dist_03_08 <= dist_01_04) && (v[0] != v[4]) && (v[3] != v[4]);\n\
needBlend = (blendResult[0] != BLEND_NONE);\n\
doLineBlend = ( blendResult[0] >= BLEND_DOMINANT ||\n\
!((blendResult[3] != BLEND_NONE && !IsPixEqual(src[0], src[8])) ||\n\
(blendResult[1] != BLEND_NONE && !IsPixEqual(src[0], src[4])) ||\n\
(IsPixEqual(src[8], src[7]) && IsPixEqual(src[7], src[6]) && IsPixEqual(src[6], src[5]) && IsPixEqual(src[5], src[4]) && !IsPixEqual(src[0], src[6])) ) );\n\
\n\
blendPix = ( DistYCbCr(src[0], src[5]) <= DistYCbCr(src[0], src[7]) ) ? src[5] : src[7];\n\
dst[ 4] = mix(dst[ 4], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[ 5] = mix(dst[ 5], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 0.750 : ((haveShallowLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[ 6] = mix(dst[ 6], blendPix, (needBlend && doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.500 : 1.000) : 0.000);\n\
dst[ 7] = mix(dst[ 7], blendPix, (needBlend && doLineBlend) ? ((haveShallowLine) ? 0.750 : ((haveSteepLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[ 8] = mix(dst[ 8], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
dst[35] = mix(dst[35], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[16] = mix(dst[16], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.750 : 0.000);\n\
dst[17] = mix(dst[17], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 1.000 : 0.000);\n\
dst[18] = mix(dst[18], blendPix, (needBlend) ? ((doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.750 : 0.500)) : 0.05652034508) : 0.000);\n\
dst[19] = mix(dst[19], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.4236372243) : 0.000);\n\
dst[20] = mix(dst[20], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.9711013910) : 0.000);\n\
dst[21] = mix(dst[21], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.4236372243) : 0.000);\n\
dst[22] = mix(dst[22], blendPix, (needBlend) ? ((doLineBlend) ? ((haveShallowLine) ? 1.000 : ((haveSteepLine) ? 0.750 : 0.500)) : 0.05652034508) : 0.000);\n\
dst[23] = mix(dst[23], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 1.000 : 0.000);\n\
dst[24] = mix(dst[24], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.750 : 0.000);\n\
dst[25] = mix(dst[25], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
\n\
\n\
dist_01_04 = DistYCbCr(src[3], src[6]);\n\
dist_03_08 = DistYCbCr(src[5], src[2]);\n\
haveShallowLine = (STEEP_DIRECTION_THRESHOLD * dist_01_04 <= dist_03_08) && (v[0] != v[6]) && (v[7] != v[6]);\n\
haveSteepLine = (STEEP_DIRECTION_THRESHOLD * dist_03_08 <= dist_01_04) && (v[0] != v[2]) && (v[1] != v[2]);\n\
needBlend = (blendResult[3] != BLEND_NONE);\n\
doLineBlend = ( blendResult[3] >= BLEND_DOMINANT ||\n\
!((blendResult[2] != BLEND_NONE && !IsPixEqual(src[0], src[6])) ||\n\
(blendResult[0] != BLEND_NONE && !IsPixEqual(src[0], src[2])) ||\n\
(IsPixEqual(src[6], src[5]) && IsPixEqual(src[5], src[4]) && IsPixEqual(src[4], src[3]) && IsPixEqual(src[3], src[2]) && !IsPixEqual(src[0], src[4])) ) );\n\
\n\
blendPix = ( DistYCbCr(src[0], src[3]) <= DistYCbCr(src[0], src[5]) ) ? src[3] : src[5];\n\
dst[13] = mix(dst[13], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[14] = mix(dst[14], blendPix, (needBlend && doLineBlend) ? ((haveSteepLine) ? 0.750 : ((haveShallowLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[15] = mix(dst[15], blendPix, (needBlend && doLineBlend) ? ((!haveShallowLine && !haveSteepLine) ? 0.500 : 1.000) : 0.000);\n\
dst[ 4] = mix(dst[ 4], blendPix, (needBlend && doLineBlend) ? ((haveShallowLine) ? 0.750 : ((haveSteepLine) ? 0.250 : 0.000)) : 0.000);\n\
dst[ 5] = mix(dst[ 5], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
dst[30] = mix(dst[30], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.250 : 0.000);\n\
dst[31] = mix(dst[31], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 0.750 : 0.000);\n\
dst[32] = mix(dst[32], blendPix, (needBlend && doLineBlend && haveSteepLine) ? 1.000 : 0.000);\n\
dst[33] = mix(dst[33], blendPix, (needBlend) ? ((doLineBlend) ? ((haveSteepLine) ? 1.000 : ((haveShallowLine) ? 0.750 : 0.500)) : 0.05652034508) : 0.000);\n\
dst[34] = mix(dst[34], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.4236372243) : 0.000);\n\
dst[35] = mix(dst[35], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.9711013910) : 0.000);\n\
dst[16] = mix(dst[16], blendPix, (needBlend) ? ((doLineBlend) ? 1.000 : 0.4236372243) : 0.000);\n\
dst[17] = mix(dst[17], blendPix, (needBlend) ? ((doLineBlend) ? ((haveShallowLine) ? 1.000 : ((haveSteepLine) ? 0.750 : 0.500)) : 0.05652034508) : 0.000);\n\
dst[18] = mix(dst[18], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 1.000 : 0.000);\n\
dst[19] = mix(dst[19], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.750 : 0.000);\n\
dst[20] = mix(dst[20], blendPix, (needBlend && doLineBlend && haveShallowLine) ? 0.250 : 0.000);\n\
}\n\
\n\
vec2 f = fract(texCoord[0]);\n\
OUT_FRAG_COLOR.rgb = mix( mix( mix( mix( mix( mix(dst[20], dst[21], step(0.16, f.x) ), dst[22], step(0.32, f.x) ), mix( mix(dst[23], dst[24], step(0.66, f.x) ), dst[25], step(0.83, f.x) ), step(0.50, f.x) ),\n\
mix( mix( mix(dst[19], dst[ 6], step(0.16, f.x) ), dst[ 7], step(0.32, f.x) ), mix( mix(dst[ 8], dst[ 9], step(0.66, f.x) ), dst[26], step(0.83, f.x) ), step(0.50, f.x) ), step(0.16, f.y) ),\n\
mix( mix( mix(dst[18], dst[ 5], step(0.16, f.x) ), dst[ 0], step(0.32, f.x) ), mix( mix(dst[ 1], dst[10], step(0.66, f.x) ), dst[27], step(0.83, f.x) ), step(0.50, f.x) ), step(0.32, f.y) ),\n\
mix( mix( mix( mix( mix(dst[17], dst[ 4], step(0.16, f.x) ), dst[ 3], step(0.32, f.x) ), mix( mix(dst[ 2], dst[11], step(0.66, f.x) ), dst[28], step(0.83, f.x) ), step(0.50, f.x) ),\n\
mix( mix( mix(dst[16], dst[15], step(0.16, f.x) ), dst[14], step(0.32, f.x) ), mix( mix(dst[13], dst[12], step(0.66, f.x) ), dst[29], step(0.83, f.x) ), step(0.50, f.x) ), step(0.66, f.y) ),\n\
mix( mix( mix(dst[35], dst[34], step(0.16, f.x) ), dst[33], step(0.32, f.x) ), mix( mix(dst[32], dst[31], step(0.66, f.x) ), dst[30], step(0.83, f.x) ), step(0.50, f.x) ), step(0.83, f.y) ),\n\
step(0.50, f.y) );\n\
OUT_FRAG_COLOR.a = 1.0;\n\
}\n\
"};
enum OGLVertexAttributeID
{
OGLVertexAttributeID_Position = 0,
@ -5561,6 +5996,19 @@ bool OGLImage::SetGPUPixelScalerOGL(const VideoFilterTypeID filterID)
break;
}
case VideoFilterTypeID_6xBRZ:
{
if (this->_shaderSupport >= ShaderSupport_MidTier)
{
shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample5x5_VertShader_110, Scaler6xBRZFragShader_110, _useShader150);
}
else
{
willUseShaderBasedPixelScaler = false;
}
break;
}
default:
willUseShaderBasedPixelScaler = false;
break;
@ -7313,6 +7761,19 @@ bool OGLDisplayLayer::SetGPUPixelScalerOGL(const VideoFilterTypeID filterID)
break;
}
case VideoFilterTypeID_6xBRZ:
{
if (this->_shaderSupport >= ShaderSupport_MidTier)
{
shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample5x5_VertShader_110, Scaler6xBRZFragShader_110, _useShader150);
}
else
{
willUseShaderBasedPixelScaler = false;
}
break;
}
default:
willUseShaderBasedPixelScaler = false;
break;

BIN
desmume/src/cocoa/translations/English.lproj/MainMenu.strings
View File

Binary file not shown.

1019
desmume/src/cocoa/translations/English.lproj/MainMenu.xib
View File

File diff suppressed because it is too large Load Diff