From 91c53cc772d0c55fad6d5e5419b361906b602f70 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.sf.net>
Date: Thu, 17 Jan 2013 01:22:53 +0000
Subject: [PATCH] Cocoa Port: - New feature: Add support for the OpenGL
 renderer's multisample antialiasing (MSAA) feature. - Update UI tooltips for
 the 3D renderers to reflect the current state of the code.

---
 desmume/src/cocoa/DefaultUserPrefs.plist      | Bin 5051 -> 5083 bytes
 desmume/src/cocoa/cocoa_globals.h             |   1 +
 desmume/src/cocoa/cocoa_output.h              |   4 +
 desmume/src/cocoa/cocoa_output.mm             |  38 ++
 .../English.lproj/MainMenu.strings            | Bin 286698 -> 289698 bytes
 .../translations/English.lproj/MainMenu.xib   | 415 ++++++++++++++----
 desmume/src/cocoa/userinterface/displayView.h |   1 +
 .../src/cocoa/userinterface/displayView.mm    |   7 +
 .../cocoa/userinterface/emuWindowDelegate.h   |   1 +
 .../cocoa/userinterface/emuWindowDelegate.mm  |   7 +
 10 files changed, 383 insertions(+), 91 deletions(-)

diff --git a/desmume/src/cocoa/DefaultUserPrefs.plist b/desmume/src/cocoa/DefaultUserPrefs.plist
index 6b32facf2728947ce9d234658467de007e425745..5c2538845005fae2faa97036042c1c8d19e11ecd 100644
GIT binary patch
delta 1625
zcmYk4XLM9W7>3_(%iJ>e-We8H2w;SO0Zd3jOCwTDG=OxD2N7wKh+t?5SP%&!h)9vJ
zQBayhgwO>9MY<BCO1ohx!4R6Du~7tp5SL`-FyEPZ&zWbQnIH3QX?Ug~e|coakgU-$
zF~u@AhmXjPM?#<y5r?FQGYRp5ibFC|D)v$<SX_{ILDwKp3OWz?10ywHRGM+rE9fK#
zG8J*ux4*2`BYk*UdS>&K{+-8Uj2@CTaM;KUN?%vp&`qk3v1nfci;R8+gYi1D@gY9O
zLM+F6Y{MQL#z~amD*nbDa*{#SsV+69X4K9%i;WL`)sG<<ir0{VVHl1P7>QBHL>5M4
z43d43%52XYHr~Wr7>l<t4)0(*GJRFFDBpc0#5<u7?_wg}!z4_``<Q|cFtq~L@D0%G
z`qI>J@3cZp#|+HGN0@~i%!UuSj~wx<jXa;&n1i|a6rW)p=3_wx?&@7sh|jSYdH4cL
z@FkXF8S)=7S8HLO6*g946;@*n*5WIy3*Zv1hj&9EzQ#su!Z-L9oADjCVCzG(t7p57
z9oUIo_#QuCHwpr1m)_m;qm8}Thy6H!gE)krDvT&!4_?!A#Kut^!*SRs#0mI=Xa%qB
zIc4KC&Y%cq@iU5XE{NPli08bG3%H0&xQxE|1y_QopW*fVYU4MQ;&=Rk-uM%LJw#Qj
z$1TP+8`p6IH}MZ{;Wqva&|P}8kDFnhyEg8j4EIq^AR<Rl9A?(^xNLG0BZXAbNGBdd
z1!joHw8<htlB$r0s#3Ke3bi7=-a@KDH7SH@QEjS2k5MQ+UV$sWaE{g3Q_rR_s!t8*
z2@0o%)Tq*)EkZm`+7v;N)P$lanqsJF@ZR1cG_<*&T2M=hr8tVG1WKe<l!Q!rids_}
zY8z;*0lu3eBJ^oLB~uDLL(ftwwWki$5%KgKbqcip73$(^E%UQ41R6Ia@Ja&pq){}T
z@@NwsraKPH(ZrGJ=;IjfnBiFI*yA|oxaSnk2xnVoFXt=H3C?-W9nNFUQkUV1c6E29
zyC%41xR$tfy8N!ou5!26-OAn3o#r0v&UG(zZ*re<UuG(+$HG_x7S5trG>c(PSu@r=
zo3&sqSuBfZiL4b%Vy#&l)|RznPqSo}!aB26Y%|-<_OhSYQRZi7*(LTXD`nT&O?Hd@
z%kC>sn4&8}siM?S!jwizgwkH=sl22NR<e|AWvY^^ELC<WdzAyqA?2iUMk!Tpt4>v@
zwbVLll-g9yZlQKipH~N{L)0<q1a+dCtLCXo)Me^cb+39{EmE(j*VQsjXw|h4t&Y}2
zOVCoZZdxBLO?zD%tG%Pm))s2Zwe{L|ZJ%~XE7mS)SG7{DOxN^kdR;w2kJCHoo%L>d
zx;{!Dr%%>%^!fTqeVbmO@6!+JXS4OI`V9`wxtBNMkvy8W<(+shK8O$JBl$!=iBI8k
z`4YaCZ{d6ReqO|j`FVbwmm9j_HR>7ljh05d(aPv#ykHD6Mi^s_>BdYW$H+6*7@Lg(
z<A`zIxM=)h+%{dNFl(FPW>YiSOf@^2eayjTrkOq7oN7)p7nqC8JadD&!`yG4FiXq}
z=1udqdDk+mnpS-)+Df##S_7>#Yp^xW`oQv8^R0YqgSFE-X8Ent)>-Qh>yB`XDx!`E
z6)~c@h!v@#r|2h!iZNoGm??5Zu2?6wiUM&&6p1V1nkbV(hReqNWQ2^BiSjA=qD+?=
zGE0t^v*di4FE`5Va<?pywk(t<q+gztr{rmQMi$9pc}|wd^YVhch>GEGR3`PS%>P$e
F{vU~+ufG5Q

delta 1600
zcmYk433QD|7>3{PF7xmIKmN!~2v<Z%G)SzGP(lR})T!d2M^i1Os0blim7tBimRnR&
zdz%nT?8Fj9P)kE^gbHa$ZLO`B)~<2gI%dwyd(J%P`DV_U?|fKZn9@Ia=-`o~qM}N9
z(>coU0nuoV7{tC>v1nE?W6%a|y=U=W7UScc(Z$DOea;L1!icXhUYaq~!{@ZA$aut1
z-`q!Gc2@|Cw06bYu5PS;#3+1$DR5yie#A!P;UG@n3`%hoxAB08Wbz{?g;5l>cIB|~
z&Vj}F7=thvpI``vVi-Qfa3o^{QZN#2T)9S)D@$l(rn)g2V~~ci_za(89FkpeN~9}D
z40MbyLOL=q0TVF^U*aodVzL(pxRS*7j;TeMhUu7rnfMyBFdK6)_Z1FydBkw@8#m@*
zJ{I6xEW~$M<i!nKeWjX?B}MoiOR)^gu>vcx3ajzMYxYqo#LRLd8*8u@Iar7F*x<7x
z<WNU$5jJ5nwqPr^VLNtUCw9GNFP0<C-EQo`UhG3Y_TwiU@Y#w|%RJ;p0S@B`j^bw=
z!*MTaZ=Q7H7Zl<YPUBa&QRFiUlpwR%jk7q1-*6r!xPXgZ6zK|41I^#vD8nUOMmhT8
z4_xtCg{q%_)N)*N<2r8OPyB^mxQSb@sKdPD#$Egk5ANYU{=vUKR7b02K6K*|9^(m~
z;u)S3eAi9W0!)jWtYjlQF%n25$%ig!fu`anl{C`HAWoIY^c9TN>p3bHkv};ofC8xs
zRiz-RM%BIe#a9NqHtTiG8g2@vniN8{D3oeb9be(<MxYt)rn>Y7MNmDePYo#2S2)#h
zIvW;KBWg@ds3|q0XlhO|6pLhPK`rS`YE{u?)17g})P~y9Thxx?sXcX|j%Y>+)TyG=
zuTW=KAD)$7if0uMc2?*;X#`ECMYM%V$zw4s^(=9g?v@nGY|C29AxoL%o|Ri`TU%Na
ztpltX)>YQ+)>GEIw#v3<wobMIwiMe`+iKfx+c8_Y?Xf-B9%)aozi%IFpJZQT-)lc+
zzsVRAnaoV)$0{>_=3oIVkX1=%RarIWWHneY3t_cbD67rturL<R8nW4J3Cm(RY!lnc
z^4NZMl$~USteBl+=h+2ziIuY(>=yH|`|Pp61XVDEdP1}iCnO5Jgb#&bLYgp5SSjQP
z8-!e8x3Etr6iS4vf=75JLNrBxF;J{8rpJiw#4ciQ@gs4dm?mb5Q^e`wGBHQoF6N8J
z#bU8c^oS3|rxK(}Qgta@Y9h6kI!b+{e$ofhXlbG}Q<^WWkk(1L(gEqHbV4eW%A}jp
z1KB1Ua*$kKZYVdA6XYIpk~~;Wl{4g7@^U#_UMFvq_sb{bv*~iVd|Q5`s0vs7lu#u~
zX`ysb-cjCF1}cM;A<8&qisDk1Dr=PWO1^SHDNu@)%gQa~k!n{3wTfCzt)WJ#E!7Tc
zceS6Itfr``YNk3@U7}{IThs#eh<Z#dQLm{U^|>Z%{#uw8p*7H2Yl&J<t-m%*OCPRH
z&?ae_+5&B*wqDz%9nubK=d=>7RJ)@+(FNU4cj}Gxc)g>Zs3++|^)Y&eK0{xiuhO^a
zdHP;`zkXW3s9)Fb8!#+JWh20-YD5^(Mq8t+(c4HeQjAn1&6sB_GqQ~>M!s>}IAfF<
z9xii@8@y^C?&LLjE1tl+@m{<?AH_5H48D-B;8{GI@8CQ6E}qAC^F4eo-^cU$0e+Al
X;syLLKLYQtSY9T*_cH(A`Q`rrdnBes

diff --git a/desmume/src/cocoa/cocoa_globals.h b/desmume/src/cocoa/cocoa_globals.h
index 34c339186..05f0ebf09 100644
--- a/desmume/src/cocoa/cocoa_globals.h
+++ b/desmume/src/cocoa/cocoa_globals.h
@@ -371,6 +371,7 @@ enum
 	MESSAGE_SET_RENDER3D_DEPTH_COMPARISON_THRESHOLD,
 	MESSAGE_SET_RENDER3D_THREADS,
 	MESSAGE_SET_RENDER3D_LINE_HACK,
+	MESSAGE_SET_RENDER3D_MULTISAMPLE,
 	MESSAGE_SET_VIEW_TO_BLACK,
 	MESSAGE_SET_VIEW_TO_WHITE,
 	
diff --git a/desmume/src/cocoa/cocoa_output.h b/desmume/src/cocoa/cocoa_output.h
index 841b1cfca..e685e6115 100644
--- a/desmume/src/cocoa/cocoa_output.h
+++ b/desmume/src/cocoa/cocoa_output.h
@@ -159,6 +159,7 @@ typedef struct
 	OSSpinLock spinlockRender3DDepthComparisonThreshold;
 	OSSpinLock spinlockRender3DThreads;
 	OSSpinLock spinlockRender3DLineHack;
+	OSSpinLock spinlockRender3DMultisample;
 }
 
 @property (assign) UInt32 gpuStateFlags;
@@ -183,6 +184,8 @@ typedef struct
 - (NSUInteger) render3DThreads;
 - (void) setRender3DLineHack:(BOOL)state;
 - (BOOL) render3DLineHack;
+- (void) setRender3DMultisample:(BOOL)state;
+- (BOOL) render3DMultisample;
 
 - (void) handleChangeGpuStateFlags:(NSData *)flagsData;
 - (void) handleChangeDisplayMode:(NSData *)displayModeData;
@@ -194,6 +197,7 @@ typedef struct
 - (void) handleSetRender3DDepthComparisonThreshold:(NSData *)thresholdData;
 - (void) handleSetRender3DThreads:(NSData *)numberThreadsData;
 - (void) handleSetRender3DLineHack:(NSData *)stateData;
+- (void) handleSetRender3DMultisample:(NSData *)stateData;
 - (void) handleSetViewToBlack;
 - (void) handleSetViewToWhite;
 - (void) handleRequestScreenshot:(NSData *)fileURLStringData fileTypeData:(NSData *)fileTypeData;
diff --git a/desmume/src/cocoa/cocoa_output.mm b/desmume/src/cocoa/cocoa_output.mm
index b3e29f1b4..cd04a7bb3 100644
--- a/desmume/src/cocoa/cocoa_output.mm
+++ b/desmume/src/cocoa/cocoa_output.mm
@@ -465,6 +465,7 @@ GPU3DInterface *core3DList[] = {
 	spinlockRender3DDepthComparisonThreshold = OS_SPINLOCK_INIT;
 	spinlockRender3DThreads = OS_SPINLOCK_INIT;
 	spinlockRender3DLineHack = OS_SPINLOCK_INIT;
+	spinlockRender3DMultisample = OS_SPINLOCK_INIT;
 	
 	delegate = nil;
 	displayMode = DS_DISPLAY_TYPE_COMBO;
@@ -505,6 +506,7 @@ GPU3DInterface *core3DList[] = {
 	[property setValue:[NSNumber numberWithInteger:0] forKey:@"render3DDepthComparisonThreshold"];
 	[property setValue:[NSNumber numberWithInteger:0] forKey:@"render3DThreads"];
 	[property setValue:[NSNumber numberWithBool:YES] forKey:@"render3DLineHack"];
+	[property setValue:[NSNumber numberWithBool:NO] forKey:@"render3DMultisample"];
 	
 	return self;
 }
@@ -975,6 +977,32 @@ GPU3DInterface *core3DList[] = {
 	return state;
 }
 
+- (void) setRender3DMultisample:(BOOL)state
+{
+	OSSpinLockLock(&spinlockRender3DMultisample);
+	[property setValue:[NSNumber numberWithBool:state] forKey:@"render3DMultisample"];
+	OSSpinLockUnlock(&spinlockRender3DMultisample);
+	
+	bool cState = false;
+	if (state)
+	{
+		cState = true;
+	}
+	
+	pthread_mutex_lock(self.mutexProducer);
+	CommonSettings.GFX3D_Renderer_Multisample = cState;
+	pthread_mutex_unlock(self.mutexProducer);
+}
+
+- (BOOL) render3DMultisample
+{
+	OSSpinLockLock(&spinlockRender3DMultisample);
+	BOOL state = [(NSNumber *)[property valueForKey:@"render3DMultisample"] boolValue];
+	OSSpinLockUnlock(&spinlockRender3DMultisample);
+	
+	return state;
+}
+
 - (void) doCoreEmuFrame
 {
 	NSData *gpuData = nil;
@@ -1061,6 +1089,10 @@ GPU3DInterface *core3DList[] = {
 			[self handleSetRender3DLineHack:[messageComponents objectAtIndex:0]];
 			break;
 			
+		case MESSAGE_SET_RENDER3D_MULTISAMPLE:
+			[self handleSetRender3DMultisample:[messageComponents objectAtIndex:0]];
+			break;
+			
 		case MESSAGE_SET_VIEW_TO_BLACK:
 			[self handleSetViewToBlack];
 			break;
@@ -1155,6 +1187,12 @@ GPU3DInterface *core3DList[] = {
 	[self setRender3DLineHack:theState];
 }
 
+- (void) handleSetRender3DMultisample:(NSData *)stateData
+{
+	const BOOL theState = *(BOOL *)[stateData bytes];
+	[self setRender3DMultisample:theState];
+}
+
 - (void) handleSetViewToBlack
 {
 	[self fillVideoFrameWithColor:0x8000];
diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.strings b/desmume/src/cocoa/translations/English.lproj/MainMenu.strings
index 107cd56bf311b58e612a94cfb77a9c8d7df7109a..0836a15c04b941128455e97510d2a624cd039cf8 100644
GIT binary patch
delta 1732
zcmd6m&ubGw6vyBEXpto}rdd;yMYG#bvWbT_DJ=No5-DnsU~Ov;Ld1xT38YEs4?!sC
zLGa+g!lDmE#EKO3qJp^KMfwj27DOnb^j3=qIe8L%yG<0NLbOC>VP@XW%$xbX?`Jk%
z2JXKNT)E1gaV5Uz7!+UzbeM$_Oi+K0+8K&;7=$5Yy)2I1CO?g5<NSFGiyd0L-r2&!
z&8)-yt!3o{d?;iub#&pGwDdXEBYcT{50S!8*UT(;%&d6-Ml>$ogRlIu6QAfZ;@6=D
z7fIPPsjWZ->m?S$Ql52-GR)%TFJf1sS%5i`Uw{i<F=|kxLR_NFbF@{5qc9Aoa4|1q
zcsD9H+I~{~I6q-8gm>W1K507hhCIyLex|2xJoXpVEoyAkRp*ep)dRTtjvZ=>mAE39
zidDfP!U78eFIcdH29UB}>tTFkNFS~|6xOYIk;FSH3;8GDyl0xrGTDZPF2h;Z%Q94H
zLWfE6utH#$J%1-*iXs>I0?oUBT`=7C#|{&6FbWy^61W!PQ7q<}+61Nt#~yGsHVz{+
zpQAiQBBVyAY|RU^&`?BEL*Tmczu)@iQ(j2qeo?c`&o#rxUs<2#83g;G7Y<SxlF$zd
zjW=yu{-EJhl>2@o=Zyun&mI`uy9E>;3u!cbGDww8os`-?U}AZUYq&nmBijTc^|1kW
s8rcY8c3Wk;+s*TK@BRmPxDVN`D?zW%BsIMEnRi(&Bi4AxE?WwG1Bi`=ga7~l

delta 439
zcmZ2<UGUX@!G;#bElgbM)0b&5g-tj3z$i1#h>2zT33aAv+krw)*ia<oCWjr6n%-c_
z#5bKwgDGUYnjw>e*z}U0j2hb;+?kd!f|>0Oo=n>vJef~jo4#)@Bb&SeLpnn$Lq0<;
zkSt*+VyI+L0J0OobP_}AbbB=xSz$e(pesWKSV1aSY0mW38cfR5A4D+9P3Kc)QJBu9
z$a01nCI;j(s!UYSm^?v}V|s!-3(NKoN-SxN)G!(B);M*bTf<bT=GFj&Lmkvvu2}&9
DMCEd0

diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
index fdfd41c1e..172884789 100644
--- a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
+++ b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
@@ -7046,7 +7046,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<string key="NSClassName">InputPrefsView</string>
 			</object>
 			<object class="NSCustomView" id="373257179">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">268</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7055,6 +7055,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<int key="NSvFlags">12</int>
 						<string key="NSFrame">{{13, 10}, {463, 401}}</string>
 						<reference key="NSSuperview" ref="373257179"/>
+						<reference key="NSWindow"/>
 						<object class="NSMutableArray" key="NSTabViewItems">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="NSTabViewItem" id="750316744">
@@ -7079,6 +7080,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{72, 44}, {84, 17}}</string>
 															<reference key="NSSuperview" ref="610612997"/>
+															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="1051872315">
 																<int key="NSCellFlags">68288064</int>
@@ -7095,6 +7097,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{44, 16}, {112, 17}}</string>
 															<reference key="NSSuperview" ref="610612997"/>
