diff --git a/desmume/src/cocoa/DefaultUserPrefs.plist b/desmume/src/cocoa/DefaultUserPrefs.plist
index 101d8a702..072fcb44e 100644
--- a/desmume/src/cocoa/DefaultUserPrefs.plist
+++ b/desmume/src/cocoa/DefaultUserPrefs.plist
@@ -12,8 +12,12 @@
CoreControl_SpeedScalar
1
+ DisplayView_Deposterize
+
DisplayView_Mode
2
+ DisplayView_OutputFilter
+ 1
DisplayView_Rotation
0
DisplayView_ShowHUD
diff --git a/desmume/src/cocoa/OGLDisplayOutput.cpp b/desmume/src/cocoa/OGLDisplayOutput.cpp
index d0cae6392..7368021c5 100644
--- a/desmume/src/cocoa/OGLDisplayOutput.cpp
+++ b/desmume/src/cocoa/OGLDisplayOutput.cpp
@@ -22,7 +22,7 @@
// VERTEX SHADER FOR DISPLAY OUTPUT
-static const char *vertexProgram_100 = {"\
+static const char *Sample1x1OutputVertShader_100 = {"\
attribute vec2 inPosition; \n\
attribute vec2 inTexCoord0; \n\
\n\
@@ -30,7 +30,7 @@ static const char *vertexProgram_100 = {"\
uniform float scalar; \n\
uniform float angleDegrees; \n\
\n\
- varying vec2 vtxTexCoord; \n\
+ varying vec2 texCoord[1]; \n\
\n\
void main() \n\
{ \n\
@@ -45,20 +45,947 @@ static const char *vertexProgram_100 = {"\
mat2 scale = mat2( vec2(scalar, 0.0), \n\
vec2( 0.0, scalar)); \n\
\n\
- vtxTexCoord = inTexCoord0; \n\
- gl_Position = vec4(projection * rotation * scale * inPosition, 1.0, 1.0); \n\
+ texCoord[0] = inTexCoord0; \n\
+ gl_Position = vec4(projection * rotation * scale * inPosition, 0.0, 1.0);\n\
} \n\
"};
-// FRAGMENT SHADER FOR DISPLAY OUTPUT
-static const char *fragmentProgram_100 = {"\
- varying vec2 vtxTexCoord; \n\
- uniform sampler2D tex; \n\
+static const char *BicubicSample4x4Output_VertShader_110 = {"\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 06|07|08|09\n\
+ // 05|00|01|10\n\
+ // 04|03|02|11\n\
+ // 15|14|13|12\n\
\n\
- void main() \n\
- { \n\
- gl_FragColor = texture2D(tex, vtxTexCoord); \n\
- } \n\
+ attribute vec2 inPosition;\n\
+ attribute vec2 inTexCoord0;\n\
+ \n\
+ uniform vec2 viewSize; \n\
+ uniform float scalar; \n\
+ uniform float angleDegrees; \n\
+ \n\
+ varying vec2 texCoord[16];\n\
+ \n\
+ void main()\n\
+ {\n\
+ float angleRadians = radians(angleDegrees); \n\
+ \n\
+ mat2 projection = mat2( vec2(2.0/viewSize.x, 0.0), \n\
+ vec2( 0.0, 2.0/viewSize.y)); \n\
+ \n\
+ mat2 rotation = mat2( vec2(cos(angleRadians), -sin(angleRadians)), \n\
+ vec2(sin(angleRadians), cos(angleRadians))); \n\
+ \n\
+ mat2 scale = mat2( vec2(scalar, 0.0), \n\
+ vec2( 0.0, scalar)); \n\
+ \n\
+ vec2 xystart = floor(inTexCoord0 - 0.5) + 0.5;\n\
+ \n\
+ texCoord[ 6] = xystart + vec2(-1.0,-1.0);\n\
+ texCoord[ 7] = xystart + vec2( 0.0,-1.0);\n\
+ texCoord[ 8] = xystart + vec2( 1.0,-1.0);\n\
+ texCoord[ 9] = xystart + vec2( 2.0,-1.0);\n\
+ \n\
+ texCoord[ 5] = xystart + vec2(-1.0, 0.0);\n\
+ texCoord[ 0] = xystart + vec2( 0.0, 0.0); // Center pixel\n\
+ texCoord[ 1] = xystart + vec2( 1.0, 0.0);\n\
+ texCoord[10] = xystart + vec2( 2.0, 0.0);\n\
+ \n\
+ texCoord[ 4] = xystart + vec2(-1.0, 1.0);\n\
+ texCoord[ 3] = xystart + vec2( 0.0, 1.0);\n\
+ texCoord[ 2] = xystart + vec2( 1.0, 1.0);\n\
+ texCoord[11] = xystart + vec2( 2.0, 1.0);\n\
+ \n\
+ texCoord[15] = xystart + vec2(-1.0, 2.0);\n\
+ texCoord[14] = xystart + vec2( 0.0, 2.0);\n\
+ texCoord[13] = xystart + vec2( 1.0, 2.0);\n\
+ texCoord[12] = xystart + vec2( 2.0, 2.0);\n\
+ \n\
+ gl_Position = vec4(projection * rotation * scale * inPosition, 0.0, 1.0);\n\
+ }\n\
+"};
+
+// FRAGMENT SHADER FOR DISPLAY OUTPUT
+static const char *PassthroughOutputFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[1];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ void main()\n\
+ {\n\
+ gl_FragColor = texture2DRect(tex, texCoord[0]);\n\
+ }\n\
+"};
+
+// VERTEX SHADER FOR VIDEO FILTERS
+static const char *Sample1x1_VertShader_110 = {"\
+ // For reference, the pixels are mapped as follows:\n\
+ // Start at center pixel 0 (p0), and circle around it\n\
+ // in a clockwise fashion, starting from the right.\n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 20|21|22|23|24\n\
+ // 19|06|07|08|09\n\
+ // 18|05|00|01|10\n\
+ // 17|04|03|02|11\n\
+ // 16|15|14|13|12\n\
+ \n\
+ attribute vec2 inPosition;\n\
+ attribute vec2 inTexCoord0;\n\
+ varying vec2 texCoord[1];\n\
+ \n\
+ void main()\n\
+ {\n\
+ texCoord[0] = inTexCoord0;\n\
+ gl_Position = vec4(inPosition, 0.0, 1.0);\n\
+ }\n\
+"};
+
+static const char *Sample2x2_VertShader_110 = {"\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 00|01\n\
+ // 03|02\n\
+ \n\
+ attribute vec2 inPosition;\n\
+ attribute vec2 inTexCoord0;\n\
+ varying vec2 texCoord[4];\n\
+ \n\
+ void main()\n\
+ {\n\
+ texCoord[0] = inTexCoord0 + vec2( 0.0, 0.0); // Center pixel\n\
+ texCoord[1] = inTexCoord0 + vec2( 1.0, 0.0);\n\
+ texCoord[3] = inTexCoord0 + vec2( 0.0, 1.0);\n\
+ texCoord[2] = inTexCoord0 + vec2( 1.0, 1.0);\n\
+ \n\
+ gl_Position = vec4(inPosition, 0.0, 1.0);\n\
+ }\n\
+"};
+
+static const char *Sample3x3_VertShader_110 = {"\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 06|07|08\n\
+ // 05|00|01\n\
+ // 04|03|02\n\
+ \n\
+ attribute vec2 inPosition;\n\
+ attribute vec2 inTexCoord0;\n\
+ varying vec2 texCoord[9];\n\
+ \n\
+ void main()\n\
+ {\n\
+ texCoord[6] = inTexCoord0 + vec2(-1.0,-1.0);\n\
+ texCoord[7] = inTexCoord0 + vec2( 0.0,-1.0);\n\
+ texCoord[8] = inTexCoord0 + vec2( 1.0,-1.0);\n\
+ \n\
+ texCoord[5] = inTexCoord0 + vec2(-1.0, 0.0);\n\
+ texCoord[0] = inTexCoord0 + vec2( 0.0, 0.0); // Center pixel\n\
+ texCoord[1] = inTexCoord0 + vec2( 1.0, 0.0);\n\
+ \n\
+ texCoord[4] = inTexCoord0 + vec2(-1.0, 1.0);\n\
+ texCoord[3] = inTexCoord0 + vec2( 0.0, 1.0);\n\
+ texCoord[2] = inTexCoord0 + vec2( 1.0, 1.0);\n\
+ \n\
+ gl_Position = vec4(inPosition, 0.0, 1.0);\n\
+ }\n\
+"};
+
+static const char *Sample4x4_VertShader_110 = {"\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 06|07|08|09\n\
+ // 05|00|01|10\n\
+ // 04|03|02|11\n\
+ // 15|14|13|12\n\
+ \n\
+ attribute vec2 inPosition;\n\
+ attribute vec2 inTexCoord0;\n\
+ varying vec2 texCoord[16];\n\
+ \n\
+ void main()\n\
+ {\n\
+ texCoord[ 6] = inTexCoord0 + vec2(-1.0,-1.0);\n\
+ texCoord[ 7] = inTexCoord0 + vec2( 0.0,-1.0);\n\
+ texCoord[ 8] = inTexCoord0 + vec2( 1.0,-1.0);\n\
+ texCoord[ 9] = inTexCoord0 + vec2( 2.0,-1.0);\n\
+ \n\
+ texCoord[ 5] = inTexCoord0 + vec2(-1.0, 0.0);\n\
+ texCoord[ 0] = inTexCoord0 + vec2( 0.0, 0.0); // Center pixel\n\
+ texCoord[ 1] = inTexCoord0 + vec2( 1.0, 0.0);\n\
+ texCoord[10] = inTexCoord0 + vec2( 2.0, 0.0);\n\
+ \n\
+ texCoord[ 4] = inTexCoord0 + vec2(-1.0, 1.0);\n\
+ texCoord[ 3] = inTexCoord0 + vec2( 0.0, 1.0);\n\
+ texCoord[ 2] = inTexCoord0 + vec2( 1.0, 1.0);\n\
+ texCoord[11] = inTexCoord0 + vec2( 2.0, 1.0);\n\
+ \n\
+ texCoord[15] = inTexCoord0 + vec2(-1.0, 2.0);\n\
+ texCoord[14] = inTexCoord0 + vec2( 0.0, 2.0);\n\
+ texCoord[13] = inTexCoord0 + vec2( 1.0, 2.0);\n\
+ texCoord[12] = inTexCoord0 + vec2( 2.0, 2.0);\n\
+ \n\
+ gl_Position = vec4(inPosition, 0.0, 1.0);\n\
+ }\n\
+"};
+
+// FRAGMENT SHADER PASSTHROUGH FOR FILTERS
+static const char *PassthroughFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[1];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ void main()\n\
+ {\n\
+ gl_FragColor = texture2DRect(tex, texCoord[0]);\n\
+ }\n\
+"};
+
+// FRAGMENT SHADER FOR DEPOSTERIZATION
+static const char *FilterDeposterizeFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[9];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ vec4 InterpLTE(vec4 pixA, vec4 pixB, vec4 threshold)\n\
+ {\n\
+ vec4 interpPix = mix(pixA, pixB, 0.5);\n\
+ vec4 pixCompare = vec4( lessThanEqual(abs(pixB - pixA), threshold) );\n\
+ \n\
+ return mix(pixA, interpPix, pixCompare);\n\
+ }\n\
+ \n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: --|07|--\n\
+ // 05|00|01\n\
+ // --|03|--\n\
+ //\n\
+ // Output Pixel Mapping: A\n\
+ \n\
+ void main()\n\
+ {\n\
+ const vec4 threshold = vec4(0.0355);\n\
+ vec4 pU = texture2DRect(tex, texCoord[7]);\n\
+ vec4 pL = texture2DRect(tex, texCoord[5]);\n\
+ vec4 pC = texture2DRect(tex, texCoord[0]); // Center pixel\n\
+ vec4 pR = texture2DRect(tex, texCoord[1]);\n\
+ vec4 pD = texture2DRect(tex, texCoord[3]);\n\
+ \n\
+ vec4 tempL = InterpLTE(pC, pL, threshold);\n\
+ vec4 tempR = InterpLTE(pC, pR, threshold);\n\
+ vec4 tempU = InterpLTE(pC, pU, threshold);\n\
+ vec4 tempD = InterpLTE(pC, pD, threshold);\n\
+ \n\
+ gl_FragColor = mix( mix(tempL, tempR, 0.5), mix(tempU, tempD, 0.5), 0.5 );\n\
+ }\n\
+"};
+
+static const char *FilterBicubicBSplineFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[16];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ vec4 WeightBSpline(float f)\n\
+ {\n\
+ return vec4(pow((1.0 - f), 3.0) / 6.0,\n\
+ (4.0 - 6.0*f*f + 3.0*f*f*f) / 6.0,\n\
+ (1.0 + 3.0*f + 3.0*f*f - 3.0*f*f*f) / 6.0,\n\
+ f*f*f / 6.0);\n\
+ }\n\
+ \n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 06|07|08|09\n\
+ // 05|00|01|10\n\
+ // 04|03|02|11\n\
+ // 15|14|13|12\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 f = fract(texCoord[0]);\n\
+ vec4 wx = WeightBSpline(f.x);\n\
+ vec4 wy = WeightBSpline(f.y);\n\
+ \n\
+ // Normalize weights\n\
+ wx /= dot(wx, vec4(1.0));\n\
+ wy /= dot(wy, vec4(1.0));\n\
+ \n\
+ gl_FragColor = (texture2DRect(tex, texCoord[ 6]) * wx.r\n\
+ + texture2DRect(tex, texCoord[ 7]) * wx.g\n\
+ + texture2DRect(tex, texCoord[ 8]) * wx.b\n\
+ + texture2DRect(tex, texCoord[ 9]) * wx.a) * wy.r\n\
+ + (texture2DRect(tex, texCoord[ 5]) * wx.r\n\
+ + texture2DRect(tex, texCoord[ 0]) * wx.g\n\
+ + texture2DRect(tex, texCoord[ 1]) * wx.b\n\
+ + texture2DRect(tex, texCoord[10]) * wx.a) * wy.g\n\
+ + (texture2DRect(tex, texCoord[ 4]) * wx.r\n\
+ + texture2DRect(tex, texCoord[ 3]) * wx.g\n\
+ + texture2DRect(tex, texCoord[ 2]) * wx.b\n\
+ + texture2DRect(tex, texCoord[11]) * wx.a) * wy.b\n\
+ + (texture2DRect(tex, texCoord[15]) * wx.r\n\
+ + texture2DRect(tex, texCoord[14]) * wx.g\n\
+ + texture2DRect(tex, texCoord[13]) * wx.b\n\
+ + texture2DRect(tex, texCoord[12]) * wx.a) * wy.a;\n\
+ }\n\
+"};
+
+static const char *FilterBicubicBSplineFastFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[1];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 texCenterPosition = floor(texCoord[0] - 0.5) + 0.5;\n\
+ vec2 f = abs(texCoord[0] - texCenterPosition);\n\
+ \n\
+ vec2 w0 = pow((1.0 - f), vec2(3.0, 3.0)) / 6.0;\n\
+ vec2 w1 = (4.0 - 6.0*f*f + 3.0*f*f*f) / 6.0;\n\
+ vec2 w3 = f*f*f / 6.0;\n\
+ vec2 w2 = 1.0 - w0 - w1 - w3;\n\
+ \n\
+ vec2 s0 = w0 + w1;\n\
+ vec2 s1 = w2 + w3;\n\
+ \n\
+ vec2 t0 = texCenterPosition - 1.0 + (w1 / s0);\n\
+ vec2 t1 = texCenterPosition + 1.0 + (w3 / s1);\n\
+ \n\
+ gl_FragColor = (texture2DRect(tex, vec2(t0.x, t0.y)) * s0.x +\n\
+ texture2DRect(tex, vec2(t1.x, t0.y)) * s1.x) * s0.y +\n\
+ (texture2DRect(tex, vec2(t0.x, t1.y)) * s0.x +\n\
+ texture2DRect(tex, vec2(t1.x, t1.y)) * s1.x) * s1.y;\n\
+ }\n\
+"};
+
+static const char *FilterBicubicMitchellNetravaliFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[16];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ vec4 WeightMitchellNetravali(float f)\n\
+ {\n\
+ return vec4((1.0 - 9.0*f + 15.0*f*f - 7.0*f*f*f) / 18.0,\n\
+ (16.0 - 36.0*f*f + 21.0*f*f*f) / 18.0,\n\
+ (1.0 + 9.0*f + 27.0*f*f - 21.0*f*f*f) / 18.0,\n\
+ (7.0*f*f*f - 6.0*f*f) / 18.0);\n\
+ }\n\
+ \n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 06|07|08|09\n\
+ // 05|00|01|10\n\
+ // 04|03|02|11\n\
+ // 15|14|13|12\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 f = fract(texCoord[0]);\n\
+ vec4 wx = WeightMitchellNetravali(f.x);\n\
+ vec4 wy = WeightMitchellNetravali(f.y);\n\
+ \n\
+ // Normalize weights\n\
+ wx /= dot(wx, vec4(1.0));\n\
+ wy /= dot(wy, vec4(1.0));\n\
+ \n\
+ gl_FragColor = (texture2DRect(tex, texCoord[ 6]) * wx.r\n\
+ + texture2DRect(tex, texCoord[ 7]) * wx.g\n\
+ + texture2DRect(tex, texCoord[ 8]) * wx.b\n\
+ + texture2DRect(tex, texCoord[ 9]) * wx.a) * wy.r\n\
+ + (texture2DRect(tex, texCoord[ 5]) * wx.r\n\
+ + texture2DRect(tex, texCoord[ 0]) * wx.g\n\
+ + texture2DRect(tex, texCoord[ 1]) * wx.b\n\
+ + texture2DRect(tex, texCoord[10]) * wx.a) * wy.g\n\
+ + (texture2DRect(tex, texCoord[ 4]) * wx.r\n\
+ + texture2DRect(tex, texCoord[ 3]) * wx.g\n\
+ + texture2DRect(tex, texCoord[ 2]) * wx.b\n\
+ + texture2DRect(tex, texCoord[11]) * wx.a) * wy.b\n\
+ + (texture2DRect(tex, texCoord[15]) * wx.r\n\
+ + texture2DRect(tex, texCoord[14]) * wx.g\n\
+ + texture2DRect(tex, texCoord[13]) * wx.b\n\
+ + texture2DRect(tex, texCoord[12]) * wx.a) * wy.a;\n\
+ }\n\
+"};
+
+static const char *FilterBicubicMitchellNetravaliFastFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[1];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 texCenterPosition = floor(texCoord[0] - 0.5) + 0.5;\n\
+ vec2 f = abs(texCoord[0] - texCenterPosition);\n\
+ \n\
+ vec2 w0 = (1.0 - 9.0*f + 15.0*f*f - 7.0*f*f*f) / 18.0;\n\
+ vec2 w1 = (16.0 - 36.0*f*f + 21.0*f*f*f) / 18.0;\n\
+ vec2 w3 = (7.0*f*f*f - 6.0*f*f) / 18.0;\n\
+ vec2 w2 = 1.0 - w0 - w1 - w3;\n\
+ \n\
+ vec2 s0 = w0 + w1;\n\
+ vec2 s1 = w2 + w3;\n\
+ \n\
+ vec2 t0 = texCenterPosition - 1.0 + (w1 / s0);\n\
+ vec2 t1 = texCenterPosition + 1.0 + (w3 / s1);\n\
+ \n\
+ gl_FragColor = (texture2DRect(tex, vec2(t0.x, t0.y)) * s0.x +\n\
+ texture2DRect(tex, vec2(t1.x, t0.y)) * s1.x) * s0.y +\n\
+ (texture2DRect(tex, vec2(t0.x, t1.y)) * s0.x +\n\
+ texture2DRect(tex, vec2(t1.x, t1.y)) * s1.x) * s1.y;\n\
+ }\n\
+"};
+
+static const char *FilterLanczos2FragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ #define PI 3.1415926535897932384626433832795\n\
+ #define RADIUS 2.0\n\
+ #define FIX(c) max(abs(c), 1e-5)\n\
+ \n\
+ varying vec2 texCoord[16];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ vec4 WeightLanczos2(float f)\n\
+ {\n\
+ vec4 sample = FIX(PI * vec4(1.0 + f, f, 1.0 - f, 2.0 - f));\n\
+ return ( sin(sample) * sin(sample / RADIUS) / (sample * sample) );\n\
+ }\n\
+ \n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 06|07|08|09\n\
+ // 05|00|01|10\n\
+ // 04|03|02|11\n\
+ // 15|14|13|12\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 f = fract(texCoord[0]);\n\
+ vec4 wx = WeightLanczos2(f.x);\n\
+ vec4 wy = WeightLanczos2(f.y);\n\
+ \n\
+ // Normalize weights\n\
+ wx /= dot(wx, vec4(1.0));\n\
+ wy /= dot(wy, vec4(1.0));\n\
+ \n\
+ gl_FragColor = (texture2DRect(tex, texCoord[ 6]) * wx.r\n\
+ + texture2DRect(tex, texCoord[ 7]) * wx.g\n\
+ + texture2DRect(tex, texCoord[ 8]) * wx.b\n\
+ + texture2DRect(tex, texCoord[ 9]) * wx.a) * wy.r\n\
+ + (texture2DRect(tex, texCoord[ 5]) * wx.r\n\
+ + texture2DRect(tex, texCoord[ 0]) * wx.g\n\
+ + texture2DRect(tex, texCoord[ 1]) * wx.b\n\
+ + texture2DRect(tex, texCoord[10]) * wx.a) * wy.g\n\
+ + (texture2DRect(tex, texCoord[ 4]) * wx.r\n\
+ + texture2DRect(tex, texCoord[ 3]) * wx.g\n\
+ + texture2DRect(tex, texCoord[ 2]) * wx.b\n\
+ + texture2DRect(tex, texCoord[11]) * wx.a) * wy.b\n\
+ + (texture2DRect(tex, texCoord[15]) * wx.r\n\
+ + texture2DRect(tex, texCoord[14]) * wx.g\n\
+ + texture2DRect(tex, texCoord[13]) * wx.b\n\
+ + texture2DRect(tex, texCoord[12]) * wx.a) * wy.a;\n\
+ }\n\
+"};
+
+static const char *FilterLanczos3FragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ #define PI 3.1415926535897932384626433832795\n\
+ #define RADIUS 3.0\n\
+ #define FIX(c) max(abs(c), 1e-5)\n\
+ \n\
+ // It would be nice to pass all 36 sample coordinates to the fragment\n\
+ // shader, but since I want this to work on older GPUs, passing 36\n\
+ // coordinates would result in 72 varying floats. Since most older GPUs\n\
+ // can't support that many varying floats, I'm only going to pass the\n\
+ // center coordinate, and then calculate the other sample coordinates\n\
+ // from within the fragment shader.\n\
+ //\n\
+ // Note that sampling in this manner causes 36 dependent texel reads,\n\
+ // which may incur a performance penalty. However, I think that having\n\
+ // compatibility is better in this case, since any newer GPU (most from\n\
+ // 2008 and later) will be fast enough to overcome the penalty.\n\
+ \n\
+ varying vec2 texCoord[1];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ vec3 weight3(float x)\n\
+ {\n\
+ vec3 sample = FIX(2.0 * PI * vec3(x - 1.5, x - 0.5, x + 0.5));\n\
+ return ( sin(sample) * sin(sample / RADIUS) / (sample * sample) );\n\
+ }\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 tc = floor(texCoord[0] - 0.5) + 0.5;\n\
+ vec2 f = abs(texCoord[0] - tc);\n\
+ vec3 wx1 = weight3(0.5 - f.x * 0.5);\n\
+ vec3 wx2 = weight3(1.0 - f.x * 0.5);\n\
+ vec3 wy1 = weight3(0.5 - f.y * 0.5);\n\
+ vec3 wy2 = weight3(1.0 - f.y * 0.5);\n\
+ \n\
+ // Normalize weights\n\
+ float sumX = dot(wx1, vec3(1.0)) + dot(wx2, vec3(1.0));\n\
+ float sumY = dot(wy1, vec3(1.0)) + dot(wy2, vec3(1.0));\n\
+ wx1 /= sumX;\n\
+ wx2 /= sumX;\n\
+ wy1 /= sumY;\n\
+ wy2 /= sumY;\n\
+ \n\
+ gl_FragColor = (texture2DRect(tex, tc + vec2(-2.0,-2.0)) * wx1.r\n\
+ + texture2DRect(tex, tc + vec2(-1.0,-2.0)) * wx2.r\n\
+ + texture2DRect(tex, tc + vec2( 0.0,-2.0)) * wx1.g\n\
+ + texture2DRect(tex, tc + vec2( 1.0,-2.0)) * wx2.g\n\
+ + texture2DRect(tex, tc + vec2( 2.0,-2.0)) * wx1.b\n\
+ + texture2DRect(tex, tc + vec2( 3.0,-2.0)) * wx2.b) * wy1.r\n\
+ + (texture2DRect(tex, tc + vec2(-2.0,-1.0)) * wx1.r\n\
+ + texture2DRect(tex, tc + vec2(-1.0,-1.0)) * wx2.r\n\
+ + texture2DRect(tex, tc + vec2( 0.0,-1.0)) * wx1.g\n\
+ + texture2DRect(tex, tc + vec2( 1.0,-1.0)) * wx2.g\n\
+ + texture2DRect(tex, tc + vec2( 2.0,-1.0)) * wx1.b\n\
+ + texture2DRect(tex, tc + vec2( 3.0,-1.0)) * wx2.b) * wy2.r\n\
+ + (texture2DRect(tex, tc + vec2(-2.0, 0.0)) * wx1.r\n\
+ + texture2DRect(tex, tc + vec2(-1.0, 0.0)) * wx2.r\n\
+ + texture2DRect(tex, tc + vec2( 0.0, 0.0)) * wx1.g\n\
+ + texture2DRect(tex, tc + vec2( 1.0, 0.0)) * wx2.g\n\
+ + texture2DRect(tex, tc + vec2( 2.0, 0.0)) * wx1.b\n\
+ + texture2DRect(tex, tc + vec2( 3.0, 0.0)) * wx2.b) * wy1.g\n\
+ + (texture2DRect(tex, tc + vec2(-2.0, 1.0)) * wx1.r\n\
+ + texture2DRect(tex, tc + vec2(-1.0, 1.0)) * wx2.r\n\
+ + texture2DRect(tex, tc + vec2( 0.0, 1.0)) * wx1.g\n\
+ + texture2DRect(tex, tc + vec2( 1.0, 1.0)) * wx2.g\n\
+ + texture2DRect(tex, tc + vec2( 2.0, 1.0)) * wx1.b\n\
+ + texture2DRect(tex, tc + vec2( 3.0, 1.0)) * wx2.b) * wy2.g\n\
+ + (texture2DRect(tex, tc + vec2(-2.0, 2.0)) * wx1.r\n\
+ + texture2DRect(tex, tc + vec2(-1.0, 2.0)) * wx2.r\n\
+ + texture2DRect(tex, tc + vec2( 0.0, 2.0)) * wx1.g\n\
+ + texture2DRect(tex, tc + vec2( 1.0, 2.0)) * wx2.g\n\
+ + texture2DRect(tex, tc + vec2( 2.0, 2.0)) * wx1.b\n\
+ + texture2DRect(tex, tc + vec2( 3.0, 2.0)) * wx2.b) * wy1.b\n\
+ + (texture2DRect(tex, tc + vec2(-2.0, 3.0)) * wx1.r\n\
+ + texture2DRect(tex, tc + vec2(-1.0, 3.0)) * wx2.r\n\
+ + texture2DRect(tex, tc + vec2( 0.0, 3.0)) * wx1.g\n\
+ + texture2DRect(tex, tc + vec2( 1.0, 3.0)) * wx2.g\n\
+ + texture2DRect(tex, tc + vec2( 2.0, 3.0)) * wx1.b\n\
+ + texture2DRect(tex, tc + vec2( 3.0, 3.0)) * wx2.b) * wy2.b;\n\
+ }\n\
+"};
+
+static const char *Scalar2xScanlineFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[1];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 00\n\
+ //\n\
+ // Output Pixel Mapping: A|B\n\
+ // C|D\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 f = step(0.5, fract(texCoord[0]));\n\
+ vec4 outA = texture2DRect(tex, texCoord[0]) * vec4(1.000, 1.000, 1.000, 1.000);\n\
+ vec4 outB = texture2DRect(tex, texCoord[0]) * vec4(0.875, 0.875, 0.875, 1.000);\n\
+ vec4 outC = texture2DRect(tex, texCoord[0]) * vec4(0.875, 0.875, 0.875, 1.000);\n\
+ vec4 outD = texture2DRect(tex, texCoord[0]) * vec4(0.750, 0.750, 0.750, 1.000);\n\
+ \n\
+ gl_FragColor = mix( mix(outA, outB, f.x), mix(outC, outD, f.x), f.y );\n\
+ }\n\
+"};
+
+static const char *Scalar2xEPXFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[9];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ const vec3 dt = vec3(65536.0, 256.0, 1.0);\n\
+ \n\
+ float reduce(vec3 color)\n\
+ {\n\
+ return dot(color, dt);\n\
+ }\n\
+ \n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: --|07|--\n\
+ // 05|00|01\n\
+ // --|03|--\n\
+ //\n\
+ // Output Pixel Mapping: A|B\n\
+ // C|D\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 f = step(0.5, fract(texCoord[0]));\n\
+ vec3 pU = texture2DRect(tex, texCoord[7]).rgb;\n\
+ vec3 pL = texture2DRect(tex, texCoord[5]).rgb;\n\
+ vec3 pC = texture2DRect(tex, texCoord[0]).rgb;\n\
+ vec3 pR = texture2DRect(tex, texCoord[1]).rgb;\n\
+ vec3 pD = texture2DRect(tex, texCoord[3]).rgb;\n\
+ float rU = reduce(pU);\n\
+ float rL = reduce(pL);\n\
+ float rR = reduce(pR);\n\
+ float rD = reduce(pD);\n\
+ \n\
+ vec3 outA = pC;\n\
+ vec3 outB = pC;\n\
+ vec3 outC = pC;\n\
+ vec3 outD = pC;\n\
+ \n\
+ if (rL != rR && rU != rD) \n\
+ {\n\
+ if (rU == rL) outA = pU;\n\
+ if (rR == rU) outB = pR;\n\
+ if (rL == rD) outC = pL;\n\
+ if (rD == rR) outD = pD;\n\
+ }\n\
+ \n\
+ gl_FragColor.rgb = mix( mix(outA, outB, f.x), mix(outC, outD, f.x), f.y );\n\
+ gl_FragColor.a = 1.0;\n\
+ }\n\
+"};
+
+static const char *Scalar2xEPXPlusFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[9];\n\
+ uniform sampler2DRect tex;\n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: --|07|--\n\
+ // 05|00|01\n\
+ // --|03|--\n\
+ //\n\
+ // Output Pixel Mapping: A|B\n\
+ // C|D\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 f = step(0.5, fract(texCoord[0]));\n\
+ vec3 pU = texture2DRect(tex, texCoord[7]).rgb;\n\
+ vec3 pL = texture2DRect(tex, texCoord[5]).rgb;\n\
+ vec3 pC = texture2DRect(tex, texCoord[0]).rgb;\n\
+ vec3 pR = texture2DRect(tex, texCoord[1]).rgb;\n\
+ vec3 pD = texture2DRect(tex, texCoord[3]).rgb;\n\
+ \n\
+ vec3 outA = ( distance(pL, pU) < min(distance(pL, pD), distance(pR, pU)) ) ? mix(pL, pU, 0.5) : pC;\n\
+ vec3 outB = ( distance(pR, pU) < min(distance(pL, pU), distance(pR, pD)) ) ? mix(pR, pU, 0.5) : pC;\n\
+ vec3 outC = ( distance(pL, pD) < min(distance(pL, pU), distance(pR, pD)) ) ? mix(pL, pD, 0.5) : pC;\n\
+ vec3 outD = ( distance(pR, pD) < min(distance(pL, pD), distance(pR, pU)) ) ? mix(pR, pD, 0.5) : pC;\n\
+ \n\
+ gl_FragColor.rgb = mix( mix(outA, outB, f.x), mix(outC, outD, f.x), f.y );\n\
+ gl_FragColor.a = 1.0;\n\
+ }\n\
+"};
+
+static const char *Scalar2xSaIFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[16];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ const vec3 dt = vec3(65536.0, 256.0, 1.0);\n\
+ \n\
+ float GetResult(float v1, float v2, float v3, float v4)\n\
+ {\n\
+ return sign(abs(v1-v3)+abs(v1-v4))-sign(abs(v2-v3)+abs(v2-v4));\n\
+ }\n\
+ \n\
+ float reduce(vec3 color)\n\
+ {\n\
+ return dot(color, dt);\n\
+ }\n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 06|07|08|09\n\
+ // 05|00|01|10\n\
+ // 04|03|02|11\n\
+ // 15|14|13|12\n\
+ //\n\
+ // Output Pixel Mapping: A|B\n\
+ // C|D\n\
+ \n\
+ //---------------------------------------\n\
+ // 2xSaI Pixel Mapping: I|E|F|J\n\
+ // G|A|B|K\n\
+ // H|C|D|L\n\
+ // M|N|O|P\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 f = step(0.5, fract(texCoord[0]));\n\
+ \n\
+ float Iv = reduce( texture2DRect(tex, texCoord[6]).rgb );\n\
+ float Ev = reduce( texture2DRect(tex, texCoord[7]).rgb );\n\
+ float Fv = reduce( texture2DRect(tex, texCoord[8]).rgb );\n\
+ float Jv = reduce( texture2DRect(tex, texCoord[9]).rgb );\n\
+ \n\
+ float Gv = reduce( texture2DRect(tex, texCoord[5]).rgb );\n\
+ vec3 Ac = texture2DRect(tex, texCoord[0]).rgb; float Av = reduce(Ac);\n\
+ vec3 Bc = texture2DRect(tex, texCoord[1]).rgb; float Bv = reduce(Bc);\n\
+ float Kv = reduce( texture2DRect(tex, texCoord[10]).rgb );\n\
+ \n\
+ float Hv = reduce( texture2DRect(tex, texCoord[4]).rgb );\n\
+ vec3 Cc = texture2DRect(tex, texCoord[3]).rgb; float Cv = reduce(Cc);\n\
+ vec3 Dc = texture2DRect(tex, texCoord[2]).rgb; float Dv = reduce(Dc);\n\
+ float Lv = reduce( texture2DRect(tex, texCoord[11]).rgb );\n\
+ \n\
+ float Mv = reduce( texture2DRect(tex, texCoord[15]).rgb );\n\
+ float Nv = reduce( texture2DRect(tex, texCoord[14]).rgb );\n\
+ float Ov = reduce( texture2DRect(tex, texCoord[13]).rgb );\n\
+ // Pv is unused, so skip this one.\n\
+ \n\
+ vec3 outA = Ac;\n\
+ vec3 outB = Ac;\n\
+ vec3 outC = Ac;\n\
+ vec3 outD = Ac;\n\
+ \n\
+ bool compAD = (Av == Dv);\n\
+ bool compBC = (Bv == Cv);\n\
+ \n\
+ if (compAD && !compBC)\n\
+ {\n\
+ outB = ((Av == Ev) && (Bv == Lv)) || ((Av == Cv) && (Av == Fv) && (Bv != Ev) && (Bv == Jv)) ? Ac : mix(Ac, Bc, 0.5);\n\
+ outC = ((Av == Gv) && (Cv == Ov)) || ((Av == Bv) && (Av == Hv) && (Cv != Gv) && (Cv == Mv)) ? Ac : mix(Ac, Cc, 0.5);\n\
+ }\n\
+ else if (!compAD && compBC)\n\
+ {\n\
+ outB = ((Bv == Fv) && (Av == Hv)) || ((Bv == Ev) && (Bv == Dv) && (Av != Fv) && (Av == Iv)) ? Bc : mix(Ac, Bc, 0.5);\n\
+ outC = ((Cv == Hv) && (Av == Fv)) || ((Cv == Gv) && (Cv == Dv) && (Av != Hv) && (Av == Iv)) ? Cc : mix(Ac, Cc, 0.5);\n\
+ outD = Bc;\n\
+ }\n\
+ else if (compAD && compBC)\n\
+ {\n\
+ outB = (Av == Bv) ? Ac : mix(Ac, Bc, 0.5);\n\
+ outC = (Av == Bv) ? Ac : mix(Ac, Cc, 0.5);\n\
+ \n\
+ float r = (Av == Bv) ? 1.0 : GetResult(Av, Bv, Gv, Ev) - GetResult(Bv, Av, Kv, Fv) - GetResult(Bv, Av, Hv, Nv) + GetResult(Av, Bv, Lv, Ov);\n\
+ outD = (r > 0.0) ? Ac : ( (r < 0.0) ? Bc : mix( mix(Ac, Bc, 0.5), mix(Cc, Dc, 0.5), 0.5) );\n\
+ }\n\
+ else\n\
+ {\n\
+ outB = ((Av == Cv) && (Av == Fv) && (Bv != Ev) && (Bv == Jv)) ? Ac : ( ((Bv == Ev) && (Bv == Dv) && (Av != Fv) && (Av == Iv)) ? Bc : mix(Ac, Bc, 0.5) );\n\
+ outC = ((Av == Bv) && (Av == Hv) && (Cv != Gv) && (Cv == Mv)) ? Ac : ( ((Cv == Gv) && (Cv == Dv) && (Av != Hv) && (Av == Iv)) ? Cc : mix(Ac, Cc, 0.5) );\n\
+ outD = mix( mix(Ac, Bc, 0.5), mix(Cc, Dc, 0.5), 0.5 );\n\
+ }\n\
+ \n\
+ gl_FragColor.rgb = mix( mix(outA, outB, f.x), mix(outC, outD, f.x), f.y );\n\
+ gl_FragColor.a = 1.0;\n\
+ }\n\
+"};
+
+static const char *ScalarSuper2xSaIFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[16];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ const vec3 dt = vec3(65536.0, 256.0, 1.0);\n\
+ \n\
+ float GetResult(float v1, float v2, float v3, float v4)\n\
+ {\n\
+ return sign(abs(v1-v3)+abs(v1-v4))-sign(abs(v2-v3)+abs(v2-v4));\n\
+ }\n\
+ \n\
+ float reduce(vec3 color)\n\
+ {\n\
+ return dot(color, dt);\n\
+ }\n\
+ \n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: 06|07|08|09\n\
+ // 05|00|01|10\n\
+ // 04|03|02|11\n\
+ // 15|14|13|12\n\
+ //\n\
+ // Output Pixel Mapping: A|B\n\
+ // C|D\n\
+ \n\
+ //---------------------------------------\n\
+ // S2xSaI Pixel Mapping: I|E|F|J\n\
+ // G|A|B|K\n\
+ // H|C|D|L\n\
+ // M|N|O|P\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 f = step(0.5, fract(texCoord[0]));\n\
+ \n\
+ float Iv = reduce( texture2DRect(tex, texCoord[6]).rgb );\n\
+ float Ev = reduce( texture2DRect(tex, texCoord[7]).rgb );\n\
+ float Fv = reduce( texture2DRect(tex, texCoord[8]).rgb );\n\
+ float Jv = reduce( texture2DRect(tex, texCoord[9]).rgb );\n\
+ \n\
+ float Gv = reduce( texture2DRect(tex, texCoord[5]).rgb );\n\
+ vec3 Ac = texture2DRect(tex, texCoord[0]).rgb; float Av = reduce(Ac);\n\
+ vec3 Bc = texture2DRect(tex, texCoord[1]).rgb; float Bv = reduce(Bc);\n\
+ float Kv = reduce( texture2DRect(tex, texCoord[10]).rgb );\n\
+ \n\
+ float Hv = reduce( texture2DRect(tex, texCoord[4]).rgb );\n\
+ vec3 Cc = texture2DRect(tex, texCoord[3]).rgb; float Cv = reduce(Cc);\n\
+ vec3 Dc = texture2DRect(tex, texCoord[2]).rgb; float Dv = reduce(Dc);\n\
+ float Lv = reduce( texture2DRect(tex, texCoord[11]).rgb );\n\
+ \n\
+ float Mv = reduce( texture2DRect(tex, texCoord[15]).rgb );\n\
+ float Nv = reduce( texture2DRect(tex, texCoord[14]).rgb );\n\
+ float Ov = reduce( texture2DRect(tex, texCoord[13]).rgb );\n\
+ float Pv = reduce( texture2DRect(tex, texCoord[12]).rgb );\n\
+ \n\
+ bool compAD = (Av == Dv);\n\
+ bool compBC = (Bv == Cv);\n\
+ \n\
+ vec3 outA = ( (compBC && !compAD && (Hv == Cv) && (Cv != Fv)) || ((Gv == Cv) && (Dv == Cv) && (Hv != Av) && (Cv != Iv)) ) ? mix(Ac, Cc, 0.5) : Ac;\n\
+ vec3 outB = Bc;\n\
+ vec3 outC = ( (compAD && !compBC && (Gv == Av) && (Av != Ov)) || ((Av == Hv) && (Av == Bv) && (Gv != Cv) && (Av != Mv)) ) ? mix(Ac, Cc, 0.5) : Cc;\n\
+ vec3 outD = Dc;\n\
+ \n\
+ if (compBC && !compAD)\n\
+ {\n\
+ outB = outD = Cc;\n\
+ }\n\
+ else if (!compBC && compAD)\n\
+ {\n\
+ outB = outD = Ac;\n\
+ }\n\
+ else if (compBC && compAD)\n\
+ {\n\
+ float r = GetResult(Bv, Av, Hv, Nv) + GetResult(Bv, Av, Gv, Ev) + GetResult(Bv, Av, Ov, Lv) + GetResult(Bv, Av, Fv, Kv);\n\
+ outB = outD = (r > 0.0) ? Bc : ( (r < 0.0) ? Ac : mix(Ac, Bc, 0.5) );\n\
+ }\n\
+ else\n\
+ {\n\
+ outB = ( (Bv == Dv) && (Bv == Ev) && (Av != Fv) && (Bv != Iv) ) ? mix(Ac, Bc, 0.75) : ( ( (Av == Cv) && (Av == Fv) && (Ev != Bv) && (Av != Jv) ) ? mix(Ac, Bc, 0.25) : mix(Ac, Bc, 0.5) );\n\
+ outD = ( (Bv == Dv) && (Dv == Nv) && (Cv != Ov) && (Dv != Mv) ) ? mix(Cc, Dc, 0.75) : ( ( (Av == Cv) && (Cv == Ov) && (Nv != Dv) && (Cv != Pv) ) ? mix(Cc, Dc, 0.25) : mix(Cc, Dc, 0.5) );\n\
+ }\n\
+ \n\
+ gl_FragColor.rgb = mix( mix(outA, outB, f.x), mix(outC, outD, f.x), f.y );\n\
+ gl_FragColor.a = 1.0;\n\
+ }\n\
+"};
+
+static const char *ScalarSuperEagle2xFragShader_110 = {"\
+ #version 110\n\
+ #extension GL_ARB_texture_rectangle : require\n\
+ \n\
+ varying vec2 texCoord[16];\n\
+ uniform sampler2DRect tex;\n\
+ \n\
+ const vec3 dt = vec3(65536.0, 256.0, 1.0);\n\
+ \n\
+ float GetResult(float v1, float v2, float v3, float v4)\n\
+ {\n\
+ return sign(abs(v1-v3)+abs(v1-v4))-sign(abs(v2-v3)+abs(v2-v4));\n\
+ }\n\
+ \n\
+ float reduce(vec3 color)\n\
+ {\n\
+ return dot(color, dt);\n\
+ }\n\
+ \n\
+ //---------------------------------------\n\
+ // Input Pixel Mapping: --|07|08|--\n\
+ // 05|00|01|10\n\
+ // 04|03|02|11\n\
+ // --|14|13|--\n\
+ //\n\
+ // Output Pixel Mapping: A|B\n\
+ // C|D\n\
+ \n\
+ //---------------------------------------\n\
+ // SEagle Pixel Mapping: -|E|F|-\n\
+ // G|A|B|K\n\
+ // H|C|D|L\n\
+ // -|N|O|-\n\
+ \n\
+ void main()\n\
+ {\n\
+ vec2 f = step(0.5, fract(texCoord[0]));\n\
+ \n\
+ float Ev = reduce( texture2DRect(tex, texCoord[7]).rgb );\n\
+ float Fv = reduce( texture2DRect(tex, texCoord[8]).rgb );\n\
+ \n\
+ float Gv = reduce( texture2DRect(tex, texCoord[5]).rgb );\n\
+ vec3 Ac = texture2DRect(tex, texCoord[0]).rgb; float Av = reduce(Ac);\n\
+ vec3 Bc = texture2DRect(tex, texCoord[1]).rgb; float Bv = reduce(Bc);\n\
+ float Kv = reduce( texture2DRect(tex, texCoord[10]).rgb );\n\
+ \n\
+ float Hv = reduce( texture2DRect(tex, texCoord[4]).rgb );\n\
+ vec3 Cc = texture2DRect(tex, texCoord[3]).rgb; float Cv = reduce(Cc);\n\
+ vec3 Dc = texture2DRect(tex, texCoord[2]).rgb; float Dv = reduce(Dc);\n\
+ float Lv = reduce( texture2DRect(tex, texCoord[11]).rgb );\n\
+ \n\
+ float Nv = reduce( texture2DRect(tex, texCoord[14]).rgb );\n\
+ float Ov = reduce( texture2DRect(tex, texCoord[13]).rgb );\n\
+ \n\
+ vec3 outA = Ac;\n\
+ vec3 outB = Bc;\n\
+ vec3 outC = Cc;\n\
+ vec3 outD = Dc;\n\
+ bool compAD = (Av == Dv);\n\
+ bool compBC = (Bv == Cv);\n\
+ \n\
+ if (compBC && !compAD)\n\
+ {\n\
+ outA = (Cv == Hv || Bv == Fv) ? mix(Ac, Cc, 0.75) : mix(Ac, Bc, 0.5);\n\
+ //outA = mix( mix(Ac, Bc, 0.5), mix(Ac, Cc, 0.75), float(Cv == Hv || Bv == Fv) );\n\
+ outB = Cc;\n\
+ //outC = Cc;\n\
+ outD = mix( mix(Dc, Cc, 0.5), mix(Dc, Cc, 0.75), float(Bv == Kv || Cv == Nv) );\n\
+ }\n\
+ else if (!compBC && compAD)\n\
+ {\n\
+ //outA = Ac;\n\
+ outB = mix( mix(Ac, Bc, 0.5), mix(Ac, Bc, 0.25), float(Av == Ev || Dv == Lv) );\n\
+ outC = mix( mix(Cc, Dc, 0.5), mix(Ac, Cc, 0.25), float(Dv == Ov || Av == Gv) );\n\
+ outD = Ac;\n\
+ }\n\
+ else if (compBC && compAD)\n\
+ {\n\
+ float r = GetResult(Bv, Av, Hv, Nv) + GetResult(Bv, Av, Gv, Ev) + GetResult(Bv, Av, Ov, Lv) + GetResult(Bv, Av, Fv, Kv);\n\
+ if (r > 0.0)\n\
+ {\n\
+ outA = mix(Ac, Bc, 0.5);\n\
+ outB = Cc;\n\
+ //outC = Cc;\n\
+ outD = outA;\n\
+ }\n\
+ else if (r < 0.0)\n\
+ {\n\
+ //outA = Ac;\n\
+ outB = mix(Ac, Bc, 0.5);\n\
+ outC = outB;\n\
+ outD = Ac;\n\
+ }\n\
+ else\n\
+ {\n\
+ //outA = Ac;\n\
+ outB = Cc;\n\
+ //outC = Cc;\n\
+ outD = Ac;\n\
+ }\n\
+ }\n\
+ else\n\
+ {\n\
+ outA = mix(mix(Bc, Cc, 0.5), Ac, 0.75);\n\
+ outB = mix(mix(Ac, Dc, 0.5), Bc, 0.75);\n\
+ outC = mix(mix(Ac, Dc, 0.5), Cc, 0.75);\n\
+ outD = mix(mix(Bc, Cc, 0.5), Dc, 0.75);\n\
+ }\n\
+ \n\
+ gl_FragColor.rgb = mix( mix(outA, outB, f.x), mix(outC, outD, f.x), f.y );\n\
+ gl_FragColor.a = 1.0;\n\
+ }\n\
"};
enum OGLVertexAttributeID
@@ -67,90 +994,787 @@ enum OGLVertexAttributeID
OGLVertexAttributeID_TexCoord0 = 8
};
+static const GLint filterVtxBuffer[8] = {-1, -1, 1, -1, 1, 1, -1, 1};
+static const GLubyte filterElementBuffer[6] = {0, 1, 2, 2, 3, 0};
+static const GLubyte outputElementBuffer[12] = {0, 1, 2, 2, 3, 0, 4, 5, 6, 6, 7, 4};
+
+OGLInfo::OGLInfo()
+{
+ _versionMajor = 0;
+ _versionMinor = 0;
+ _versionRevision = 0;
+
+ _isVBOSupported = false;
+ _isPBOSupported = false;
+ _isShaderSupported = false;
+ _isFBOSupported = false;
+}
+
+OGLInfo* OGLInfo::GetVersionedObjectOGL()
+{
+ OGLInfo *oglInfoObject = NULL;
+
+ const char *oglVersionString = (const char *)glGetString(GL_VERSION);
+ if (oglVersionString == NULL)
+ {
+ return oglInfoObject;
+ }
+
+ size_t versionStringLength = 0;
+
+ // First, check for the dot in the revision string. There should be at
+ // least one present.
+ const char *versionStrEnd = strstr(oglVersionString, ".");
+ if (versionStrEnd == NULL)
+ {
+ return oglInfoObject;
+ }
+
+ // Next, check for the space before the vendor-specific info (if present).
+ versionStrEnd = strstr(oglVersionString, " ");
+ if (versionStrEnd == NULL)
+ {
+ // If a space was not found, then the vendor-specific info is not present,
+ // and therefore the entire string must be the version number.
+ versionStringLength = strlen(oglVersionString);
+ }
+ else
+ {
+ // If a space was found, then the vendor-specific info is present,
+ // and therefore the version number is everything before the space.
+ versionStringLength = versionStrEnd - oglVersionString;
+ }
+
+ // Copy the version substring and parse it.
+ char *versionSubstring = (char *)malloc(versionStringLength * sizeof(char));
+ strncpy(versionSubstring, oglVersionString, versionStringLength);
+
+ unsigned int major = 0;
+ unsigned int minor = 0;
+ unsigned int revision = 0;
+
+ sscanf(versionSubstring, "%u.%u.%u", &major, &minor, &revision);
+
+ free(versionSubstring);
+ versionSubstring = NULL;
+
+ // We finally have the version read. Now create an OGLInfo
+ // object based on the OpenGL version.
+ if ((major >= 4) ||
+ (major >= 3 && minor >= 2))
+ {
+ oglInfoObject = new OGLInfo_3_2;
+ }
+ else if ((major >= 3) ||
+ (major >= 2 && minor >= 1))
+ {
+ oglInfoObject = new OGLInfo_2_1;
+ }
+ else if (major >= 2)
+ {
+ oglInfoObject = new OGLInfo_2_0;
+ }
+ else if (major >= 1 && minor >= 5)
+ {
+ oglInfoObject = new OGLInfo_1_2;
+ }
+
+ return oglInfoObject;
+}
+
+bool OGLInfo::IsVBOSupported()
+{
+ return this->_isVBOSupported;
+}
+
+bool OGLInfo::IsPBOSupported()
+{
+ return this->_isPBOSupported;
+}
+
+bool OGLInfo::IsShaderSupported()
+{
+ return this->_isShaderSupported;
+}
+
+bool OGLInfo::IsFBOSupported()
+{
+ return this->_isFBOSupported;
+}
+
+OGLInfo_1_2::OGLInfo_1_2()
+{
+ _versionMajor = 1;
+ _versionMinor = 2;
+ _versionRevision = 0;
+
+ // Check the OpenGL capabilities for this renderer
+ std::set oglExtensionSet;
+ this->GetExtensionSetOGL(&oglExtensionSet);
+
+ _isVBOSupported = this->IsExtensionPresent(oglExtensionSet, "GL_ARB_vertex_buffer_object");
+
+#if !defined(GL_ARB_shader_objects) || \
+ !defined(GL_ARB_vertex_shader) || \
+ !defined(GL_ARB_fragment_shader) || \
+ !defined(GL_ARB_vertex_program)
+
+ _isShaderSupported = false;
+#else
+ _isShaderSupported = this->IsExtensionPresent(oglExtensionSet, "GL_ARB_shader_objects") &&
+ this->IsExtensionPresent(oglExtensionSet, "GL_ARB_vertex_shader") &&
+ this->IsExtensionPresent(oglExtensionSet, "GL_ARB_fragment_shader") &&
+ this->IsExtensionPresent(oglExtensionSet, "GL_ARB_vertex_program");
+#endif
+
+#if !defined(GL_ARB_pixel_buffer_object) && !defined(GL_EXT_pixel_buffer_object)
+ _isPBOSupported = false;
+#else
+ _isPBOSupported = this->IsExtensionPresent(oglExtensionSet, "GL_ARB_vertex_buffer_object") &&
+ (this->IsExtensionPresent(oglExtensionSet, "GL_ARB_pixel_buffer_object") ||
+ this->IsExtensionPresent(oglExtensionSet, "GL_EXT_pixel_buffer_object"));
+#endif
+
+ // Don't use ARB versions since we're using the EXT versions for backwards compatibility.
+#if !defined(GL_EXT_framebuffer_object)
+ _isFBOSupported = false;
+#else
+ _isFBOSupported = this->IsExtensionPresent(oglExtensionSet, "GL_EXT_framebuffer_object");
+#endif
+}
+
+void OGLInfo_1_2::GetExtensionSetOGL(std::set *oglExtensionSet)
+{
+ std::string oglExtensionString = std::string((const char *)glGetString(GL_EXTENSIONS));
+
+ size_t extStringStartLoc = 0;
+ size_t delimiterLoc = oglExtensionString.find_first_of(' ', extStringStartLoc);
+ while (delimiterLoc != std::string::npos)
+ {
+ std::string extensionName = oglExtensionString.substr(extStringStartLoc, delimiterLoc - extStringStartLoc);
+ oglExtensionSet->insert(extensionName);
+
+ extStringStartLoc = delimiterLoc + 1;
+ delimiterLoc = oglExtensionString.find_first_of(' ', extStringStartLoc);
+ }
+
+ if (extStringStartLoc - oglExtensionString.length() > 0)
+ {
+ std::string extensionName = oglExtensionString.substr(extStringStartLoc, oglExtensionString.length() - extStringStartLoc);
+ oglExtensionSet->insert(extensionName);
+ }
+}
+
+bool OGLInfo_1_2::IsExtensionPresent(const std::set &oglExtensionSet, const std::string &extensionName) const
+{
+ if (oglExtensionSet.size() == 0)
+ {
+ return false;
+ }
+
+ return (oglExtensionSet.find(extensionName) != oglExtensionSet.end());
+}
+
+OGLInfo_2_0::OGLInfo_2_0()
+{
+ _versionMajor = 2;
+ _versionMinor = 0;
+ _versionRevision = 0;
+ _isVBOSupported = true;
+ _isShaderSupported = true;
+}
+
+OGLInfo_2_1::OGLInfo_2_1()
+{
+ _versionMajor = 2;
+ _versionMinor = 1;
+ _versionRevision = 0;
+ _isVBOSupported = true;
+ _isPBOSupported = true;
+ _isShaderSupported = true;
+}
+
+OGLInfo_3_2::OGLInfo_3_2()
+{
+ _versionMajor = 3;
+ _versionMinor = 2;
+ _versionRevision = 0;
+ _isVBOSupported = true;
+ _isPBOSupported = true;
+ _isShaderSupported = true;
+ _isFBOSupported = true;
+}
+
+void OGLInfo_3_2::GetExtensionSetOGL(std::set *oglExtensionSet)
+{
+#ifdef GL_VERSION_3_2
+ GLint extensionCount = 0;
+
+ glGetIntegerv(GL_NUM_EXTENSIONS, &extensionCount);
+ for (unsigned int i = 0; i < extensionCount; i++)
+ {
+ std::string extensionName = std::string((const char *)glGetStringi(GL_EXTENSIONS, i));
+ oglExtensionSet->insert(extensionName);
+ }
+#endif
+}
+
+#pragma mark -
+
+OGLShaderProgram::OGLShaderProgram()
+{
+ _vertexID = 0;
+ _fragmentID = 0;
+
+ _programID = glCreateProgram();
+ if (_programID == 0)
+ {
+ printf("OpenGL Error - Failed to create shader program.\n");
+ }
+}
+
+OGLShaderProgram::~OGLShaderProgram()
+{
+ glDetachShader(this->_programID, this->_vertexID);
+ glDetachShader(this->_programID, this->_fragmentID);
+ glDeleteProgram(this->_programID);
+ glDeleteShader(this->_vertexID);
+ glDeleteShader(this->_fragmentID);
+}
+
+GLuint OGLShaderProgram::LoadShaderOGL(GLenum shaderType, const char *shaderProgram)
+{
+ GLint shaderStatus = GL_TRUE;
+
+ GLuint shaderID = glCreateShader(shaderType);
+ if (shaderID == 0)
+ {
+ printf("OpenGL Error - Failed to create %s.\n",
+ (shaderType == GL_VERTEX_SHADER) ? "GL_VERTEX_SHADER" : ((shaderType == GL_FRAGMENT_SHADER) ? "GL_FRAGMENT_SHADER" : "OTHER SHADER TYPE"));
+ return shaderID;
+ }
+
+ glShaderSource(shaderID, 1, (const GLchar **)&shaderProgram, NULL);
+ glCompileShader(shaderID);
+ glGetShaderiv(shaderID, GL_COMPILE_STATUS, &shaderStatus);
+ if (shaderStatus == GL_FALSE)
+ {
+ static const size_t logBytes = 16384; // 16KB should be more than enough
+ GLchar *logBuf = (GLchar *)calloc(logBytes, sizeof(GLchar));
+ GLsizei logSize = 0;
+ glGetShaderInfoLog(shaderID, logBytes * sizeof(GLchar), &logSize, logBuf);
+
+ printf("OpenGL Error - Failed to compile %s.\n%s\n",
+ (shaderType == GL_VERTEX_SHADER) ? "GL_VERTEX_SHADER" : ((shaderType == GL_FRAGMENT_SHADER) ? "GL_FRAGMENT_SHADER" : "OTHER SHADER TYPE"),
+ (char *)logBuf);
+
+ glDeleteShader(shaderID);
+ return shaderID;
+ }
+
+ return shaderID;
+}
+
+GLuint OGLShaderProgram::GetVertexShaderID()
+{
+ return this->_vertexID;
+}
+
+void OGLShaderProgram::SetVertexShaderOGL(const char *shaderProgram)
+{
+ if (this->_vertexID != 0)
+ {
+ glDetachShader(this->_programID, this->_vertexID);
+ glDeleteShader(this->_vertexID);
+ }
+
+ this->_vertexID = this->LoadShaderOGL(GL_VERTEX_SHADER, shaderProgram);
+
+ if (this->_vertexID != 0)
+ {
+ glAttachShader(this->_programID, this->_vertexID);
+ glBindAttribLocation(this->_programID, OGLVertexAttributeID_Position, "inPosition");
+ glBindAttribLocation(this->_programID, OGLVertexAttributeID_TexCoord0, "inTexCoord0");
+ }
+
+ if (this->_vertexID != 0 && this->_fragmentID != 0)
+ {
+ this->LinkOGL();
+ }
+}
+
+GLuint OGLShaderProgram::GetFragmentShaderID()
+{
+ return this->_fragmentID;
+}
+
+void OGLShaderProgram::SetFragmentShaderOGL(const char *shaderProgram)
+{
+ if (this->_fragmentID != 0)
+ {
+ glDetachShader(this->_programID, this->_fragmentID);
+ glDeleteShader(this->_fragmentID);
+ }
+
+ this->_fragmentID = this->LoadShaderOGL(GL_FRAGMENT_SHADER, shaderProgram);
+
+ if (this->_fragmentID != 0)
+ {
+ glAttachShader(this->_programID, this->_fragmentID);
+ }
+
+ if (this->_vertexID != 0 && this->_fragmentID != 0)
+ {
+ this->LinkOGL();
+ }
+}
+
+void OGLShaderProgram::SetVertexAndFragmentShaderOGL(const char *vertShaderProgram, const char *fragShaderProgram)
+{
+ if (this->_vertexID != 0)
+ {
+ glDetachShader(this->_programID, this->_vertexID);
+ glDeleteShader(this->_vertexID);
+ }
+
+ if (this->_fragmentID != 0)
+ {
+ glDetachShader(this->_programID, this->_fragmentID);
+ glDeleteShader(this->_fragmentID);
+ }
+
+ this->_vertexID = this->LoadShaderOGL(GL_VERTEX_SHADER, vertShaderProgram);
+ this->_fragmentID = this->LoadShaderOGL(GL_FRAGMENT_SHADER, fragShaderProgram);
+
+ if (this->_vertexID != 0)
+ {
+ glAttachShader(this->_programID, this->_vertexID);
+ glBindAttribLocation(this->_programID, OGLVertexAttributeID_Position, "inPosition");
+ glBindAttribLocation(this->_programID, OGLVertexAttributeID_TexCoord0, "inTexCoord0");
+ }
+
+ if (this->_fragmentID != 0)
+ {
+ glAttachShader(this->_programID, this->_fragmentID);
+ }
+
+ if (this->_vertexID != 0 && this->_fragmentID != 0)
+ {
+ this->LinkOGL();
+ }
+}
+
+GLuint OGLShaderProgram::GetProgramID()
+{
+ return this->_programID;
+}
+
+bool OGLShaderProgram::LinkOGL()
+{
+ bool result = false;
+ GLint shaderStatus = GL_FALSE;
+
+ glLinkProgram(this->_programID);
+ glGetProgramiv(this->_programID, GL_LINK_STATUS, &shaderStatus);
+ if (shaderStatus == GL_FALSE)
+ {
+ printf("OpenGL Error - Failed to link shader program.\n");
+ return result;
+ }
+
+ glValidateProgram(this->_programID);
+
+ result = true;
+ return result;
+}
+
+#pragma mark -
OGLVideoOutput::OGLVideoOutput()
{
- _gapScalar = 0.0f;
- _normalWidth = GPU_DISPLAY_WIDTH;
- _normalHeight = GPU_DISPLAY_HEIGHT*2.0 + (DS_DISPLAY_GAP*_gapScalar);
+ _info = OGLInfo::GetVersionedObjectOGL();
+ _layerList = new std::vector;
+ _layerList->reserve(8);
+
+ // Render State Setup (common to both shaders and fixed-function pipeline)
+ glDisable(GL_BLEND);
+ glDisable(GL_DEPTH_TEST);
+ glDisable(GL_DITHER);
+ glDisable(GL_STENCIL_TEST);
+
+ // Set up fixed-function pipeline render states.
+ if (!this->_info->IsShaderSupported())
+ {
+ glDisable(GL_ALPHA_TEST);
+ glDisable(GL_LIGHTING);
+ glDisable(GL_FOG);
+ glEnable(GL_TEXTURE_2D);
+ }
+
+ // Set up clear attributes
+ glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+ glClear(GL_COLOR_BUFFER_BIT);
+}
+
+OGLVideoOutput::~OGLVideoOutput()
+{
+ for (size_t i = 0; i < _layerList->size(); i++)
+ {
+ delete (*_layerList)[i];
+ }
+
+ delete _layerList;
+ delete _info;
+}
+
+void OGLVideoOutput::InitLayers()
+{
+ for (size_t i = 0; i < _layerList->size(); i++)
+ {
+ delete (*_layerList)[i];
+ }
+
+ this->_layerList->clear();
+ this->_layerList->push_back(new OGLDisplayLayer(this));
+}
+
+OGLInfo* OGLVideoOutput::GetInfo()
+{
+ return this->_info;
+}
+
+GLsizei OGLVideoOutput::GetViewportWidth()
+{
+ return this->_viewportWidth;
+}
+
+GLsizei OGLVideoOutput::GetViewportHeight()
+{
+ return this->_viewportHeight;
+}
+
+OGLDisplayLayer* OGLVideoOutput::GetDisplayLayer()
+{
+ return (OGLDisplayLayer *)this->_layerList->at(0);
+}
+
+void OGLVideoOutput::SetViewportSizeOGL(GLsizei w, GLsizei h)
+{
+ this->_viewportWidth = w;
+ this->_viewportHeight = h;
+ glViewport(0, 0, w, h);
+
+ for (size_t i = 0; i < _layerList->size(); i++)
+ {
+ (*_layerList)[i]->SetViewportSizeOGL(w, h);
+ }
+}
+
+void OGLVideoOutput::ProcessOGL(const uint16_t *videoData, GLsizei w, GLsizei h)
+{
+ for (size_t i = 0; i < _layerList->size(); i++)
+ {
+ (*_layerList)[i]->ProcessOGL(videoData, w, h);
+ }
+}
+
+void OGLVideoOutput::RenderOGL()
+{
+ for (size_t i = 0; i < _layerList->size(); i++)
+ {
+ (*_layerList)[i]->RenderOGL();
+ }
+}
+
+#pragma mark -
+
+OGLFilter::OGLFilter()
+{
+ OGLFilterInit(1, 1, 1);
+}
+
+OGLFilter::OGLFilter(GLsizei srcWidth, GLsizei srcHeight, GLfloat scale = 1)
+{
+ OGLFilterInit(srcWidth, srcHeight, scale);
+}
+
+OGLFilter::~OGLFilter()
+{
+ glDeleteFramebuffersEXT(1, &this->_fboID);
+ glDeleteTextures(1, &this->_texDstID);
+ glDeleteVertexArraysAPPLE(1, &this->_vaoID);
+ glDeleteBuffers(1, &this->_vboVtxID);
+ glDeleteBuffers(1, &this->_vboTexCoordID);
+ glDeleteBuffers(1, &this->_vboElementID);
+}
+
+void OGLFilter::GetSupport(int vfTypeID, bool *outSupportCPU, bool *outSupportShader)
+{
+ const char *cpuTypeIDString = VideoFilter::GetTypeStringByID((VideoFilterTypeID)vfTypeID);
+ *outSupportCPU = (strstr(cpuTypeIDString, VIDEOFILTERTYPE_UNKNOWN_STRING) == NULL);
+ *outSupportShader = (vfTypeID == VideoFilterTypeID_Nearest1_5X) ||
+ (vfTypeID == VideoFilterTypeID_Nearest2X) ||
+ (vfTypeID == VideoFilterTypeID_Scanline) ||
+ (vfTypeID == VideoFilterTypeID_EPX) ||
+ (vfTypeID == VideoFilterTypeID_EPXPlus) ||
+ (vfTypeID == VideoFilterTypeID_2xSaI) ||
+ (vfTypeID == VideoFilterTypeID_Super2xSaI) ||
+ (vfTypeID == VideoFilterTypeID_SuperEagle);
+}
+
+void OGLFilter::OGLFilterInit(GLsizei srcWidth, GLsizei srcHeight, GLfloat scale)
+{
+ _program = new OGLShaderProgram;
+
+ _scale = scale;
+ _srcWidth = srcWidth;
+ _srcHeight = srcHeight;
+ _dstWidth = _srcWidth * _scale;
+ _dstHeight = _srcHeight * _scale;
+
+ _texCoordBuffer[0] = 0;
+ _texCoordBuffer[1] = 0;
+ _texCoordBuffer[2] = _srcWidth;
+ _texCoordBuffer[3] = 0;
+ _texCoordBuffer[4] = _srcWidth;
+ _texCoordBuffer[5] = _srcHeight;
+ _texCoordBuffer[6] = 0;
+ _texCoordBuffer[7] = _srcHeight;
+
+ glGenTextures(1, &_texDstID);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, _texDstID);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, _dstWidth, _dstHeight, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+
+ glGenFramebuffersEXT(1, &_fboID);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, _fboID);
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_ARB, _texDstID, 0);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+
+ glGenBuffers(1, &_vboVtxID);
+ glGenBuffers(1, &_vboTexCoordID);
+ glGenBuffers(1, &_vboElementID);
+
+ glBindBuffer(GL_ARRAY_BUFFER, _vboVtxID);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(filterVtxBuffer), filterVtxBuffer, GL_STATIC_DRAW);
+ glBindBuffer(GL_ARRAY_BUFFER, _vboTexCoordID);
+ glBufferData(GL_ARRAY_BUFFER, sizeof(_texCoordBuffer), _texCoordBuffer, GL_STATIC_DRAW);
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vboElementID);
+ glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(filterElementBuffer), filterElementBuffer, GL_STATIC_DRAW);
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+
+ glGenVertexArraysAPPLE(1, &_vaoID);
+ glBindVertexArrayAPPLE(_vaoID);
+
+ glBindBuffer(GL_ARRAY_BUFFER, _vboVtxID);
+ glVertexAttribPointer(OGLVertexAttributeID_Position, 2, GL_INT, GL_FALSE, 0, 0);
+ glBindBuffer(GL_ARRAY_BUFFER, _vboTexCoordID);
+ glVertexAttribPointer(OGLVertexAttributeID_TexCoord0, 2, GL_INT, GL_FALSE, 0, 0);
+ glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _vboElementID);
+
+ glEnableVertexAttribArray(OGLVertexAttributeID_Position);
+ glEnableVertexAttribArray(OGLVertexAttributeID_TexCoord0);
+
+ glBindVertexArrayAPPLE(0);
+}
+
+OGLShaderProgram* OGLFilter::GetProgram()
+{
+ return this->_program;
+}
+
+GLuint OGLFilter::GetDstTexID()
+{
+ return this->_texDstID;
+}
+
+GLsizei OGLFilter::GetDstWidth()
+{
+ return this->_dstWidth;
+}
+
+GLsizei OGLFilter::GetDstHeight()
+{
+ return this->_dstHeight;
+}
+
+void OGLFilter::SetSrcSizeOGL(GLsizei w, GLsizei h)
+{
+ this->_srcWidth = w;
+ this->_srcHeight = h;
+ this->_dstWidth = this->_srcWidth * this->_scale;
+ this->_dstHeight = this->_srcHeight * this->_scale;
+
+ this->_texCoordBuffer[2] = w;
+ this->_texCoordBuffer[4] = w;
+ this->_texCoordBuffer[5] = h;
+ this->_texCoordBuffer[7] = h;
+
+ glBindBuffer(GL_ARRAY_BUFFER, this->_vboTexCoordID);
+ glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(this->_texCoordBuffer) , this->_texCoordBuffer);
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+ uint32_t *tempDstBuffer = (uint32_t *)calloc(this->_dstWidth * this->_dstHeight, sizeof(uint32_t));
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texDstID);
+ glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, this->_dstWidth, this->_dstHeight, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, tempDstBuffer);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+ free(tempDstBuffer);
+}
+
+GLfloat OGLFilter::GetScale()
+{
+ return this->_scale;
+}
+
+void OGLFilter::SetScaleOGL(GLfloat scale)
+{
+ this->_scale = scale;
+ this->_dstWidth = this->_srcWidth * this->_scale;
+ this->_dstHeight = this->_srcHeight * this->_scale;
+
+ uint32_t *tempDstBuffer = (uint32_t *)calloc(this->_dstWidth * this->_dstHeight, sizeof(uint32_t));
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texDstID);
+ glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, this->_dstWidth, this->_dstHeight, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, tempDstBuffer);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+ free(tempDstBuffer);
+}
+
+GLuint OGLFilter::RunFilterOGL(GLuint srcTexID, GLsizei viewportWidth, GLsizei viewportHeight)
+{
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, this->_fboID);
+ glBindVertexArrayAPPLE(this->_vaoID);
+ glUseProgram(this->_program->GetProgramID());
+ glViewport(0, 0, this->_dstWidth, this->_dstHeight);
+
+ glClear(GL_COLOR_BUFFER_BIT);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, srcTexID);
+ glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0);
+
+ glBindVertexArrayAPPLE(0);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ glViewport(0, 0, viewportWidth, viewportHeight);
+
+ return this->GetDstTexID();
+}
+
+void OGLFilter::DownloadDstBufferOGL(uint32_t *dstBuffer, size_t lineOffset, size_t readLineCount)
+{
+ if (dstBuffer == NULL)
+ {
+ return;
+ }
+
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, this->_fboID);
+ glReadPixels(0, lineOffset, this->_dstWidth, readLineCount, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, dstBuffer);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+}
+
+#pragma mark -
+
+OGLFilterDeposterize::OGLFilterDeposterize(GLsizei srcWidth, GLsizei srcHeight)
+{
+ SetSrcSizeOGL(srcWidth, srcHeight);
+
+ glGenTextures(1, &_texIntermediateID);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, _texIntermediateID);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, _dstWidth, _dstHeight, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+
+ _program->SetVertexShaderOGL(Sample3x3_VertShader_110);
+ _program->SetFragmentShaderOGL(FilterDeposterizeFragShader_110);
+}
+
+OGLFilterDeposterize::~OGLFilterDeposterize()
+{
+ glDeleteTextures(1, &this->_texIntermediateID);
+}
+
+GLuint OGLFilterDeposterize::RunFilterOGL(GLuint srcTexID, GLsizei viewportWidth, GLsizei viewportHeight)
+{
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, this->_fboID);
+ glBindVertexArrayAPPLE(this->_vaoID);
+ glUseProgram(this->_program->GetProgramID());
+ glViewport(0, 0, this->_dstWidth, this->_dstHeight);
+
+ glClear(GL_COLOR_BUFFER_BIT);
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_ARB, this->_texIntermediateID, 0);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, srcTexID);
+ glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0);
+
+ glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_ARB, this->_texDstID, 0);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texIntermediateID);
+ glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_BYTE, 0);
+
+ glBindVertexArrayAPPLE(0);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+ glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
+ glViewport(0, 0, viewportWidth, viewportHeight);
+
+ return this->GetDstTexID();
+}
+
+#pragma mark -
+
+OGLDisplayLayer::OGLDisplayLayer(OGLVideoOutput *oglVO)
+{
+ _output = oglVO;
+ _needUploadVertices = true;
+ _useDeposterize = false;
+
_displayMode = DS_DISPLAY_TYPE_DUAL;
_displayOrder = DS_DISPLAY_ORDER_MAIN_FIRST;
_displayOrientation = DS_DISPLAY_ORIENTATION_VERTICAL;
- _rotation = 0.0f;
- _displayTexFilter = GL_NEAREST;
- _glTexBackWidth = GetNearestPositivePOT((uint32_t)_normalWidth);
- _glTexBackHeight = GetNearestPositivePOT((uint32_t)_normalHeight);
- _glTexBack = (GLvoid *)calloc(_glTexBackWidth * _glTexBackHeight, sizeof(uint32_t));
+ _normalWidth = GPU_DISPLAY_WIDTH;
+ _normalHeight = GPU_DISPLAY_HEIGHT*2.0 + (DS_DISPLAY_GAP*_gapScalar);
+ _rotation = 0.0f;
_vfSingle = new VideoFilter(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT, VideoFilterTypeID_None, 0);
_vfDual = new VideoFilter(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT*2, VideoFilterTypeID_None, 2);
_vf = _vfDual;
- UpdateVertices();
- UpdateTexCoords(1.0f, 2.0f);
+ _displayTexFilter = GL_NEAREST;
+ _glTexBackWidth = _normalWidth;
+ _glTexBackHeight = _normalHeight;
+
_vtxBufferOffset = 0;
-
- // Set up initial vertex elements
- vtxIndexBuffer[0] = 0; vtxIndexBuffer[1] = 1; vtxIndexBuffer[2] = 2;
- vtxIndexBuffer[3] = 2; vtxIndexBuffer[4] = 3; vtxIndexBuffer[5] = 0;
-
- vtxIndexBuffer[6] = 4; vtxIndexBuffer[7] = 5; vtxIndexBuffer[8] = 6;
- vtxIndexBuffer[9] = 6; vtxIndexBuffer[10] = 7; vtxIndexBuffer[11] = 4;
-}
-
-OGLVideoOutput::~OGLVideoOutput()
-{
- free(_glTexBack);
- delete _vfSingle;
- delete _vfDual;
- _vf = NULL;
-}
-
-void OGLVideoOutput::InitializeOGL()
-{
- // Check the OpenGL capabilities for this renderer
- std::set oglExtensionSet;
- GetExtensionSetOGL(&oglExtensionSet);
+ UpdateVertices();
+ UpdateTexCoords(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT * 2);
// Set up textures
- glGenTextures(1, &this->_displayTexID);
- glBindTexture(GL_TEXTURE_2D, this->_displayTexID);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glBindTexture(GL_TEXTURE_2D, 0);
+ glGenTextures(1, &_texCPUFilterDstID);
+ glGenTextures(1, &_texInputVideoDataID);
+ _texOutputVideoDataID = _texInputVideoDataID;
+ _texPrevOutputVideoDataID = _texInputVideoDataID;
- // Set up shaders (but disable on PowerPC, since it doesn't seem to work there)
-#if defined(__i386__) || defined(__x86_64__)
- _isShaderSupported = IsExtensionPresent(oglExtensionSet, "GL_ARB_shader_objects") &&
- IsExtensionPresent(oglExtensionSet, "GL_ARB_vertex_shader") &&
- IsExtensionPresent(oglExtensionSet, "GL_ARB_fragment_shader") &&
- IsExtensionPresent(oglExtensionSet, "GL_ARB_vertex_program");
-#else
- this->_isShaderSupported = false;
-#endif
- if (this->_isShaderSupported)
- {
- bool isShaderSetUp = SetupShadersOGL(vertexProgram_100, fragmentProgram_100);
- if (isShaderSetUp)
- {
- glUseProgram(this->_shaderProgram);
-
- this->_uniformAngleDegrees = glGetUniformLocation(this->_shaderProgram, "angleDegrees");
- this->_uniformScalar = glGetUniformLocation(this->_shaderProgram, "scalar");
- this->_uniformViewSize = glGetUniformLocation(this->_shaderProgram, "viewSize");
-
- glUniform1f(this->_uniformAngleDegrees, 0.0f);
- glUniform1f(this->_uniformScalar, 1.0f);
- glUniform2f(this->_uniformViewSize, GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT*2.0 + (DS_DISPLAY_GAP*this->_gapScalar));
- }
- else
- {
- this->_isShaderSupported = false;
- }
- }
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, _texCPUFilterDstID);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, _texInputVideoDataID);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+ GLvoid *emptyTex = calloc(GPU_DISPLAY_WIDTH * GPU_DISPLAY_HEIGHT * 2, sizeof(uint32_t));
+ glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT * 2, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, emptyTex);
+ free(emptyTex);
+ emptyTex = NULL;
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
// Set up VBOs
glGenBuffersARB(1, &this->_vboVertexID);
@@ -164,14 +1788,14 @@ void OGLVideoOutput::InitializeOGL()
glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, this->_vboElementID);
- glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, sizeof(GLubyte) * 12, this->vtxIndexBuffer, GL_STATIC_DRAW_ARB);
+ glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, sizeof(GLubyte) * 12, outputElementBuffer, GL_STATIC_DRAW_ARB);
glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0);
// Set up VAO
glGenVertexArraysAPPLE(1, &this->_vaoMainStatesID);
glBindVertexArrayAPPLE(this->_vaoMainStatesID);
- if (this->_isShaderSupported)
+ if (this->_output->GetInfo()->IsShaderSupported())
{
glBindBufferARB(GL_ARRAY_BUFFER_ARB, this->_vboVertexID);
glVertexAttribPointer(OGLVertexAttributeID_Position, 2, GL_INT, GL_FALSE, 0, 0);
@@ -196,116 +1820,153 @@ void OGLVideoOutput::InitializeOGL()
glBindVertexArrayAPPLE(0);
- // Render State Setup (common to both shaders and fixed-function pipeline)
- glDisable(GL_BLEND);
- glDisable(GL_DEPTH_TEST);
- glDisable(GL_DITHER);
- glDisable(GL_STENCIL_TEST);
-
- // Set up fixed-function pipeline render states.
- if (!_isShaderSupported)
+ _canUseShaderOutput = this->_output->GetInfo()->IsShaderSupported();
+ if (_canUseShaderOutput)
{
- glDisable(GL_ALPHA_TEST);
- glDisable(GL_LIGHTING);
- glDisable(GL_FOG);
- glEnable(GL_TEXTURE_2D);
+ _finalOutputProgram = new OGLShaderProgram;
+ _finalOutputProgram->SetVertexAndFragmentShaderOGL(Sample1x1OutputVertShader_100, PassthroughOutputFragShader_110);
+
+ const GLuint finalOutputProgramID = _finalOutputProgram->GetProgramID();
+ glUseProgram(finalOutputProgramID);
+ _uniformFinalOutputAngleDegrees = glGetUniformLocation(finalOutputProgramID, "angleDegrees");
+ _uniformFinalOutputScalar = glGetUniformLocation(finalOutputProgramID, "scalar");
+ _uniformFinalOutputViewSize = glGetUniformLocation(finalOutputProgramID, "viewSize");
+ glUseProgram(0);
+ }
+ else
+ {
+ _finalOutputProgram = NULL;
}
- // Set up clear attributes
- glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
- glClear(GL_COLOR_BUFFER_BIT);
+ _canUseShaderBasedFilters = (_canUseShaderOutput && _output->GetInfo()->IsFBOSupported());
+ if (_canUseShaderBasedFilters)
+ {
+ _filterDeposterize = new OGLFilterDeposterize(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT * 2);
+
+ _shaderFilter = new OGLFilter(GPU_DISPLAY_WIDTH, GPU_DISPLAY_HEIGHT * 2, 1);
+ OGLShaderProgram *shaderFilterProgram = _shaderFilter->GetProgram();
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample1x1_VertShader_110, PassthroughFragShader_110);
+ }
+ else
+ {
+ _filterDeposterize = NULL;
+ _shaderFilter = NULL;
+ }
+
+ _useShaderBasedPixelScaler = false;
+ _filtersPreferGPU = true;
+ _outputFilter = OutputFilterTypeID_Bilinear;
}
-void OGLVideoOutput::TerminateOGL()
+OGLDisplayLayer::~OGLDisplayLayer()
{
- glDeleteTextures(1, &this->_displayTexID);
-
glDeleteVertexArraysAPPLE(1, &this->_vaoMainStatesID);
glDeleteBuffersARB(1, &this->_vboVertexID);
glDeleteBuffersARB(1, &this->_vboTexCoordID);
glDeleteBuffersARB(1, &this->_vboElementID);
+ glDeleteTextures(1, &this->_texCPUFilterDstID);
+ glDeleteTextures(1, &this->_texInputVideoDataID);
- if (this->_isShaderSupported)
+ if (_canUseShaderOutput)
{
glUseProgram(0);
-
- glDetachShader(this->_shaderProgram, this->_vertexShaderID);
- glDetachShader(this->_shaderProgram, this->_fragmentShaderID);
-
- glDeleteProgram(this->_shaderProgram);
- glDeleteShader(this->_vertexShaderID);
- glDeleteShader(this->_fragmentShaderID);
+ delete this->_finalOutputProgram;
}
+
+ if (_canUseShaderBasedFilters)
+ {
+ delete this->_filterDeposterize;
+ delete this->_shaderFilter;
+ }
+
+ delete this->_vfSingle;
+ delete this->_vfDual;
}
-int OGLVideoOutput::GetDisplayMode()
+bool OGLDisplayLayer::GetFiltersPreferGPU()
+{
+ return this->_filtersPreferGPU;
+}
+
+void OGLDisplayLayer::SetFiltersPreferGPUOGL(bool preferGPU)
+{
+ this->_filtersPreferGPU = preferGPU;
+ this->SetPixelScalerOGL(this->_pixelScaler);
+}
+
+int OGLDisplayLayer::GetMode()
{
return this->_displayMode;
}
-void OGLVideoOutput::SetDisplayMode(int dispMode)
+void OGLDisplayLayer::SetMode(int dispMode)
{
this->_displayMode = dispMode;
this->_vf = (dispMode == DS_DISPLAY_TYPE_DUAL) ? this->_vfDual : this->_vfSingle;
- this->CalculateDisplayNormalSize(&this->_normalWidth, &this->_normalHeight);
+ this->GetNormalSize(&this->_normalWidth, &this->_normalHeight);
this->UpdateVertices();
}
-int OGLVideoOutput::GetDisplayOrientation()
+int OGLDisplayLayer::GetOrientation()
{
return this->_displayOrientation;
}
-void OGLVideoOutput::SetDisplayOrientation(int dispOrientation)
+void OGLDisplayLayer::SetOrientation(int dispOrientation)
{
this->_displayOrientation = dispOrientation;
- this->CalculateDisplayNormalSize(&this->_normalWidth, &this->_normalHeight);
+ this->GetNormalSize(&this->_normalWidth, &this->_normalHeight);
this->UpdateVertices();
}
-GLfloat OGLVideoOutput::GetGapScalar()
+GLfloat OGLDisplayLayer::GetGapScalar()
{
return this->_gapScalar;
}
-void OGLVideoOutput::SetGapScalar(GLfloat theScalar)
+void OGLDisplayLayer::SetGapScalar(GLfloat theScalar)
{
this->_gapScalar = theScalar;
- this->CalculateDisplayNormalSize(&this->_normalWidth, &this->_normalHeight);
+ this->GetNormalSize(&this->_normalWidth, &this->_normalHeight);
this->UpdateVertices();
}
-GLfloat OGLVideoOutput::GetRotation()
+GLfloat OGLDisplayLayer::GetRotation()
{
return this->_rotation;
}
-void OGLVideoOutput::SetRotation(GLfloat theRotation)
+void OGLDisplayLayer::SetRotation(GLfloat theRotation)
{
this->_rotation = theRotation;
}
-bool OGLVideoOutput::GetDisplayBilinear()
+bool OGLDisplayLayer::GetBilinear()
{
return (this->_displayTexFilter == GL_LINEAR);
}
-void OGLVideoOutput::SetDisplayBilinearOGL(bool useBilinear)
+void OGLDisplayLayer::SetBilinear(bool useBilinear)
{
this->_displayTexFilter = (useBilinear) ? GL_LINEAR : GL_NEAREST;
-
- glBindTexture(GL_TEXTURE_2D, this->_displayTexID);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, this->_displayTexFilter);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, this->_displayTexFilter);
- glBindTexture(GL_TEXTURE_2D, 0);
}
-int OGLVideoOutput::GetDisplayOrder()
+bool OGLDisplayLayer::GetSourceDeposterize()
+{
+ return this->_useDeposterize;
+}
+
+void OGLDisplayLayer::SetSourceDeposterize(bool useDeposterize)
+{
+ this->_useDeposterize = useDeposterize;
+}
+
+int OGLDisplayLayer::GetOrder()
{
return this->_displayOrder;
}
-void OGLVideoOutput::SetDisplayOrder(int dispOrder)
+void OGLDisplayLayer::SetOrder(int dispOrder)
{
this->_displayOrder = dispOrder;
@@ -317,254 +1978,11 @@ void OGLVideoOutput::SetDisplayOrder(int dispOrder)
{
this->_vtxBufferOffset = (2 * 8);
}
+
+ this->_needUploadVertices = true;
}
-void OGLVideoOutput::SetViewportSizeOGL(GLsizei w, GLsizei h)
-{
- this->_viewportWidth = w;
- this->_viewportHeight = h;
- const CGSize checkSize = GetTransformedBounds(this->_normalWidth, this->_normalHeight, 1.0, this->_rotation);
- const GLdouble s = GetMaxScalarInBounds(checkSize.width, checkSize.height, w, h);
-
- glViewport(0, 0, w, h);
-
- if (this->_isShaderSupported)
- {
- glUniform2f(this->_uniformViewSize, w, h);
- glUniform1f(this->_uniformScalar, s);
- }
- else
- {
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glOrtho(-w/2, -w/2 + w, -h/2, -h/2 + h, -1.0, 1.0);
- glRotatef(CLOCKWISE_DEGREES(this->_rotation), 0.0f, 0.0f, 1.0f);
- glScalef(s, s, 1.0f);
- }
-}
-
-void OGLVideoOutput::UpdateDisplayTransformationOGL()
-{
- const CGSize checkSize = GetTransformedBounds(this->_normalWidth, this->_normalHeight, 1.0, this->_rotation);
- const GLdouble s = GetMaxScalarInBounds(checkSize.width, checkSize.height, this->_viewportWidth, this->_viewportHeight);
-
- if (this->_isShaderSupported)
- {
- glUniform1f(this->_uniformAngleDegrees, this->_rotation);
- glUniform1f(this->_uniformScalar, s);
- }
- else
- {
- glMatrixMode(GL_MODELVIEW);
- glLoadIdentity();
- glRotatef(CLOCKWISE_DEGREES(this->_rotation), 0.0f, 0.0f, 1.0f);
- glScalef(s, s, 1.0f);
- }
-}
-
-void OGLVideoOutput::SetVideoFilterOGL(const VideoFilterTypeID videoFilterTypeID)
-{
- this->_vfSingle->ChangeFilterByID(videoFilterTypeID);
- this->_vfDual->ChangeFilterByID(videoFilterTypeID);
-
- const GLsizei vfDstWidth = this->_vf->GetDstWidth();
- const GLsizei vfDstHeight = (this->_displayMode == DS_DISPLAY_TYPE_DUAL) ? this->_vf->GetDstHeight() : this->_vf->GetDstHeight() * 2;
-
- // Convert textures to Power-of-Two to support older GPUs
- // Example: Radeon X1600M on the 2006 MacBook Pro
- const GLsizei potW = GetNearestPositivePOT((uint32_t)vfDstWidth);
- const GLsizei potH = GetNearestPositivePOT((uint32_t)vfDstHeight);
- const size_t texBackSize = potW * potH * sizeof(uint32_t);
-
- if (this->_glTexBackWidth != potW || this->_glTexBackHeight != potH)
- {
- this->_glTexBackWidth = potW;
- this->_glTexBackHeight = potH;
-
- this->_glTexBack = (GLvoid *)realloc(this->_glTexBack, texBackSize);
- if (this->_glTexBack == NULL)
- {
- return;
- }
- }
-
- memset(this->_glTexBack, 0, texBackSize);
-
- const GLfloat s = (GLfloat)vfDstWidth / (GLfloat)potW;
- const GLfloat t = (GLfloat)vfDstHeight / (GLfloat)potH;
- this->UpdateTexCoords(s, t);
-
- glBindTexture(GL_TEXTURE_2D, this->_displayTexID);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)potW, (GLsizei)potH, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, this->_glTexBack);
- glBindTexture(GL_TEXTURE_2D, 0);
- this->UploadTexCoordsOGL();
-}
-
-void OGLVideoOutput::CalculateDisplayNormalSize(double *w, double *h)
-{
- if (w == NULL || h == NULL)
- {
- return;
- }
-
- if (this->_displayMode != DS_DISPLAY_TYPE_DUAL)
- {
- *w = GPU_DISPLAY_WIDTH;
- *h = GPU_DISPLAY_HEIGHT;
- return;
- }
-
- if (this->_displayOrientation == DS_DISPLAY_ORIENTATION_VERTICAL)
- {
- *w = GPU_DISPLAY_WIDTH;
- *h = GPU_DISPLAY_HEIGHT * 2.0 + (DS_DISPLAY_GAP * this->_gapScalar);
- }
- else
- {
- *w = GPU_DISPLAY_WIDTH * 2.0 + (DS_DISPLAY_GAP * this->_gapScalar);
- *h = GPU_DISPLAY_HEIGHT;
- }
-}
-
-void OGLVideoOutput::GetExtensionSetOGL(std::set *oglExtensionSet)
-{
- std::string oglExtensionString = std::string((const char *)glGetString(GL_EXTENSIONS));
-
- size_t extStringStartLoc = 0;
- size_t delimiterLoc = oglExtensionString.find_first_of(' ', extStringStartLoc);
- while (delimiterLoc != std::string::npos)
- {
- std::string extensionName = oglExtensionString.substr(extStringStartLoc, delimiterLoc - extStringStartLoc);
- oglExtensionSet->insert(extensionName);
-
- extStringStartLoc = delimiterLoc + 1;
- delimiterLoc = oglExtensionString.find_first_of(' ', extStringStartLoc);
- }
-
- if (extStringStartLoc - oglExtensionString.length() > 0)
- {
- std::string extensionName = oglExtensionString.substr(extStringStartLoc, oglExtensionString.length() - extStringStartLoc);
- oglExtensionSet->insert(extensionName);
- }
-}
-
-bool OGLVideoOutput::IsExtensionPresent(const std::set &oglExtensionSet, const std::string &extensionName) const
-{
- if (oglExtensionSet.size() == 0)
- {
- return false;
- }
-
- return (oglExtensionSet.find(extensionName) != oglExtensionSet.end());
-}
-
-bool OGLVideoOutput::SetupShadersOGL(const char *vertexProgram, const char *fragmentProgram)
-{
- bool result = false;
- GLint shaderStatus = GL_TRUE;
-
- this->_vertexShaderID = glCreateShader(GL_VERTEX_SHADER);
- if (this->_vertexShaderID == 0)
- {
- printf("OpenGL Error - Failed to create vertex shader.");
- return result;
- }
-
- glShaderSource(this->_vertexShaderID, 1, (const GLchar **)&vertexProgram, NULL);
- glCompileShader(this->_vertexShaderID);
- glGetShaderiv(this->_vertexShaderID, GL_COMPILE_STATUS, &shaderStatus);
- if (shaderStatus == GL_FALSE)
- {
- glDeleteShader(this->_vertexShaderID);
- printf("OpenGL Error - Failed to compile vertex shader.");
- return result;
- }
-
- this->_fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
- if (this->_fragmentShaderID == 0)
- {
- glDeleteShader(this->_vertexShaderID);
- printf("OpenGL Error - Failed to create fragment shader.");
- return result;
- }
-
- glShaderSource(this->_fragmentShaderID, 1, (const GLchar **)&fragmentProgram, NULL);
- glCompileShader(this->_fragmentShaderID);
- glGetShaderiv(this->_fragmentShaderID, GL_COMPILE_STATUS, &shaderStatus);
- if (shaderStatus == GL_FALSE)
- {
- glDeleteShader(this->_vertexShaderID);
- glDeleteShader(this->_fragmentShaderID);
- printf("OpenGL Error - Failed to compile fragment shader.");
- return result;
- }
-
- this->_shaderProgram = glCreateProgram();
- if (this->_shaderProgram == 0)
- {
- glDeleteShader(this->_vertexShaderID);
- glDeleteShader(this->_fragmentShaderID);
- printf("OpenGL Error - Failed to create shader program.");
- return result;
- }
-
- glAttachShader(this->_shaderProgram, this->_vertexShaderID);
- glAttachShader(this->_shaderProgram, this->_fragmentShaderID);
-
- this->SetupShaderIO_OGL();
-
- glLinkProgram(this->_shaderProgram);
- glGetProgramiv(this->_shaderProgram, GL_LINK_STATUS, &shaderStatus);
- if (shaderStatus == GL_FALSE)
- {
- glDeleteProgram(this->_shaderProgram);
- glDeleteShader(this->_vertexShaderID);
- glDeleteShader(this->_fragmentShaderID);
- printf("OpenGL Error - Failed to link shader program.");
- return result;
- }
-
- glValidateProgram(this->_shaderProgram);
-
- result = true;
- return result;
-}
-
-void OGLVideoOutput::SetupShaderIO_OGL()
-{
- glBindAttribLocation(this->_shaderProgram, OGLVertexAttributeID_Position, "inPosition");
- glBindAttribLocation(this->_shaderProgram, OGLVertexAttributeID_TexCoord0, "inTexCoord0");
-}
-
-void OGLVideoOutput::UploadVerticesOGL()
-{
- glBindBufferARB(GL_ARRAY_BUFFER_ARB, this->_vboVertexID);
- glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLint) * (2 * 8), this->vtxBuffer + this->_vtxBufferOffset);
- glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-}
-
-void OGLVideoOutput::UploadTexCoordsOGL()
-{
- glBindBufferARB(GL_ARRAY_BUFFER_ARB, this->_vboTexCoordID);
- glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLfloat) * (2 * 8), this->texCoordBuffer);
- glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
-}
-
-void OGLVideoOutput::UploadDisplayTextureOGL(const GLvoid *textureData, const GLenum texPixelFormat, const GLenum texPixelType, GLsizei texWidth, GLsizei texHeight)
-{
- if (textureData == NULL)
- {
- return;
- }
-
- const GLint lineOffset = (this->_displayMode == DS_DISPLAY_TYPE_TOUCH) ? texHeight : 0;
-
- glBindTexture(GL_TEXTURE_2D, this->_displayTexID);
- glTexSubImage2D(GL_TEXTURE_2D, 0, 0, lineOffset, texWidth, texHeight, texPixelFormat, texPixelType, textureData);
- glBindTexture(GL_TEXTURE_2D, 0);
-}
-
-void OGLVideoOutput::UpdateVertices()
+void OGLDisplayLayer::UpdateVertices()
{
const GLfloat w = GPU_DISPLAY_WIDTH;
const GLfloat h = GPU_DISPLAY_HEIGHT;
@@ -612,9 +2030,11 @@ void OGLVideoOutput::UpdateVertices()
memcpy(vtxBuffer + (1 * 8), vtxBuffer + (0 * 8), sizeof(GLint) * (1 * 8)); // Second display
memcpy(vtxBuffer + (2 * 8), vtxBuffer + (0 * 8), sizeof(GLint) * (2 * 8)); // Second display
}
+
+ this->_needUploadVertices = true;
}
-void OGLVideoOutput::UpdateTexCoords(GLfloat s, GLfloat t)
+void OGLDisplayLayer::UpdateTexCoords(GLfloat s, GLfloat t)
{
texCoordBuffer[0] = 0.0f; texCoordBuffer[1] = 0.0f;
texCoordBuffer[2] = s; texCoordBuffer[3] = 0.0f;
@@ -627,36 +2047,326 @@ void OGLVideoOutput::UpdateTexCoords(GLfloat s, GLfloat t)
texCoordBuffer[14] = 0.0f; texCoordBuffer[15] = t;
}
-void OGLVideoOutput::PrerenderOGL(const GLvoid *textureData, GLsizei texWidth, GLsizei texHeight)
+bool OGLDisplayLayer::CanUseShaderBasedFilters()
{
- GLenum texPixelFormat = GL_RGBA;
- GLenum texPixelType = GL_UNSIGNED_SHORT_1_5_5_5_REV;
- uint32_t *vfTextureData = (uint32_t *)textureData;
-
- VideoFilter *currentFilter = this->_vf;
- if (currentFilter->GetTypeID() != VideoFilterTypeID_None)
+ return this->_canUseShaderBasedFilters;
+}
+
+void OGLDisplayLayer::GetNormalSize(double *w, double *h)
+{
+ if (w == NULL || h == NULL)
{
- if (texPixelType == GL_UNSIGNED_SHORT_1_5_5_5_REV)
+ return;
+ }
+
+ if (this->_displayMode != DS_DISPLAY_TYPE_DUAL)
+ {
+ *w = GPU_DISPLAY_WIDTH;
+ *h = GPU_DISPLAY_HEIGHT;
+ return;
+ }
+
+ if (this->_displayOrientation == DS_DISPLAY_ORIENTATION_VERTICAL)
+ {
+ *w = GPU_DISPLAY_WIDTH;
+ *h = GPU_DISPLAY_HEIGHT * 2.0 + (DS_DISPLAY_GAP * this->_gapScalar);
+ }
+ else
+ {
+ *w = GPU_DISPLAY_WIDTH * 2.0 + (DS_DISPLAY_GAP * this->_gapScalar);
+ *h = GPU_DISPLAY_HEIGHT;
+ }
+}
+
+void OGLDisplayLayer::UploadVerticesOGL()
+{
+ glBindBufferARB(GL_ARRAY_BUFFER_ARB, this->_vboVertexID);
+ glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLint) * (2 * 8), this->vtxBuffer + this->_vtxBufferOffset);
+ glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+ this->_needUploadVertices = false;
+}
+
+void OGLDisplayLayer::UploadTexCoordsOGL()
+{
+ glBindBufferARB(GL_ARRAY_BUFFER_ARB, this->_vboTexCoordID);
+ glBufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(GLfloat) * (2 * 8), this->texCoordBuffer);
+ glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0);
+}
+
+void OGLDisplayLayer::UploadTransformationOGL()
+{
+ const double w = this->_viewportWidth;
+ const double h = this->_viewportHeight;
+ const CGSize checkSize = GetTransformedBounds(this->_normalWidth, this->_normalHeight, 1.0, this->_rotation);
+ const GLdouble s = GetMaxScalarInBounds(checkSize.width, checkSize.height, w, h);
+
+ if (this->_output->GetInfo()->IsShaderSupported())
+ {
+ glUniform2f(this->_uniformFinalOutputViewSize, w, h);
+ glUniform1f(this->_uniformFinalOutputAngleDegrees, this->_rotation);
+ glUniform1f(this->_uniformFinalOutputScalar, s);
+ }
+ else
+ {
+ glMatrixMode(GL_PROJECTION);
+ glLoadIdentity();
+ glOrtho(-w/2.0, -w/2.0 + w, -h/2.0, -h/2.0 + h, -1.0, 1.0);
+
+ glMatrixMode(GL_MODELVIEW);
+ glLoadIdentity();
+ glRotatef(CLOCKWISE_DEGREES(this->_rotation), 0.0f, 0.0f, 1.0f);
+ glScalef(s, s, 1.0f);
+ }
+}
+
+int OGLDisplayLayer::GetOutputFilter()
+{
+ return this->_outputFilter;
+}
+
+void OGLDisplayLayer::SetOutputFilterOGL(const int filterID)
+{
+ this->_displayTexFilter = GL_NEAREST;
+
+ if (this->_canUseShaderBasedFilters)
+ {
+ this->_outputFilter = filterID;
+
+ switch (filterID)
{
- RGB555ToBGRA8888Buffer((const uint16_t *)vfTextureData, (uint32_t *)currentFilter->GetSrcBufferPtr(), texWidth * texHeight);
- texPixelFormat = GL_BGRA;
- texPixelType = GL_UNSIGNED_INT_8_8_8_8_REV;
+ case OutputFilterTypeID_NearestNeighbor:
+ this->_finalOutputProgram->SetVertexAndFragmentShaderOGL(Sample1x1OutputVertShader_100, PassthroughOutputFragShader_110);
+ break;
+
+ case OutputFilterTypeID_Bilinear:
+ this->_finalOutputProgram->SetVertexAndFragmentShaderOGL(Sample1x1OutputVertShader_100, PassthroughOutputFragShader_110);
+ this->_displayTexFilter = GL_LINEAR;
+ break;
+
+ case OutputFilterTypeID_BicubicBSpline:
+ this->_finalOutputProgram->SetVertexAndFragmentShaderOGL(BicubicSample4x4Output_VertShader_110, FilterBicubicBSplineFragShader_110);
+ break;
+
+ case OutputFilterTypeID_BicubicMitchell:
+ this->_finalOutputProgram->SetVertexAndFragmentShaderOGL(BicubicSample4x4Output_VertShader_110, FilterBicubicMitchellNetravaliFragShader_110);
+ break;
+
+ case OutputFilterTypeID_Lanczos2:
+ this->_finalOutputProgram->SetVertexAndFragmentShaderOGL(BicubicSample4x4Output_VertShader_110, FilterLanczos2FragShader_110);
+ break;
+
+ case OutputFilterTypeID_Lanczos3:
+ this->_finalOutputProgram->SetVertexAndFragmentShaderOGL(Sample1x1OutputVertShader_100, FilterLanczos3FragShader_110);
+ break;
+
+ default:
+ this->_finalOutputProgram->SetVertexAndFragmentShaderOGL(Sample1x1OutputVertShader_100, PassthroughOutputFragShader_110);
+ this->_outputFilter = OutputFilterTypeID_NearestNeighbor;
+ break;
+ }
+ }
+ else
+ {
+ if (filterID == OutputFilterTypeID_Bilinear)
+ {
+ this->_displayTexFilter = GL_LINEAR;
+ this->_outputFilter = filterID;
}
else
{
- memcpy(currentFilter->GetSrcBufferPtr(), vfTextureData, texWidth * texHeight * sizeof(uint32_t));
+ this->_outputFilter = OutputFilterTypeID_NearestNeighbor;
}
-
- vfTextureData = currentFilter->RunFilter();
- texWidth = currentFilter->GetDstWidth();
- texHeight = currentFilter->GetDstHeight();
}
-
- this->UploadDisplayTextureOGL(vfTextureData, texPixelFormat, texPixelType, texWidth, texHeight);
}
-void OGLVideoOutput::RenderOGL()
+int OGLDisplayLayer::GetPixelScaler()
{
+ return this->_pixelScaler;
+}
+
+void OGLDisplayLayer::SetPixelScalerOGL(const int filterID)
+{
+ if (this->_canUseShaderBasedFilters && this->_filtersPreferGPU) // Try a shader-based filter first
+ {
+ OGLShaderProgram *shaderFilterProgram = _shaderFilter->GetProgram();
+ this->_useShaderBasedPixelScaler = true;
+ this->_pixelScaler = filterID;
+
+ VideoFilterAttributes vfAttr = VideoFilter::GetAttributesByID((VideoFilterTypeID)filterID);
+ GLfloat vfScale = (GLfloat)vfAttr.scaleMultiply / (GLfloat)vfAttr.scaleDivide;
+
+ switch (filterID)
+ {
+ case VideoFilterTypeID_Nearest1_5X:
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample1x1_VertShader_110, PassthroughFragShader_110);
+ break;
+
+ case VideoFilterTypeID_Nearest2X:
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample1x1_VertShader_110, PassthroughFragShader_110);
+ break;
+
+ case VideoFilterTypeID_Scanline:
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample1x1_VertShader_110, Scalar2xScanlineFragShader_110);
+ break;
+
+ case VideoFilterTypeID_EPX:
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample3x3_VertShader_110, Scalar2xEPXFragShader_110);
+ break;
+
+ case VideoFilterTypeID_EPXPlus:
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample3x3_VertShader_110, Scalar2xEPXPlusFragShader_110);
+ break;
+
+ case VideoFilterTypeID_2xSaI:
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample4x4_VertShader_110, Scalar2xSaIFragShader_110);
+ break;
+
+ case VideoFilterTypeID_Super2xSaI:
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample4x4_VertShader_110, ScalarSuper2xSaIFragShader_110);
+ break;
+
+ case VideoFilterTypeID_SuperEagle:
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample4x4_VertShader_110, ScalarSuperEagle2xFragShader_110);
+ break;
+
+ default:
+ shaderFilterProgram->SetVertexAndFragmentShaderOGL(Sample1x1_VertShader_110, PassthroughFragShader_110);
+ this->_useShaderBasedPixelScaler = false;
+ this->_pixelScaler = VideoFilterTypeID_None;
+ vfScale = 1.0f;
+ break;
+ }
+
+ _shaderFilter->SetScaleOGL(vfScale);
+ }
+ else
+ {
+ this->_useShaderBasedPixelScaler = false;
+ }
+
+ if (!this->_useShaderBasedPixelScaler) // Try a CPU-based filter, or just set to None
+ {
+ const char *cpuTypeIDString = VideoFilter::GetTypeStringByID((VideoFilterTypeID)filterID);
+ if (strstr(cpuTypeIDString, VIDEOFILTERTYPE_UNKNOWN_STRING) == NULL)
+ {
+ this->SetCPUFilterOGL((VideoFilterTypeID)filterID);
+ this->_pixelScaler = filterID;
+ }
+ else
+ {
+ this->SetCPUFilterOGL(VideoFilterTypeID_None);
+ this->_pixelScaler = VideoFilterTypeID_None;
+ }
+ }
+}
+
+void OGLDisplayLayer::SetCPUFilterOGL(const VideoFilterTypeID videoFilterTypeID)
+{
+ bool needResizeTexture = false;
+ this->_vfSingle->ChangeFilterByID(videoFilterTypeID);
+ this->_vfDual->ChangeFilterByID(videoFilterTypeID);
+
+ const GLsizei vfDstWidth = this->_vf->GetDstWidth();
+ const GLsizei vfDstHeight = (this->_displayMode == DS_DISPLAY_TYPE_DUAL) ? this->_vf->GetDstHeight() : this->_vf->GetDstHeight() * 2;
+
+ if (this->_glTexBackWidth != vfDstWidth || this->_glTexBackHeight != vfDstHeight)
+ {
+ this->_glTexBackWidth = vfDstWidth;
+ this->_glTexBackHeight = vfDstHeight;
+ needResizeTexture = true;
+ }
+
+ if (needResizeTexture)
+ {
+ uint32_t *texBack = (uint32_t *)calloc(this->_glTexBackWidth * this->_glTexBackHeight, sizeof(uint32_t));
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texCPUFilterDstID);
+ glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, vfDstWidth, vfDstHeight, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texBack);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+ free(texBack);
+ }
+}
+
+void OGLDisplayLayer::ProcessOGL(const uint16_t *videoData, GLsizei w, GLsizei h)
+{
+ VideoFilter *currentFilter = this->_vf;
+ GLint lineOffset = (this->_displayMode == DS_DISPLAY_TYPE_TOUCH) ? h : 0;
+
+ // Determine whether we should take CPU-based path or a GPU-based path
+ if ((currentFilter->GetTypeID() != VideoFilterTypeID_None) && !this->_useShaderBasedPixelScaler)
+ {
+ if (!(this->_canUseShaderBasedFilters && this->_useDeposterize)) // Pure CPU-based path
+ {
+ RGB555ToBGRA8888Buffer((const uint16_t *)videoData, (uint32_t *)currentFilter->GetSrcBufferPtr(), w * h);
+ }
+ else // Hybrid CPU/GPU-based path (may cause a performance hit on pixel download)
+ {
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texInputVideoDataID);
+ glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 0, lineOffset, w, h, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, videoData);
+
+ this->_filterDeposterize->RunFilterOGL(this->_texInputVideoDataID, this->_viewportWidth, this->_viewportHeight);
+
+ const GLsizei readLineCount = (this->_displayMode == DS_DISPLAY_TYPE_DUAL) ? GPU_DISPLAY_HEIGHT * 2 : GPU_DISPLAY_HEIGHT;
+ this->_filterDeposterize->DownloadDstBufferOGL(currentFilter->GetSrcBufferPtr(), lineOffset, readLineCount);
+ }
+
+ uint32_t *texData = currentFilter->RunFilter();
+ w = currentFilter->GetDstWidth();
+ h = currentFilter->GetDstHeight();
+ lineOffset = (this->_displayMode == DS_DISPLAY_TYPE_TOUCH) ? h : 0;
+
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texCPUFilterDstID);
+ glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 0, lineOffset, w, h, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, texData);
+
+ this->_texOutputVideoDataID = this->_texCPUFilterDstID;
+ this->UpdateTexCoords(w, (this->_displayMode == DS_DISPLAY_TYPE_DUAL) ? h : h*2);
+ }
+ else // Pure GPU-based path
+ {
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texInputVideoDataID);
+ glTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, 0, lineOffset, w, h, GL_RGBA, GL_UNSIGNED_SHORT_1_5_5_5_REV, videoData);
+
+ if (this->_canUseShaderBasedFilters && this->_useDeposterize)
+ {
+ this->_texOutputVideoDataID = this->_filterDeposterize->RunFilterOGL(this->_texInputVideoDataID, this->_viewportWidth, this->_viewportHeight);
+ }
+ else
+ {
+ this->_texOutputVideoDataID = this->_texInputVideoDataID;
+ }
+
+ if (this->_displayMode != DS_DISPLAY_TYPE_DUAL)
+ {
+ h *= 2;
+ }
+
+ if (this->_useShaderBasedPixelScaler)
+ {
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texOutputVideoDataID);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+ this->_texOutputVideoDataID = this->_shaderFilter->RunFilterOGL(this->_texOutputVideoDataID, this->_viewportWidth, this->_viewportHeight);
+ w = this->_shaderFilter->GetDstWidth();
+ h = this->_shaderFilter->GetDstHeight();
+ }
+
+ this->UpdateTexCoords(w, h);
+ }
+
+ this->UploadTexCoordsOGL();
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
+}
+
+void OGLDisplayLayer::RenderOGL()
+{
+ glUseProgram(this->_finalOutputProgram->GetProgramID());
+ this->UploadTransformationOGL();
+
+ if (_needUploadVertices)
+ {
+ this->UploadVerticesOGL();
+ }
+
// Enable vertex attributes
glBindVertexArrayAPPLE(this->_vaoMainStatesID);
@@ -664,9 +2374,11 @@ void OGLVideoOutput::RenderOGL()
const GLubyte *elementPointer = !(this->_displayMode == DS_DISPLAY_TYPE_TOUCH) ? 0 : (GLubyte *)(vtxElementCount * sizeof(GLubyte));
glClear(GL_COLOR_BUFFER_BIT);
- glBindTexture(GL_TEXTURE_2D, this->_displayTexID);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, this->_texOutputVideoDataID);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, this->_displayTexFilter);
+ glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, this->_displayTexFilter);
glDrawElements(GL_TRIANGLES, vtxElementCount, GL_UNSIGNED_BYTE, elementPointer);
- glBindTexture(GL_TEXTURE_2D, 0);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, 0);
// Disable vertex attributes
glBindVertexArrayAPPLE(0);
diff --git a/desmume/src/cocoa/OGLDisplayOutput.h b/desmume/src/cocoa/OGLDisplayOutput.h
index 26e5e9c02..10544c5b2 100644
--- a/desmume/src/cocoa/OGLDisplayOutput.h
+++ b/desmume/src/cocoa/OGLDisplayOutput.h
@@ -27,87 +27,280 @@
#include
#include "../filter/videofilter.h"
+class OGLVideoOutput;
-class OGLVideoOutput
+enum
+{
+ OutputFilterTypeID_NearestNeighbor = 0,
+ OutputFilterTypeID_Bilinear = 1,
+ OutputFilterTypeID_BicubicBSpline = 2,
+ OutputFilterTypeID_BicubicMitchell = 3,
+ OutputFilterTypeID_Lanczos2 = 4,
+ OutputFilterTypeID_Lanczos3 = 5
+};
+
+class OGLInfo
{
protected:
+ unsigned int _versionMajor;
+ unsigned int _versionMinor;
+ unsigned int _versionRevision;
+
+ bool _isVBOSupported;
+ bool _isPBOSupported;
+ bool _isShaderSupported;
+ bool _isFBOSupported;
+
+public:
+ OGLInfo();
+ virtual ~OGLInfo() {};
+
+ static OGLInfo* GetVersionedObjectOGL();
+
+ bool IsVBOSupported();
+ bool IsPBOSupported();
+ bool IsShaderSupported();
+ bool IsFBOSupported();
+
+ virtual void GetExtensionSetOGL(std::set *oglExtensionSet) = 0;
+ virtual bool IsExtensionPresent(const std::set &oglExtensionSet, const std::string &extensionName) const = 0;
+};
+
+class OGLInfo_1_2 : public OGLInfo
+{
+public:
+ OGLInfo_1_2();
+
+ virtual void GetExtensionSetOGL(std::set *oglExtensionSet);
+ virtual bool IsExtensionPresent(const std::set &oglExtensionSet, const std::string &extensionName) const;
+};
+
+class OGLInfo_2_0 : public OGLInfo_1_2
+{
+public:
+ OGLInfo_2_0();
+};
+
+class OGLInfo_2_1 : public OGLInfo_2_0
+{
+public:
+ OGLInfo_2_1();
+};
+
+class OGLInfo_3_2 : public OGLInfo_2_0
+{
+public:
+ OGLInfo_3_2();
+
+ virtual void GetExtensionSetOGL(std::set *oglExtensionSet);
+};
+
+class OGLShaderProgram
+{
+protected:
+ GLuint _vertexID;
+ GLuint _fragmentID;
+ GLuint _programID;
+
+ virtual GLuint LoadShaderOGL(GLenum shaderType, const char *shaderProgram);
+ virtual bool LinkOGL();
+
+public:
+ OGLShaderProgram();
+ virtual ~OGLShaderProgram();
+
+ GLuint GetVertexShaderID();
+ void SetVertexShaderOGL(const char *shaderProgram);
+ GLuint GetFragmentShaderID();
+ void SetFragmentShaderOGL(const char *shaderProgram);
+ void SetVertexAndFragmentShaderOGL(const char *vertShaderProgram, const char *fragShaderProgram);
+ GLuint GetProgramID();
+};
+
+class OGLFilter
+{
+private:
+ void OGLFilterInit(GLsizei srcWidth, GLsizei srcHeight, GLfloat scale);
+
+protected:
+ OGLShaderProgram *_program;
+ GLuint _texDstID;
+ GLint _texCoordBuffer[8];
+
+ GLuint _fboID;
+ GLuint _vaoID;
+ GLuint _vboVtxID;
+ GLuint _vboTexCoordID;
+ GLuint _vboElementID;
+
+ GLfloat _scale;
+ GLsizei _srcWidth;
+ GLsizei _srcHeight;
+ GLsizei _dstWidth;
+ GLsizei _dstHeight;
+
+public:
+ OGLFilter();
+ OGLFilter(GLsizei srcWidth, GLsizei srcHeight, GLfloat scale);
+ virtual ~OGLFilter();
+ static void GetSupport(int vfTypeID, bool *outSupportCPU, bool *outSupportShader);
+
+ OGLShaderProgram* GetProgram();
+ GLuint GetDstTexID();
+ GLsizei GetDstWidth();
+ GLsizei GetDstHeight();
+ void SetSrcSizeOGL(GLsizei w, GLsizei h);
+ GLfloat GetScale();
+ void SetScaleOGL(GLfloat scale);
+ virtual GLuint RunFilterOGL(GLuint srcTexID, GLsizei viewportWidth, GLsizei viewportHeight);
+ void DownloadDstBufferOGL(uint32_t *dstBuffer, size_t lineOffset, size_t readLineCount);
+};
+
+class OGLFilterDeposterize : public OGLFilter
+{
+protected:
+ GLuint _texIntermediateID;
+
+public:
+ OGLFilterDeposterize(GLsizei srcWidth, GLsizei srcHeight);
+ ~OGLFilterDeposterize();
+
+ virtual GLuint RunFilterOGL(GLuint srcTexID, GLsizei viewportWidth, GLsizei viewportHeight);
+};
+
+class OGLVideoLayer
+{
+protected:
+ OGLVideoOutput *_output;
+ GLsizei _viewportWidth;
+ GLsizei _viewportHeight;
+
+public:
+ OGLVideoLayer() {};
+ ~OGLVideoLayer() {};
+
+ void SetViewportSizeOGL(GLsizei w, GLsizei h)
+ {
+ this->_viewportWidth = w;
+ this->_viewportHeight = h;
+ };
+
+ virtual void ProcessOGL(const uint16_t *videoData, GLsizei w, GLsizei h) {};
+ virtual void RenderOGL() {};
+};
+
+class OGLDisplayLayer : public OGLVideoLayer
+{
+protected:
+ bool _canUseShaderBasedFilters;
+ bool _canUseShaderOutput;
+
+ bool _needUploadVertices;
+ bool _useDeposterize;
+ bool _useShaderBasedPixelScaler;
+ bool _filtersPreferGPU;
+ int _outputFilter;
+ int _pixelScaler;
+
+ OGLFilterDeposterize *_filterDeposterize;
+ OGLFilter *_shaderFilter;
+ OGLShaderProgram *_finalOutputProgram;
+
VideoFilter *_vfSingle;
VideoFilter *_vfDual;
VideoFilter *_vf;
- bool _isShaderSupported;
- double _normalWidth;
- double _normalHeight;
int _displayMode;
int _displayOrder;
int _displayOrientation;
-
- GLint _displayTexFilter;
- GLsizei _viewportWidth;
- GLsizei _viewportHeight;
+ double _normalWidth;
+ double _normalHeight;
GLfloat _gapScalar;
GLfloat _rotation;
- GLvoid *_glTexBack;
+ GLint _displayTexFilter;
+ GLuint _texCPUFilterDstID;
GLsizei _glTexBackWidth;
GLsizei _glTexBackHeight;
- GLuint _displayTexID;
+ GLint vtxBuffer[4 * 8];
+ GLfloat texCoordBuffer[2 * 8];
+ size_t _vtxBufferOffset;
+
+ GLuint _texInputVideoDataID;
+ GLuint _texOutputVideoDataID;
+ GLuint _texPrevOutputVideoDataID;
+ GLuint _vaoMainStatesID;
GLuint _vboVertexID;
GLuint _vboTexCoordID;
GLuint _vboElementID;
- GLuint _vaoMainStatesID;
- GLuint _vertexShaderID;
- GLuint _fragmentShaderID;
- GLuint _shaderProgram;
- GLint _uniformAngleDegrees;
- GLint _uniformScalar;
- GLint _uniformViewSize;
+ GLint _uniformFinalOutputAngleDegrees;
+ GLint _uniformFinalOutputScalar;
+ GLint _uniformFinalOutputViewSize;
- GLint vtxBuffer[4 * 8];
- GLfloat texCoordBuffer[2 * 8];
- GLubyte vtxIndexBuffer[12];
- size_t _vtxBufferOffset;
+ virtual void UploadVerticesOGL();
+ virtual void UploadTexCoordsOGL();
+ virtual void UploadTransformationOGL();
- void CalculateDisplayNormalSize(double *w, double *h);
void UpdateVertices();
void UpdateTexCoords(GLfloat s, GLfloat t);
- void GetExtensionSetOGL(std::set *oglExtensionSet);
- bool IsExtensionPresent(const std::set &oglExtensionSet, const std::string &extensionName) const;
- bool SetupShadersOGL(const char *vertexProgram, const char *fragmentProgram);
- void SetupShaderIO_OGL();
+public:
+ OGLDisplayLayer(OGLVideoOutput *oglVO);
+ ~OGLDisplayLayer();
+
+ bool GetFiltersPreferGPU();
+ void SetFiltersPreferGPUOGL(bool preferGPU);
+
+ int GetMode();
+ void SetMode(int dispMode);
+ int GetOrientation();
+ void SetOrientation(int dispOrientation);
+ int GetOrder();
+ void SetOrder(int dispOrder);
+ GLfloat GetGapScalar();
+ void SetGapScalar(GLfloat theScalar);
+ GLfloat GetRotation();
+ void SetRotation(GLfloat theRotation);
+ bool GetBilinear();
+ void SetBilinear(bool useBilinear);
+ bool GetSourceDeposterize();
+ void SetSourceDeposterize(bool useDeposterize);
+
+ bool CanUseShaderBasedFilters();
+ void GetNormalSize(double *w, double *h);
+
+ int GetOutputFilter();
+ virtual void SetOutputFilterOGL(const int filterID);
+ int GetPixelScaler();
+ virtual void SetPixelScalerOGL(const int filterID);
+ virtual void SetCPUFilterOGL(const VideoFilterTypeID videoFilterTypeID);
+ virtual void ProcessOGL(const uint16_t *videoData, GLsizei w, GLsizei h);
+ virtual void RenderOGL();
+};
+
+class OGLVideoOutput
+{
+protected:
+ OGLInfo *_info;
+ GLsizei _viewportWidth;
+ GLsizei _viewportHeight;
+ std::vector *_layerList;
public:
OGLVideoOutput();
~OGLVideoOutput();
- virtual void InitializeOGL();
- virtual void TerminateOGL();
-
- virtual void UploadVerticesOGL();
- virtual void UploadTexCoordsOGL();
- virtual void UploadDisplayTextureOGL(const GLvoid *textureData, const GLenum texPixelFormat, const GLenum texPixelType, GLsizei texWidth, GLsizei texHeight);
-
- virtual void PrerenderOGL(const GLvoid *textureData, GLsizei texWidth, GLsizei texHeight);
+ virtual void InitLayers();
+ virtual OGLInfo* GetInfo();
+ virtual GLsizei GetViewportWidth();
+ virtual GLsizei GetViewportHeight();
+ OGLDisplayLayer* GetDisplayLayer();
+
+ virtual void ProcessOGL(const uint16_t *videoData, GLsizei w, GLsizei h);
virtual void RenderOGL();
virtual void SetViewportSizeOGL(GLsizei w, GLsizei h);
- virtual void UpdateDisplayTransformationOGL();
- virtual void SetVideoFilterOGL(const VideoFilterTypeID videoFilterTypeID);
-
- int GetDisplayMode();
- void SetDisplayMode(int dispMode);
- int GetDisplayOrientation();
- void SetDisplayOrientation(int dispOrientation);
- GLfloat GetGapScalar();
- void SetGapScalar(GLfloat theScalar);
- GLfloat GetRotation();
- void SetRotation(GLfloat theRotation);
- bool GetDisplayBilinear();
- void SetDisplayBilinearOGL(bool useBilinear);
- int GetDisplayOrder();
- void SetDisplayOrder(int dispOrder);
};
#endif // _OGLDISPLAYOUTPUT_H_
diff --git a/desmume/src/cocoa/cocoa_globals.h b/desmume/src/cocoa/cocoa_globals.h
index da2856091..b1c608425 100644
--- a/desmume/src/cocoa/cocoa_globals.h
+++ b/desmume/src/cocoa/cocoa_globals.h
@@ -423,12 +423,12 @@ enum
MESSAGE_RESIZE_VIEW,
MESSAGE_TRANSFORM_VIEW,
MESSAGE_REDRAW_VIEW,
+ MESSAGE_REPROCESS_AND_REDRAW,
MESSAGE_SET_GPU_STATE_FLAGS,
MESSAGE_CHANGE_DISPLAY_TYPE,
MESSAGE_CHANGE_DISPLAY_ORIENTATION,
MESSAGE_CHANGE_DISPLAY_ORDER,
MESSAGE_CHANGE_DISPLAY_GAP,
- MESSAGE_CHANGE_VIDEO_FILTER,
MESSAGE_SET_RENDER3D_METHOD,
MESSAGE_SET_RENDER3D_HIGH_PRECISION_COLOR_INTERPOLATION,
MESSAGE_SET_RENDER3D_EDGE_MARKING,
diff --git a/desmume/src/cocoa/cocoa_output.h b/desmume/src/cocoa/cocoa_output.h
index c108b5b3c..b47c27814 100644
--- a/desmume/src/cocoa/cocoa_output.h
+++ b/desmume/src/cocoa/cocoa_output.h
@@ -135,9 +135,6 @@ typedef struct
- (void) doDisplayOrientationChanged:(NSInteger)displayOrientationID;
- (void) doDisplayOrderChanged:(NSInteger)displayOrderID;
- (void) doDisplayGapChanged:(float)displayGapScalar;
-- (void) doBilinearOutputChanged:(BOOL)useBilinear;
-- (void) doVerticalSyncChanged:(BOOL)useVerticalSync;
-- (void) doVideoFilterChanged:(NSInteger)videoFilterTypeID;
@end
@@ -176,9 +173,9 @@ typedef struct
- (void) handleResizeView:(NSData *)rectData;
- (void) handleTransformView:(NSData *)transformData;
- (void) handleRedrawView;
+- (void) handleReprocessAndRedraw;
- (void) handleChangeDisplayOrientation:(NSData *)displayOrientationIdData;
- (void) handleChangeDisplayOrder:(NSData *)displayOrderIdData;
- (void) handleChangeDisplayGap:(NSData *)displayGapScalarData;
-- (void) handleChangeVideoFilter:(NSData *)videoFilterTypeIdData;
@end
diff --git a/desmume/src/cocoa/cocoa_output.mm b/desmume/src/cocoa/cocoa_output.mm
index bf60059c8..60c1f83cb 100644
--- a/desmume/src/cocoa/cocoa_output.mm
+++ b/desmume/src/cocoa/cocoa_output.mm
@@ -858,6 +858,10 @@
[self handleEmuFrameProcessed:[messageComponents objectAtIndex:0] attributes:[messageComponents objectAtIndex:1]];
break;
+ case MESSAGE_REPROCESS_AND_REDRAW:
+ [self handleReprocessAndRedraw];
+ break;
+
case MESSAGE_RESIZE_VIEW:
[self handleResizeView:[messageComponents objectAtIndex:0]];
break;
@@ -882,10 +886,6 @@
[self handleChangeDisplayGap:[messageComponents objectAtIndex:0]];
break;
- case MESSAGE_CHANGE_VIDEO_FILTER:
- [self handleChangeVideoFilter:[messageComponents objectAtIndex:0]];
- break;
-
default:
[super handlePortMessage:portMessage];
break;
@@ -939,6 +939,11 @@
[(id)delegate doRedraw];
}
+- (void) handleReprocessAndRedraw
+{
+ [self handleEmuFrameProcessed:self.frameData attributes:self.frameAttributesData];
+}
+
- (void) handleChangeDisplayOrientation:(NSData *)displayOrientationIdData
{
if (delegate == nil || ![delegate respondsToSelector:@selector(doDisplayOrientationChanged:)])
@@ -972,16 +977,4 @@
[(id)delegate doDisplayGapChanged:gapScalar];
}
-- (void) handleChangeVideoFilter:(NSData *)videoFilterTypeIdData
-{
- if (delegate == nil || ![delegate respondsToSelector:@selector(doVideoFilterChanged:)])
- {
- return;
- }
-
- const NSInteger theType = *(NSInteger *)[videoFilterTypeIdData bytes];
- [(id)delegate doVideoFilterChanged:theType];
- [self handleEmuFrameProcessed:self.frameData attributes:self.frameAttributesData];
-}
-
@end
diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.strings b/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
index eef8ecd1c..37d9a843a 100644
Binary files a/desmume/src/cocoa/translations/English.lproj/MainMenu.strings and b/desmume/src/cocoa/translations/English.lproj/MainMenu.strings differ
diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
index 48eceb2b1..38acabeab 100644
--- a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
+++ b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
@@ -2,18 +2,20 @@
1050
- 13B42
+ 12F45
851
- 1265
- 696.00
+ 1187.40
+ 626.00
+
+
+
+
NO
- 1
NO
- 1
{550, 450}
@@ -2720,11 +2740,9 @@
{1.7976931348623157e+308, 1.7976931348623157e+308}
{{0, 0}, {1440, 878}}
{1.7976931348623157e+308, 1.7976931348623157e+308}
@@ -2763,7 +2781,6 @@
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {484, 81}}
@@ -2880,7 +2895,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA
NO
- 1
NO
- 1
{{1, 1}, {484, 45}}
@@ -3199,7 +3212,6 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA
NO
- 1
NO
- 1
NO
- 1
{640, 495}
@@ -3779,7 +3789,7 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA
12
- {{13, 10}, {463, 401}}
+ {{13, 10}, {463, 412}}
NO
- 1
NO
- 1
NO
- 1
NO
- 1
- {{6, 206}, {431, 116}}
+ {{6, 217}, {431, 116}}
{0, 0}
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {429, 141}}
- {{6, 45}, {431, 157}}
+ {{6, 56}, {431, 157}}
{0, 0}
- {{10, 33}, {443, 355}}
+ {{10, 33}, {443, 366}}
Display Views
@@ -5060,14 +5059,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{452, 115}
@@ -8650,7 +8778,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{620, 267}
@@ -9323,7 +9447,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {314, 74}}
@@ -9591,7 +9711,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
{350, 263}
@@ -9814,7 +9932,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
{350, 125}
@@ -10059,7 +10175,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
{350, 125}
@@ -10162,7 +10276,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{516, 283}
@@ -10994,7 +11098,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {314, 46}}
@@ -11248,7 +11349,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
{{1, 1}, {314, 39}}
@@ -11315,7 +11414,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
{350, 240}
@@ -11378,7 +11475,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{380, 200}
@@ -12500,7 +12585,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{500, 416}
@@ -14093,7 +14161,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
255
NO
- 1
NO
- 1
NO
- 1
{328, 134}
@@ -14156,7 +14221,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{320, 290}
@@ -15115,7 +15168,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
{320, 290}
@@ -15173,7 +15225,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {512, 66}}
@@ -16142,7 +16188,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
{400, 320}
@@ -16172,7 +16217,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
{400, 320}
@@ -16242,7 +16284,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{400, 320}
@@ -16432,7 +16468,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
{400, 320}
@@ -16877,7 +16910,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{400, 320}
@@ -17073,7 +17102,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
{400, 320}
@@ -17139,7 +17167,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
{400, 320}
@@ -17169,7 +17196,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
{400, 320}
@@ -17381,7 +17406,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
{400, 320}
@@ -17689,7 +17713,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
{{1, 1}, {250, 85}}
@@ -18173,7 +18196,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
{{1, 1}, {250, 86}}
@@ -18593,7 +18614,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{260, 328}
@@ -18996,7 +19009,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {258, 88}}
@@ -19665,7 +19668,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
{254, 262}
@@ -19949,9 +19950,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
- {301, 586}
+ {301, 467}
@@ -22813,7 +22860,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {408, 116}}
@@ -23449,7 +23487,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {216, 400}}
@@ -23720,7 +23746,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {324, 192}}
@@ -24068,7 +24078,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {324, 104}}
@@ -24261,7 +24263,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{{1, 1}, {324, 60}}
@@ -24368,7 +24366,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
{1.7976931348623157e+308, 1.7976931348623157e+308}
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{213, 198}
+
{{0, 0}, {1920, 1178}}
{1.7976931348623157e+308, 1.7976931348623157e+308}
@@ -24672,7 +24665,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
{450, 35}
@@ -25438,7 +25423,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
NO
- 1
EmuControllerDelegate
@@ -27215,8 +27187,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
@@ -27863,14 +27836,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
3354
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -38882,10 +38971,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
@@ -39906,12 +39997,15 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
@@ -39942,25 +40036,20 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -40037,26 +40126,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
-
-
-
-
-
-
-
-
-
@@ -41836,9 +41865,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
-
-
+
@@ -41855,6 +41883,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
+
+
@@ -41965,6 +41995,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
+
+
@@ -42136,54 +42168,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -54149,24 +54485,28 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
- {{144, 295}, {151, 463}}
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
+ {{271, 196}, {151, 363}}
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -54178,6 +54518,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
Input
@@ -54191,8 +54534,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ {{0, 931}, {213, 198}}
com.apple.InterfaceBuilder.CocoaPlugin
- {{1388, 659}, {213, 198}}
+ {{0, 931}, {213, 198}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -54560,7 +54904,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {{384, 835}, {512, 20}}
+ {{796, 1136}, {512, 20}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -54569,7 +54913,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {{658, 542}, {315, 293}}
+ {{1070, 773}, {315, 363}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -54634,7 +54978,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -54655,26 +54999,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
-
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
{{1328, 256}, {288, 511}}
@@ -54825,10 +55149,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ {{797, 414}, {166, 143}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {{884, 733}, {123, 43}}
+ {{1081, 1033}, {123, 43}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {{1129, 713}, {178, 43}}
+ {{1081, 1013}, {178, 43}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -55953,7 +56245,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
{{711, 700}, {400, 100}}
com.apple.InterfaceBuilder.CocoaPlugin
{{711, 700}, {400, 100}}
@@ -56080,7 +56371,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
-
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -56505,7 +56787,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {{973, 602}, {118, 133}}
+ {{1081, 903}, {118, 133}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -56572,7 +56854,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {{884, 633}, {136, 163}}
+ {{1081, 933}, {136, 163}}
com.apple.InterfaceBuilder.CocoaPlugin
@@ -56652,7 +56934,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {{884, 713}, {70, 103}}
+ {{1081, 1013}, {70, 103}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -56672,9 +56954,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
- {{861, 261}, {204, 601}}
+ {{1380, 181}, {204, 713}}
com.apple.InterfaceBuilder.CocoaPlugin
- {{861, 261}, {204, 601}}
+ {{1380, 181}, {204, 713}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -56820,17 +57102,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {{973, 172}, {239, 543}}
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
+ {{1385, 603}, {132, 363}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -57021,7 +57293,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
com.apple.InterfaceBuilder.CocoaPlugin
{{1184, 327}, {400, 320}}
com.apple.InterfaceBuilder.CocoaPlugin
@@ -57551,6 +57823,155 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
P4AAAL+AAABBoAAAwuLSAA
com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ {{271, 464}, {235, 123}}
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ {{1385, 983}, {134, 23}}
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ {{1385, 863}, {235, 123}}
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ {{636, 598}, {138, 122}}
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -57622,7 +58043,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2
- 9183
+ 9357