From 3c9931b1c800d3e229023d15654a73e1766c3e41 Mon Sep 17 00:00:00 2001 From: rogerman Date: Wed, 15 Jul 2015 01:36:48 +0000 Subject: [PATCH] =?UTF-8?q?Cocoa=20Port:=20-=20In=20addition=20to=20the=20?= =?UTF-8?q?UI=20controls=20in=20the=20Show=20Video=20Settings=20panel,=20a?= =?UTF-8?q?lso=20add=20the=20=E2=80=9CUse=20Vertical=20Sync=E2=80=9D=20and?= =?UTF-8?q?=20=E2=80=9CRun=20Filters=20on=20GPU=E2=80=9D=20options=20to=20?= =?UTF-8?q?the=20View=20menu.=20-=20Disable=20UI=20controls=20for=20Depth?= =?UTF-8?q?=20Comparison=20Threshold,=20since=20the=20setting=20is=20now?= =?UTF-8?q?=20obsolete.=20(Will=20need=20to=20delete=20UI=20controls=20bef?= =?UTF-8?q?ore=20release.)=20-=20Also=20add=20HQ3x/HQ3xS=20filters=20to=20?= =?UTF-8?q?the=20Pixel=20Scaler=20menu=20in=20Display=20Preferences.=20-?= =?UTF-8?q?=20Fix=20bug=20where=20the=20HQ3x/HQ3xS=20filters=20running=20o?= =?UTF-8?q?n=20the=20GPU=20sometimes=20wouldn=E2=80=99t=20draw=20correctly?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- desmume/src/cocoa/OGLDisplayOutput.cpp | 2 + .../English.lproj/MainMenu.strings | Bin 335528 -> 342318 bytes .../translations/English.lproj/MainMenu.xib | 248 +++++++++++++----- .../userinterface/DisplayWindowController.h | 2 + .../userinterface/DisplayWindowController.mm | 17 ++ 5 files changed, 199 insertions(+), 70 deletions(-) diff --git a/desmume/src/cocoa/OGLDisplayOutput.cpp b/desmume/src/cocoa/OGLDisplayOutput.cpp index 33375fc70..b5038fe6c 100644 --- a/desmume/src/cocoa/OGLDisplayOutput.cpp +++ b/desmume/src/cocoa/OGLDisplayOutput.cpp @@ -4994,6 +4994,7 @@ void OGLImage::UploadHQnxLUTs() glGenTextures(1, &_texLQ2xLUT); glGenTextures(1, &_texHQ2xLUT); + glGenTextures(1, &_texHQ3xLUT); glGenTextures(1, &_texHQ4xLUT); glActiveTexture(GL_TEXTURE0 + 1); @@ -5824,6 +5825,7 @@ void OGLDisplayLayer::UploadHQnxLUTs() glGenTextures(1, &_texLQ2xLUT); glGenTextures(1, &_texHQ2xLUT); + glGenTextures(1, &_texHQ3xLUT); glGenTextures(1, &_texHQ4xLUT); glActiveTexture(GL_TEXTURE0 + 1); diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.strings b/desmume/src/cocoa/translations/English.lproj/MainMenu.strings index d277a3d51773670d65f780bc39f4a29e3b64deb5..3b88fb4281a5f0e6369e4be2b9053059eca4b506 100644 GIT binary patch delta 11510 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 F{{i$c 1050 - 14D136 + 14E46 7706 - 1347.57 + 1348.17 758.70 com.apple.InterfaceBuilder.CocoaPlugin @@ -1296,6 +1296,22 @@ + + + Use Vertical Sync + + 2147483647 + + + + + + Run Filters on GPU + + 2147483647 + + + Video Source Filters @@ -3735,8 +3751,12 @@ L3d3dy5hZHZhbnNjZW5lLmNvbS9vZmZsaW5lL2RhdGFzL0FEVkFOc0NFbmVfUlRvb2xEUy56aXA 268 + + public.item + {{13, 10}, {463, 412}} + 1 @@ -5118,6 +5138,28 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 4 + + + HQ3x + + 2147483647 + + + _popUpItemAction: + 23 + + + + + HQ3xS + + 2147483647 + + + _popUpItemAction: + 24 + + HQ4x @@ -5356,14 +5398,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{168, 347}, {129, 18}} + {{168, 347}, {130, 18}} YES 67108864 0 - Use vertical sync + Use Vertical Sync 1211912448 @@ -5440,7 +5482,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{168, 327}, {206, 18}} + {{168, 327}, {141, 18}} _NS:682 @@ -5448,7 +5490,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 0 - Run filters on GPU if possible + Run Filters on GPU _NS:682 @@ -6411,8 +6453,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 + + public.item + {{13, 10}, {528, 388}} + 1 @@ -7470,7 +7516,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - -1804599231 + -1267728319 71304192 @@ -7491,7 +7537,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - + - # @@ -7555,9 +7601,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - 68157504 + 605028416 4195328 - Depth Comparison Threshold: + Depth-Equals Test Tolerance: @@ -7574,11 +7620,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - 67895328 + 604766240 0 - 100 + 512 1 YES @@ -20303,14 +20349,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{17, 726}, {113, 18}} + {{17, 726}, {115, 18}} YES 67108864 131072 - Use vertical sync + Use Vertical Sync 1211912448 @@ -20327,7 +20373,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 - {{17, 706}, {178, 18}} + {{17, 706}, {124, 18}} _NS:682 @@ -20335,7 +20381,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 -2080374784 131072 - Run filters on GPU if possible + Run Filters on GPU _NS:682 @@ -20775,6 +20821,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 109}, {206, 18}} + YES -2080374784 @@ -20798,9 +20845,10 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{185, 39}, {45, 19}} + YES - -1804599231 + -1267728319 71435264 @@ -20810,7 +20858,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - + @@ -20834,7 +20882,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - + 3 YES @@ -20860,11 +20908,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 41}, {165, 14}} + YES - 68157504 + 605028416 4326400 - Depth Comparison Threshold: + Depth-Equals Test Tolerance: @@ -20878,6 +20927,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 15}, {109, 14}} + YES 68157504 @@ -20896,13 +20946,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{231, 34}, {19, 27}} + YES - 67895328 + 604766240 0 - 100 + 512 1 YES @@ -20913,6 +20964,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 89}, {115, 18}} + YES -2080374784 @@ -20936,6 +20988,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 69}, {195, 18}} + YES -2080374784 @@ -20959,6 +21012,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{126, 10}, {124, 22}} + _NS:791 YES @@ -21068,10 +21122,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {265, 134}} + {{17, 99}, {267, 150}} + {0, 0} 67108864 @@ -21121,6 +21177,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{18, 14}, {107, 58}} + YES NO 3 @@ -21374,10 +21431,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {265, 82}} + {{17, 349}, {267, 98}} + {0, 0} 67108864 @@ -21406,6 +21465,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 51}, {108, 18}} + YES -2080374784 @@ -21429,6 +21489,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 31}, {135, 18}} + YES -2080374784 @@ -21452,6 +21513,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{15, 11}, {82, 18}} + YES -2080374784 @@ -21473,10 +21535,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {265, 76}} + {{17, 253}, {267, 92}} + {0, 0} 67108864 @@ -21505,6 +21569,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 268 {{16, 12}, {192, 18}} + YES 67108864 @@ -21526,10 +21591,12 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {{1, 1}, {265, 38}} + {{17, 41}, {267, 54}} + {0, 0} 67108864 @@ -21547,6 +21614,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 {301, 467} + {{0, 0}, {1920, 1177}} {10000000000000, 10000000000000} @@ -28526,6 +28594,22 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 10025 + + + toggleVerticalSync: + + + + 10030 + + + + toggleVideoFiltersPreferGPU: + + + + 10031 + launchWebsite: @@ -29867,6 +29951,22 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 9704 + + + selectPixelScaler: + + + + 10033 + + + + selectPixelScaler: + + + + 10035 + makeKeyAndOrderFront: @@ -36850,38 +36950,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 8180 - - - value: selection.cdsGPU.render3DDepthComparisonThreshold - - - - - - value: selection.cdsGPU.render3DDepthComparisonThreshold - value - selection.cdsGPU.render3DDepthComparisonThreshold - 2 - - - 9176 - - - - value: values.Render3D_DepthComparisonThreshold - - - - - - value: values.Render3D_DepthComparisonThreshold - value - values.Render3D_DepthComparisonThreshold - 2 - - - 8198 - value: values.General_WillRestoreDisplayWindows @@ -39396,6 +39464,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + @@ -40018,6 +40088,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + @@ -52731,6 +52803,26 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + 10028 + + + + + 10029 + + + + + 10032 + + + + + 10034 + + + @@ -52752,6 +52844,10 @@ 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 com.apple.InterfaceBuilder.CocoaPlugin @@ -52837,6 +52933,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {1026.5, 1076.5} com.apple.InterfaceBuilder.CocoaPlugin InitialTabViewItem @@ -52999,7 +53096,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - {225, 828} + {225, 911} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin Emulation @@ -53443,7 +53540,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 ToolTip - When set, SoftRasterizer will adjust the order of its polygon rendering. This may improve the look of some games, such as the appearance of shadows in "The Legend of Zelda: Spirit Tracks." No CPU usage. + This value affects SoftRasterizer's fragment processing. Larger values will allow more fragments to pass the Depth-Equals test, making it more likely for certain fragments to draw. This may improve the look of some games, such as the appearance of shadows in "The Legend of Zelda: Spirit Tracks." No CPU usage. com.apple.InterfaceBuilder.CocoaPlugin @@ -53461,6 +53558,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {990.5, 1116.5} com.apple.InterfaceBuilder.CocoaPlugin {{84, 481}, {301, 467}} @@ -53475,7 +53573,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 ToolTip - When set, SoftRasterizer will adjust the order of its polygon rendering. This may improve the look of some games, such as the appearance of shadows in "The Legend of Zelda: Spirit Tracks." No CPU usage. + [DISABLED FOR TESTING. THIS SETTING CURRENTLY DOES NOTHING.] This value affects SoftRasterizer's fragment processing. Larger values will allow more fragments to pass the Depth-Equals test, making it more likely for certain fragments to draw. This may improve the look of some games, such as the appearance of shadows in "The Legend of Zelda: Spirit Tracks." No CPU usage. com.apple.InterfaceBuilder.CocoaPlugin @@ -55101,7 +55199,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - {730, 913} + {638, 1267} com.apple.InterfaceBuilder.CocoaPlugin {{126, 189}, {204, 713}} @@ -55980,7 +56078,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - 10027 + 10035 @@ -56443,6 +56541,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id + id id id id @@ -56530,6 +56630,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 toggleStatusBar: id + + toggleVerticalSync: + id + + + toggleVideoFiltersPreferGPU: + id + toggleVideoSourceDeposterize: id @@ -56621,6 +56729,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id + id id id id @@ -56712,6 +56822,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 toggleStatusBar: id + + toggleVerticalSync: + id + + + toggleVideoFiltersPreferGPU: + id + toggleVideoSourceDeposterize: id @@ -56747,7 +56865,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id - id id id id @@ -56814,10 +56931,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 changeFirmwareSettings: id - - changeGpuDimensions: - id - changeHardwareMicGain: id @@ -57103,7 +57216,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id - id id id id @@ -57174,10 +57286,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 changeFirmwareSettings: id - - changeGpuDimensions: - id - changeHardwareMicGain: id diff --git a/desmume/src/cocoa/userinterface/DisplayWindowController.h b/desmume/src/cocoa/userinterface/DisplayWindowController.h index 57cf43d48..aea0f9d11 100644 --- a/desmume/src/cocoa/userinterface/DisplayWindowController.h +++ b/desmume/src/cocoa/userinterface/DisplayWindowController.h @@ -172,6 +172,8 @@ class OGLVideoOutput; - (IBAction) changeDisplayOrientation:(id)sender; - (IBAction) changeDisplayOrder:(id)sender; - (IBAction) changeDisplayGap:(id)sender; +- (IBAction) toggleVerticalSync:(id)sender; +- (IBAction) toggleVideoFiltersPreferGPU:(id)sender; - (IBAction) toggleVideoSourceDeposterize:(id)sender; - (IBAction) changeVideoOutputFilter:(id)sender; - (IBAction) changeVideoPixelScaler:(id)sender; diff --git a/desmume/src/cocoa/userinterface/DisplayWindowController.mm b/desmume/src/cocoa/userinterface/DisplayWindowController.mm index 0d1836c78..7a46f3a5c 100644 --- a/desmume/src/cocoa/userinterface/DisplayWindowController.mm +++ b/desmume/src/cocoa/userinterface/DisplayWindowController.mm @@ -837,6 +837,16 @@ static std::unordered_map _screenMap; // [self setDisplayGap:(double)[CocoaDSUtil getIBActionSenderTag:sender] / 100.0]; } +- (IBAction) toggleVerticalSync:(id)sender +{ + [[self view] setUseVerticalSync:![[self view] useVerticalSync]]; +} + +- (IBAction) toggleVideoFiltersPreferGPU:(id)sender +{ + [self setVideoFiltersPreferGPU:![self videoFiltersPreferGPU]]; +} + - (IBAction) toggleVideoSourceDeposterize:(id)sender { [self setVideoSourceDeposterize:![self videoSourceDeposterize]]; @@ -994,6 +1004,13 @@ static std::unordered_map _screenMap; // [(NSMenuItem *)theItem setState:([[self view] useVerticalSync]) ? NSOnState : NSOffState]; } } + else if (theAction == @selector(toggleVideoFiltersPreferGPU:)) + { + if ([(id)theItem isMemberOfClass:[NSMenuItem class]]) + { + [(NSMenuItem *)theItem setState:([[self view] videoFiltersPreferGPU]) ? NSOnState : NSOffState]; + } + } else if (theAction == @selector(changeVideoPixelScaler:)) { if ([(id)theItem isMemberOfClass:[NSMenuItem class]])