+															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="279286359">
 																<int key="NSCellFlags">68288064</int>
@@ -7111,6 +7114,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{158, 38}, {126, 26}}</string>
 															<reference key="NSSuperview" ref="610612997"/>
+															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSPopUpButtonCell" key="NSCell" id="644484329">
 																<int key="NSCellFlags">-2076049856</int>
@@ -7191,6 +7195,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{289, 14}, {96, 22}}</string>
 															<reference key="NSSuperview" ref="610612997"/>
+															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="689714106">
 																<int key="NSCellFlags">-1804468671</int>
@@ -7268,6 +7273,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{63, 72}, {93, 17}}</string>
 															<reference key="NSSuperview" ref="610612997"/>
+															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSTextFieldCell" key="NSCell" id="86457779">
 																<int key="NSCellFlags">68288064</int>
@@ -7284,6 +7290,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{158, 66}, {126, 26}}</string>
 															<reference key="NSSuperview" ref="610612997"/>
+															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSPopUpButtonCell" key="NSCell" id="977881385">
 																<int key="NSCellFlags">-2076049856</int>
@@ -7351,6 +7358,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 															<int key="NSvFlags">268</int>
 															<string key="NSFrame">{{158, 11}, {126, 26}}</string>
 															<reference key="NSSuperview" ref="610612997"/>
+															<reference key="NSWindow"/>
 															<bool key="NSEnabled">YES</bool>
 															<object class="NSPopUpButtonCell" key="NSCell" id="729105354">
 																<int key="NSCellFlags">-2076049856</int>
@@ -7452,10 +7460,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 													</object>
 													<string key="NSFrame">{{1, 1}, {429, 100}}</string>
 													<reference key="NSSuperview" ref="654619277"/>
+													<reference key="NSWindow"/>
 												</object>
 											</object>
 											<string key="NSFrame">{{6, 187}, {431, 116}}</string>
 											<reference key="NSSuperview" ref="698863500"/>
+											<reference key="NSWindow"/>
 											<string key="NSOffsets">{0, 0}</string>
 											<object class="NSTextFieldCell" key="NSTitleCell">
 												<int key="NSCellFlags">67239424</int>
@@ -7499,6 +7509,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																			<int key="NSvFlags">268</int>
 																			<string key="NSFrame">{{18, 14}, {100, 38}}</string>
 																			<reference key="NSSuperview" ref="713770080"/>
+																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<int key="NSNumRows">2</int>
 																			<int key="NSNumCols">1</int>
@@ -7689,10 +7700,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	</object>
 																	<string key="NSFrame">{{1, 1}, {194, 62}}</string>
 																	<reference key="NSSuperview" ref="405894970"/>
+																	<reference key="NSWindow"/>
 																</object>
 															</object>
 															<string key="NSFrame">{{15, 10}, {196, 78}}</string>
 															<reference key="NSSuperview" ref="320484480"/>
+															<reference key="NSWindow"/>
 															<string key="NSOffsets">{0, 0}</string>
 															<object class="NSTextFieldCell" key="NSTitleCell">
 																<int key="NSCellFlags">67239424</int>
@@ -7726,6 +7739,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																			<int key="NSvFlags">268</int>
 																			<string key="NSFrame">{{18, 14}, {150, 38}}</string>
 																			<reference key="NSSuperview" ref="533349872"/>
+																			<reference key="NSWindow"/>
 																			<bool key="NSEnabled">YES</bool>
 																			<int key="NSNumRows">2</int>
 																			<int key="NSNumCols">1</int>
@@ -7916,10 +7930,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																	</object>
 																	<string key="NSFrame">{{1, 1}, {194, 62}}</string>
 																	<reference key="NSSuperview" ref="1057767226"/>
+																	<reference key="NSWindow"/>
 																</object>
 															</object>
 															<string key="NSFrame">{{218, 10}, {196, 78}}</string>
 															<reference key="NSSuperview" ref="320484480"/>
+															<reference key="NSWindow"/>
 															<string key="NSOffsets">{0, 0}</string>
 															<object class="NSTextFieldCell" key="NSTitleCell">
 																<int key="NSCellFlags">67239424</int>
@@ -7941,10 +7957,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 													</object>
 													<string key="NSFrame">{{1, 1}, {429, 98}}</string>
 													<reference key="NSSuperview" ref="367271593"/>
+													<reference key="NSWindow"/>
 												</object>
 											</object>
 											<string key="NSFrame">{{6, 69}, {431, 114}}</string>
 											<reference key="NSSuperview" ref="698863500"/>
+											<reference key="NSWindow"/>
 											<string key="NSOffsets">{0, 0}</string>
 											<object class="NSTextFieldCell" key="NSTitleCell">
 												<int key="NSCellFlags">67239424</int>
@@ -7966,6 +7984,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									</object>
 									<string key="NSFrame">{{10, 33}, {443, 355}}</string>
 									<reference key="NSSuperview" ref="286093627"/>
+									<reference key="NSWindow"/>
 								</object>
 								<string key="NSLabel">Display Views</string>
 								<reference key="NSColor" ref="266180242"/>
@@ -8566,7 +8585,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 													<reference key="NSSuperview" ref="945754227"/>
 												</object>
 											</object>
-											<string key="NSFrame">{{74, 81}, {295, 124}}</string>
+											<string key="NSFrame">{{74, 110}, {295, 124}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<string key="NSOffsets">{0, 0}</string>
 											<object class="NSTextFieldCell" key="NSTitleCell">
@@ -8589,7 +8608,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSPopUpButton" id="552851483">
 											<reference key="NSNextResponder" ref="926005793"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{217, 297}, {152, 26}}</string>
+											<string key="NSFrame">{{217, 318}, {152, 26}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="458352299">
@@ -8655,7 +8674,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSTextField" id="890740037">
 											<reference key="NSNextResponder" ref="926005793"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{74, 303}, {141, 17}}</string>
+											<string key="NSFrame">{{74, 324}, {141, 17}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="538838649">
@@ -8671,7 +8690,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSPopUpButton" id="515405915">
 											<reference key="NSNextResponder" ref="926005793"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{205, 34}, {165, 26}}</string>
+											<string key="NSFrame">{{205, 13}, {165, 26}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="770553605">
@@ -8750,7 +8769,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 										<object class="NSTextField" id="30639279">
 											<reference key="NSNextResponder" ref="926005793"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{47, 40}, {156, 17}}</string>
+											<string key="NSFrame">{{47, 19}, {156, 17}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="690717945">
@@ -8822,7 +8841,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 													<reference key="NSSuperview" ref="487826591"/>
 												</object>
 											</object>
-											<string key="NSFrame">{{74, 209}, {295, 74}}</string>
+											<string key="NSFrame">{{74, 238}, {295, 74}}</string>
 											<reference key="NSSuperview" ref="926005793"/>
 											<string key="NSOffsets">{0, 0}</string>
 											<object class="NSTextFieldCell" key="NSTitleCell">
@@ -8842,6 +8861,63 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSTitlePosition">2</int>
 											<bool key="NSTransparent">NO</bool>
 										</object>
+										<object class="NSBox" id="148848659">
+											<reference key="NSNextResponder" ref="926005793"/>
+											<int key="NSvFlags">12</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSView" id="817768364">
+													<reference key="NSNextResponder" ref="148848659"/>
+													<int key="NSvFlags">256</int>
+													<object class="NSMutableArray" key="NSSubviews">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<object class="NSButton" id="408650936">
+															<reference key="NSNextResponder" ref="817768364"/>
+															<int key="NSvFlags">268</int>
+															<string key="NSFrame">{{16, 12}, {223, 18}}</string>
+															<reference key="NSSuperview" ref="817768364"/>
+															<bool key="NSEnabled">YES</bool>
+															<object class="NSButtonCell" key="NSCell" id="995020498">
+																<int key="NSCellFlags">67239424</int>
+																<int key="NSCellFlags2">0</int>
+																<string key="NSContents">Enable Multisample Antialiasing</string>
+																<reference key="NSSupport" ref="462791774"/>
+																<reference key="NSControlView" ref="408650936"/>
+																<int key="NSButtonFlags">1211912703</int>
+																<int key="NSButtonFlags2">2</int>
+																<reference key="NSNormalImage" ref="1033104355"/>
+																<reference key="NSAlternateImage" ref="1000893652"/>
+																<string key="NSAlternateContents"/>
+																<string key="NSKeyEquivalent"/>
+																<int key="NSPeriodicDelay">200</int>
+																<int key="NSPeriodicInterval">25</int>
+															</object>
+														</object>
+													</object>
+													<string key="NSFrame">{{1, 1}, {293, 38}}</string>
+													<reference key="NSSuperview" ref="148848659"/>
+												</object>
+											</object>
+											<string key="NSFrame">{{74, 52}, {295, 54}}</string>
+											<reference key="NSSuperview" ref="926005793"/>
+											<string key="NSOffsets">{0, 0}</string>
+											<object class="NSTextFieldCell" key="NSTitleCell">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">0</int>
+												<string key="NSContents">OpenGL Options</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSBackgroundColor" ref="527409595"/>
+												<object class="NSColor" key="NSTextColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+												</object>
+											</object>
+											<reference key="NSContentView" ref="817768364"/>
+											<int key="NSBorderType">1</int>
+											<int key="NSBoxType">0</int>
+											<int key="NSTitlePosition">2</int>
+											<bool key="NSTransparent">NO</bool>
+										</object>
 									</object>
 									<string key="NSFrame">{{10, 33}, {443, 355}}</string>
 								</object>
@@ -8862,6 +8938,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 				</object>
 				<string key="NSFrameSize">{489, 425}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="704316683">
@@ -16048,14 +16126,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 			<object class="NSWindowTemplate" id="443896366">
 				<int key="NSWindowStyleMask">279</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{230, 59}, {284, 482}}</string>
+				<string key="NSWindowRect">{{230, 1}, {284, 540}}</string>
 				<int key="NSWTFlags">-461896704</int>
 				<string key="NSWindowTitle">3D Rendering Settings</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="729561310">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -16074,6 +16152,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 77}, {206, 18}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="715693022">
 												<int key="NSCellFlags">-2080244224</int>
@@ -16096,6 +16175,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 57}, {134, 18}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="874032897">
 												<int key="NSCellFlags">-2080244224</int>
@@ -16118,6 +16198,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 37}, {80, 18}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="67001337">
 												<int key="NSCellFlags">-2080244224</int>
@@ -16140,6 +16221,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{185, 12}, {45, 19}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="424545719">
 												<int key="NSCellFlags">-1804468671</int>
@@ -16220,6 +16302,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 14}, {165, 14}}</string>
 											<reference key="NSSuperview" ref="372893695"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="714807735">
 												<int key="NSCellFlags">68288064</int>
@@ -16234,10 +16317,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									</object>
 									<string key="NSFrame">{{1, 1}, {248, 103}}</string>
 									<reference key="NSSuperview" ref="219189503"/>
+									<reference key="NSWindow"/>
 								</object>
 							</object>
-							<string key="NSFrame">{{17, 163}, {250, 119}}</string>
+							<string key="NSFrame">{{17, 221}, {250, 119}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -16261,6 +16346,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{65, 18}, {154, 19}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="837427736">
 								<int key="NSCellFlags">-2080244224</int>
@@ -16291,6 +16377,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 14}, {107, 58}}</string>
 											<reference key="NSSuperview" ref="909175549"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">3</int>
 											<int key="NSNumCols">1</int>
@@ -16495,10 +16582,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									</object>
 									<string key="NSFrame">{{1, 1}, {248, 82}}</string>
 									<reference key="NSSuperview" ref="299127137"/>
+									<reference key="NSWindow"/>
 								</object>
 							</object>
-							<string key="NSFrame">{{17, 364}, {250, 98}}</string>
+							<string key="NSFrame">{{17, 422}, {250, 98}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -16532,6 +16621,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{18, 14}, {120, 78}}</string>
 											<reference key="NSSuperview" ref="1000433834"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<int key="NSNumRows">4</int>
 											<int key="NSNumCols">1</int>
@@ -16783,10 +16873,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									</object>
 									<string key="NSFrame">{{1, 1}, {248, 102}}</string>
 									<reference key="NSSuperview" ref="264524412"/>
+									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{17, 41}, {250, 118}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -16820,6 +16912,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 32}, {113, 18}}</string>
 											<reference key="NSSuperview" ref="887816052"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="394241287">
 												<int key="NSCellFlags">-2080244224</int>
@@ -16842,6 +16935,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<int key="NSvFlags">268</int>
 											<string key="NSFrame">{{15, 12}, {108, 18}}</string>
 											<reference key="NSSuperview" ref="887816052"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="109440671">
 												<int key="NSCellFlags">-2080244224</int>
@@ -16862,10 +16956,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									</object>
 									<string key="NSFrame">{{1, 1}, {248, 58}}</string>
 									<reference key="NSSuperview" ref="353783913"/>
+									<reference key="NSWindow"/>
 								</object>
 							</object>
-							<string key="NSFrame">{{17, 286}, {250, 74}}</string>
+							<string key="NSFrame">{{17, 344}, {250, 74}}</string>
 							<reference key="NSSuperview" ref="729561310"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -16884,8 +16980,70 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<int key="NSTitlePosition">2</int>
 							<bool key="NSTransparent">NO</bool>
 						</object>
+						<object class="NSBox" id="226041199">
+							<reference key="NSNextResponder" ref="729561310"/>
+							<int key="NSvFlags">12</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSView" id="633221410">
+									<reference key="NSNextResponder" ref="226041199"/>
+									<int key="NSvFlags">256</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSButton" id="846174836">
+											<reference key="NSNextResponder" ref="633221410"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{16, 12}, {192, 18}}</string>
+											<reference key="NSSuperview" ref="633221410"/>
+											<reference key="NSWindow"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSButtonCell" key="NSCell" id="477056413">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">131072</int>
+												<string key="NSContents">Enable Multisample Antialiasing</string>
+												<reference key="NSSupport" ref="26"/>
+												<reference key="NSControlView" ref="846174836"/>
+												<int key="NSButtonFlags">1211912703</int>
+												<int key="NSButtonFlags2">2</int>
+												<reference key="NSNormalImage" ref="1033104355"/>
+												<reference key="NSAlternateImage" ref="1000893652"/>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">200</int>
+												<int key="NSPeriodicInterval">25</int>
+											</object>
+										</object>
+									</object>
+									<string key="NSFrame">{{1, 1}, {248, 38}}</string>
+									<reference key="NSSuperview" ref="226041199"/>
+									<reference key="NSWindow"/>
+								</object>
+							</object>
+							<string key="NSFrame">{{17, 163}, {250, 54}}</string>
+							<reference key="NSSuperview" ref="729561310"/>
+							<reference key="NSWindow"/>
+							<string key="NSOffsets">{0, 0}</string>
+							<object class="NSTextFieldCell" key="NSTitleCell">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">OpenGL Options</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSBackgroundColor" ref="527409595"/>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+								</object>
+							</object>
+							<reference key="NSContentView" ref="633221410"/>
+							<int key="NSBorderType">1</int>
+							<int key="NSBoxType">0</int>
+							<int key="NSTitlePosition">2</int>
+							<bool key="NSTransparent">NO</bool>
+						</object>
 					</object>
-					<string key="NSFrameSize">{284, 482}</string>
+					<string key="NSFrameSize">{284, 540}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -21207,6 +21365,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>useVerticalSync</string>
 					<string>displayOrientation</string>
 					<string>displayOrder</string>
+					<string>render3DMultisample</string>
 				</object>
 				<bool key="NSEditable">YES</bool>
 				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
@@ -30791,6 +30950,46 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">6616</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.render3DMultisample</string>
+						<reference key="source" ref="846174836"/>
+						<reference key="destination" ref="280539556"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="846174836"/>
+							<reference key="NSDestination" ref="280539556"/>
+							<string key="NSLabel">value: selection.render3DMultisample</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.render3DMultisample</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">6621</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.Render3D_Multisample</string>
+						<reference key="source" ref="408650936"/>
+						<reference key="destination" ref="178548672"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="408650936"/>
+							<reference key="NSDestination" ref="178548672"/>
+							<string key="NSLabel">value: values.Render3D_Multisample</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.Render3D_Multisample</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">6625</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">change3DRenderMultisample:</string>
+						<reference key="source" ref="580129455"/>
+						<reference key="destination" ref="846174836"/>
+					</object>
+					<int key="connectionID">6626</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -35623,12 +35822,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="926005793"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="945754227"/>
 							<reference ref="515405915"/>
 							<reference ref="30639279"/>
 							<reference ref="552851483"/>
 							<reference ref="890740037"/>
 							<reference ref="487826591"/>
+							<reference ref="945754227"/>
+							<reference ref="148848659"/>
 						</object>
 						<reference key="parent" ref="521164677"/>
 					</object>
@@ -35790,9 +35990,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="299127137"/>
 							<reference ref="219189503"/>
-							<reference ref="412885015"/>
-							<reference ref="264524412"/>
 							<reference ref="353783913"/>
+							<reference ref="226041199"/>
+							<reference ref="264524412"/>
+							<reference ref="412885015"/>
 						</object>
 						<reference key="parent" ref="443896366"/>
 					</object>
@@ -42043,6 +42244,52 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="751339628"/>
 						<reference key="parent" ref="756526679"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6617</int>
+						<reference key="object" ref="226041199"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="846174836"/>
+						</object>
+						<reference key="parent" ref="729561310"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6618</int>
+						<reference key="object" ref="846174836"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="477056413"/>
+						</object>
+						<reference key="parent" ref="226041199"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6619</int>
+						<reference key="object" ref="477056413"/>
+						<reference key="parent" ref="846174836"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6622</int>
+						<reference key="object" ref="148848659"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="408650936"/>
+						</object>
+						<reference key="parent" ref="926005793"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6623</int>
+						<reference key="object" ref="408650936"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="995020498"/>
+						</object>
+						<reference key="parent" ref="148848659"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6624</int>
+						<reference key="object" ref="995020498"/>
+						<reference key="parent" ref="408650936"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -44147,6 +44394,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>6611.IBPluginDependency</string>
 					<string>6611.IBViewBoundsToFrameTransform</string>
 					<string>6612.IBPluginDependency</string>
+					<string>6617.IBPluginDependency</string>
+					<string>6618.IBAttributePlaceholdersKey</string>
+					<string>6618.IBPluginDependency</string>
+					<string>6618.IBViewBoundsToFrameTransform</string>
+					<string>6619.IBPluginDependency</string>
+					<string>6622.IBPluginDependency</string>
+					<string>6622.IBViewBoundsToFrameTransform</string>
+					<string>6623.IBAttributePlaceholdersKey</string>
+					<string>6623.IBPluginDependency</string>
+					<string>6624.IBPluginDependency</string>
 					<string>714.IBEditorWindowLastContentRect</string>
 					<string>714.IBPluginDependency</string>
 					<string>714.IBViewBoundsToFrameTransform</string>
@@ -44898,7 +45155,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{1040, 623}, {489, 425}}</string>
+					<string>{{1000, 634}, {489, 425}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
@@ -45925,7 +46182,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwpIAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABBcAAAwlQAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
@@ -45971,9 +46228,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<bytes key="NSTransformStruct">AUGIAABDIwAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{1219, 241}, {284, 482}}</string>
+					<string>{{1300, 177}, {284, 540}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{1219, 241}, {284, 482}}</string>
+					<string>{{1300, 177}, {284, 540}}</string>
 					<boolean value="NO"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -45983,7 +46240,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">AUKUAABCwAAAA</bytes>
+						<bytes key="NSTransformStruct">AUKUAABC3AAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
@@ -46080,7 +46337,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="814532053"/>
-							<string key="toolTip">DeSmuME's internal software 3D rendering engine. Very high CPU usage. Recommended setting.</string>
+							<string key="toolTip">DeSmuME's internal software 3D rendering engine. Has the best 3D emulation accuracy. Very high CPU usage. Recommended setting.</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -46098,7 +46355,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<bytes key="NSTransformStruct">P4AAAL+AAABDXAAAw5qAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{1269, 906}, {152, 63}}</string>
+					<string>{{1229, 938}, {152, 63}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
@@ -46114,7 +46371,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="823815537"/>
-							<string key="toolTip">DeSmuME's internal software 3D rendering engine. Very high CPU usage. Recommended setting.</string>
+							<string key="toolTip">DeSmuME's internal software 3D rendering engine. Has the best 3D emulation accuracy. Very high CPU usage. Recommended setting.</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -46188,7 +46445,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="515405915"/>
-							<string key="toolTip">Sets the default number of processing threads that SoftRasterizer will use for 3D rendering. This is an option for advanced users. For most cases, it's best to keep this set to Automatic.</string>
+							<string key="toolTip">Sets the default number of processing threads that DeSmuME will use for 3D rendering. This is an option for advanced users. For most cases, it's best to keep this set to Automatic.</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -46241,7 +46498,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">AUKUAABDXQAAA</bytes>
+						<bytes key="NSTransformStruct">AUKUAABDUQAAA</bytes>
 					</object>
 					<object class="NSMutableDictionary">
 						<string key="NS.key.0">ToolTip</string>
@@ -48129,7 +48386,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="621082995"/>
-							<string key="toolTip">OpenGL-based 3D rendering engine. Some 3D objects may have better looking texturing, but the geometry may be less accurate. Extremely high CPU usage.</string>
+							<string key="toolTip">OpenGL-based 3D rendering engine. Some 3D objects may have better looking texturing, but 3D emulation is less accurate overall. Low CPU usage. However, it requires the usage of your GPU.</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -48138,7 +48395,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<object class="IBToolTipAttribute" key="NS.object.0">
 							<string key="name">ToolTip</string>
 							<reference key="object" ref="313780696"/>
-							<string key="toolTip">OpenGL-based 3D rendering engine. Some 3D objects may have better looking texturing, but the geometry may be less accurate. Extremely high CPU usage.</string>
+							<string key="toolTip">OpenGL-based 3D rendering engine. Some 3D objects may have better looking texturing, but 3D emulation is less accurate overall. Low CPU usage. However, it requires the usage of your GPU.</string>
 						</object>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -48418,6 +48675,34 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<bytes key="NSTransformStruct">P4AAAL+AAABDqwAAwpQAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="846174836"/>
+							<string key="toolTip">Smooths the edges of 3D objects using multisample antialiasing (MSAA). No CPU usage. However, it requires additional VRAM from your GPU.</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBgAAAwrAAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">AUKUAABCUAAAA</bytes>
+					</object>
+					<object class="NSMutableDictionary">
+						<string key="NS.key.0">ToolTip</string>
+						<object class="IBToolTipAttribute" key="NS.object.0">
+							<string key="name">ToolTip</string>
+							<reference key="object" ref="408650936"/>
+							<string key="toolTip">Smooths the edges of 3D objects using multisample antialiasing (MSAA) by default. No CPU usage. However, it requires additional VRAM from your GPU.</string>
+						</object>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{1191, 651}, {328, 434}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSAffineTransform"/>
@@ -48767,7 +49052,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">6616</int>
+			<int key="maxID">6626</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -49293,6 +49578,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>change3DRenderHighPrecisionColorInterpolation:</string>
 							<string>change3DRenderLineHack:</string>
 							<string>change3DRenderMethod:</string>
+							<string>change3DRenderMultisample:</string>
 							<string>change3DRenderTextures:</string>
 							<string>change3DRenderThreads:</string>
 							<string>changeAudioEngine:</string>
@@ -49323,9 +49609,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>hudDisable:</string>
 							<string>importRomSave:</string>
 							<string>loadEmuSaveStateSlot:</string>
-							<string>loadLastRom:</string>
-							<string>loadReplay:</string>
-							<string>loadRomToggle:</string>
 							<string>openEmuSaveState:</string>
 							<string>openRom:</string>
 							<string>resetCore:</string>
@@ -49338,16 +49621,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>selectScreenshotFileFormat:</string>
 							<string>speedLimitDisable:</string>
 							<string>toggleAutoFrameSkip:</string>
-							<string>toggleDisplayLayoutSettingsDrawer:</string>
 							<string>toggleGPUState:</string>
 							<string>toggleKeepMinDisplaySizeAtNormal:</string>
 							<string>toggleStatusBar:</string>
-							<string>toggleVideoOutputSettingsDrawer:</string>
 							<string>writeDefaults3DRenderingSettings:</string>
-							<string>writeDefaultsComboDisplayLayoutSettings:</string>
 							<string>writeDefaultsDisplayRotation:</string>
 							<string>writeDefaultsEmulationSettings:</string>
-							<string>writeDefaultsGeneralDisplayLayoutSettings:</string>
 							<string>writeDefaultsHUDSettings:</string>
 							<string>writeDefaultsSoundSettings:</string>
 							<string>writeDefaultsVideoOutputSettings:</string>
@@ -49412,12 +49691,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -49430,6 +49703,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>change3DRenderHighPrecisionColorInterpolation:</string>
 							<string>change3DRenderLineHack:</string>
 							<string>change3DRenderMethod:</string>
+							<string>change3DRenderMultisample:</string>
 							<string>change3DRenderTextures:</string>
 							<string>change3DRenderThreads:</string>
 							<string>changeAudioEngine:</string>
@@ -49460,9 +49734,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>hudDisable:</string>
 							<string>importRomSave:</string>
 							<string>loadEmuSaveStateSlot:</string>
-							<string>loadLastRom:</string>
-							<string>loadReplay:</string>
-							<string>loadRomToggle:</string>
 							<string>openEmuSaveState:</string>
 							<string>openRom:</string>
 							<string>resetCore:</string>
@@ -49475,16 +49746,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>selectScreenshotFileFormat:</string>
 							<string>speedLimitDisable:</string>
 							<string>toggleAutoFrameSkip:</string>
-							<string>toggleDisplayLayoutSettingsDrawer:</string>
 							<string>toggleGPUState:</string>
 							<string>toggleKeepMinDisplaySizeAtNormal:</string>
 							<string>toggleStatusBar:</string>
-							<string>toggleVideoOutputSettingsDrawer:</string>
 							<string>writeDefaults3DRenderingSettings:</string>
-							<string>writeDefaultsComboDisplayLayoutSettings:</string>
 							<string>writeDefaultsDisplayRotation:</string>
 							<string>writeDefaultsEmulationSettings:</string>
-							<string>writeDefaultsGeneralDisplayLayoutSettings:</string>
 							<string>writeDefaultsHUDSettings:</string>
 							<string>writeDefaultsSoundSettings:</string>
 							<string>writeDefaultsVideoOutputSettings:</string>
@@ -49515,6 +49782,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="name">change3DRenderMethod:</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">change3DRenderMultisample:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 							<object class="IBActionInfo">
 								<string key="name">change3DRenderTextures:</string>
 								<string key="candidateClassName">id</string>
@@ -49635,18 +49906,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="name">loadEmuSaveStateSlot:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">loadLastRom:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">loadReplay:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">loadRomToggle:</string>
-								<string key="candidateClassName">id</string>
-							</object>
 							<object class="IBActionInfo">
 								<string key="name">openEmuSaveState:</string>
 								<string key="candidateClassName">id</string>
@@ -49695,10 +49954,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="name">toggleAutoFrameSkip:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleDisplayLayoutSettingsDrawer:</string>
-								<string key="candidateClassName">id</string>
-							</object>
 							<object class="IBActionInfo">
 								<string key="name">toggleGPUState:</string>
 								<string key="candidateClassName">id</string>
@@ -49711,18 +49966,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="name">toggleStatusBar:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">toggleVideoOutputSettingsDrawer:</string>
-								<string key="candidateClassName">id</string>
-							</object>
 							<object class="IBActionInfo">
 								<string key="name">writeDefaults3DRenderingSettings:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">writeDefaultsComboDisplayLayoutSettings:</string>
-								<string key="candidateClassName">id</string>
-							</object>
 							<object class="IBActionInfo">
 								<string key="name">writeDefaultsDisplayRotation:</string>
 								<string key="candidateClassName">id</string>
@@ -49731,10 +49978,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="name">writeDefaultsEmulationSettings:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">writeDefaultsGeneralDisplayLayoutSettings:</string>
-								<string key="candidateClassName">id</string>
-							</object>
 							<object class="IBActionInfo">
 								<string key="name">writeDefaultsHUDSettings:</string>
 								<string key="candidateClassName">id</string>
@@ -49760,7 +50003,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>cheatListController</string>
 							<string>cheatWindowController</string>
 							<string>cheatWindowDelegate</string>
-							<string>displayLayoutSettingsDrawer</string>
 							<string>displayView</string>
 							<string>emuWindowController</string>
 							<string>exportRomSavePanelAccessoryView</string>
@@ -49769,7 +50011,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>saveFileMigrationSheet</string>
 							<string>saveScreenshotPanelAccessoryView</string>
 							<string>saveStatePrecloseSheet</string>
-							<string>videoOutputSettingsDrawer</string>
 							<string>window</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -49781,7 +50022,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>NSArrayController</string>
 							<string>NSObjectController</string>
 							<string>CheatWindowDelegate</string>
-							<string>NSDrawer</string>
 							<string>NSView</string>
 							<string>NSObjectController</string>
 							<string>NSView</string>
@@ -49790,7 +50030,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>NSWindow</string>
 							<string>NSView</string>
 							<string>NSWindow</string>
-							<string>NSDrawer</string>
 							<string>NSWindow</string>
 						</object>
 					</object>
@@ -49805,7 +50044,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>cheatListController</string>
 							<string>cheatWindowController</string>
 							<string>cheatWindowDelegate</string>
-							<string>displayLayoutSettingsDrawer</string>
 							<string>displayView</string>
 							<string>emuWindowController</string>
 							<string>exportRomSavePanelAccessoryView</string>
@@ -49814,7 +50052,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>saveFileMigrationSheet</string>
 							<string>saveScreenshotPanelAccessoryView</string>
 							<string>saveStatePrecloseSheet</string>
-							<string>videoOutputSettingsDrawer</string>
 							<string>window</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -49847,10 +50084,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="name">cheatWindowDelegate</string>
 								<string key="candidateClassName">CheatWindowDelegate</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">displayLayoutSettingsDrawer</string>
-								<string key="candidateClassName">NSDrawer</string>
-							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">displayView</string>
 								<string key="candidateClassName">NSView</string>
@@ -49883,10 +50116,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="name">saveStatePrecloseSheet</string>
 								<string key="candidateClassName">NSWindow</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">videoOutputSettingsDrawer</string>
-								<string key="candidateClassName">NSDrawer</string>
-							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">window</string>
 								<string key="candidateClassName">NSWindow</string>
@@ -51160,6 +51389,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<integer value="1050" key="NS.object.0"/>
 		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1060" key="NS.object.0"/>
+		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<integer value="3100" key="NS.object.0"/>
diff --git a/desmume/src/cocoa/userinterface/displayView.h b/desmume/src/cocoa/userinterface/displayView.h
index be537c6c5..41ef63f33 100644
--- a/desmume/src/cocoa/userinterface/displayView.h
+++ b/desmume/src/cocoa/userinterface/displayView.h
@@ -95,6 +95,7 @@
 - (void) setRender3DDepthComparisonThreshold:(NSUInteger)threshold;
 - (void) setRender3DThreads:(NSUInteger)numberThreads;
 - (void) setRender3DLineHack:(BOOL)state;
+- (void) setRender3DMultisample:(BOOL)state;
 - (void) setViewToBlack;
 - (void) setViewToWhite;
 - (void) requestScreenshot:(NSURL *)fileURL fileType:(NSBitmapImageFileType)fileType;
diff --git a/desmume/src/cocoa/userinterface/displayView.mm b/desmume/src/cocoa/userinterface/displayView.mm
index 404ea8c28..b8d2010e2 100644
--- a/desmume/src/cocoa/userinterface/displayView.mm
+++ b/desmume/src/cocoa/userinterface/displayView.mm
@@ -171,6 +171,7 @@ CGLContextObj OSXOpenGLRendererContext = NULL;
 	[bindings setValue:[NSNumber numberWithInteger:0] forKey:@"render3DDepthComparisonThreshold"];
 	[bindings setValue:[NSNumber numberWithInteger:0] forKey:@"render3DThreads"];
 	[bindings setValue:[NSNumber numberWithBool:YES] forKey:@"render3DLineHack"];
+	[bindings setValue:[NSNumber numberWithBool:NO] forKey:@"render3DMultisample"];
 	
     return self;
 }
@@ -471,6 +472,12 @@ CGLContextObj OSXOpenGLRendererContext = NULL;
 	[CocoaDSUtil messageSendOneWayWithBool:self.sendPortDisplay msgID:MESSAGE_SET_RENDER3D_LINE_HACK boolValue:state];
 }
 
+- (void) setRender3DMultisample:(BOOL)state
+{
+	[bindings setValue:[NSNumber numberWithBool:state] forKey:@"render3DMultisample"];
+	[CocoaDSUtil messageSendOneWayWithBool:self.sendPortDisplay msgID:MESSAGE_SET_RENDER3D_MULTISAMPLE boolValue:state];
+}
+
 - (void) setViewToBlack
 {
 	[CocoaDSUtil messageSendOneWay:self.sendPortDisplay msgID:MESSAGE_SET_VIEW_TO_BLACK];
diff --git a/desmume/src/cocoa/userinterface/emuWindowDelegate.h b/desmume/src/cocoa/userinterface/emuWindowDelegate.h
index 7ec3754a1..60766d985 100644
--- a/desmume/src/cocoa/userinterface/emuWindowDelegate.h
+++ b/desmume/src/cocoa/userinterface/emuWindowDelegate.h
@@ -200,6 +200,7 @@
 - (IBAction) change3DRenderDepthComparisonThreshold:(id)sender;
 - (IBAction) change3DRenderThreads:(id)sender;
 - (IBAction) change3DRenderLineHack:(id)sender;
+- (IBAction) change3DRenderMultisample:(id)sender;
 
 - (void) setShowStatusBar:(BOOL)showStatusBar;
 
diff --git a/desmume/src/cocoa/userinterface/emuWindowDelegate.mm b/desmume/src/cocoa/userinterface/emuWindowDelegate.mm
index c0e157c67..c334efeb3 100644
--- a/desmume/src/cocoa/userinterface/emuWindowDelegate.mm
+++ b/desmume/src/cocoa/userinterface/emuWindowDelegate.mm
@@ -984,6 +984,11 @@
 	[dispViewDelegate setRender3DLineHack:[CocoaDSUtil getIBActionSenderButtonStateBool:sender]];
 }
 
+- (IBAction) change3DRenderMultisample:(id)sender
+{
+	[dispViewDelegate setRender3DMultisample:[CocoaDSUtil getIBActionSenderButtonStateBool:sender]];
+}
+
 - (IBAction) hudDisable:(id)sender
 {
 	if ([dispViewDelegate isHudEnabled])
@@ -2075,6 +2080,7 @@
 	[[self dispViewDelegate] setRender3DTextures:[[NSUserDefaults standardUserDefaults] boolForKey:@"Render3D_Textures"]];
 	[[self dispViewDelegate] setRender3DDepthComparisonThreshold:(NSUInteger)[[NSUserDefaults standardUserDefaults] integerForKey:@"Render3D_DepthComparisonThreshold"]];
 	[[self dispViewDelegate] setRender3DLineHack:[[NSUserDefaults standardUserDefaults] boolForKey:@"Render3D_LineHack"]];
+	[[self dispViewDelegate] setRender3DMultisample:[[NSUserDefaults standardUserDefaults] boolForKey:@"Render3D_Multisample"]];
 }
 
 - (IBAction) writeDefaultsDisplayRotation:(id)sender
@@ -2113,6 +2119,7 @@
 	[[NSUserDefaults standardUserDefaults] setInteger:[[dispViewBindings valueForKey:@"render3DDepthComparisonThreshold"] integerValue] forKey:@"Render3D_DepthComparisonThreshold"];
 	[[NSUserDefaults standardUserDefaults] setInteger:[[dispViewBindings valueForKey:@"render3DThreads"] integerValue] forKey:@"Render3D_Threads"];
 	[[NSUserDefaults standardUserDefaults] setBool:[[dispViewBindings valueForKey:@"render3DLineHack"] boolValue] forKey:@"Render3D_LineHack"];
+	[[NSUserDefaults standardUserDefaults] setBool:[[dispViewBindings valueForKey:@"render3DMultisample"] boolValue] forKey:@"Render3D_Multisample"];
 }
 
 - (IBAction) writeDefaultsEmulationSettings:(id)sender