From 0488bbd33aa049668d14ba78c317a6ad23b6729b Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Fri, 31 May 2024 20:48:16 -0700
Subject: [PATCH] Fix mupen grabbing an OpenGL context based on whatever
 current version/flag attributes were present

This is global state that gets mucked by us since we also use SDL2 to handle OpenGL context management, Rice/Glide/Glidemk2 don't like core contexts due to them using old deprecated functionality
---
 Assets/dll/mupen64plus.dll                    | Bin 445952 -> 445952 bytes
 .../src/api/vidext_sdl2_compat.h              |   4 ++
 .../Controls/OpenGLControl.cs                 |   2 +-
 .../OpenGL/SDL2OpenGLContext.cs               |  39 +++++++-----------
 .../GraphicsImplementations/OpenGLProvider.cs |   4 +-
 .../Interfaces/IOpenGLProvider.cs             |   5 +--
 .../Consoles/Nintendo/3DS/Encore.cs           |   2 +-
 .../Consoles/Nintendo/NDS/MelonDS.cs          |   4 +-
 8 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/Assets/dll/mupen64plus.dll b/Assets/dll/mupen64plus.dll
index 33c0df9adfbc13a0d737f8cc2bf9c239a08e9771..1bc2bcc28efc2b42d058d40305083f26618fd171 100644
GIT binary patch
delta 9379
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

delta 9332
zcmZWu3w%u1)<1invrir}l3?VCgdp*Vka!D|G<2d#grJ_47A;bhlAx_hA_*B|6v5Wk
zt1sMMT9vk^LJ1*{77coF>rrl%iG-$Fy{clq|2{Jzy<dL6eb#fYz4qE`t+UT0cXLqg
z=AgY%B(!|aq!%UEUxU;!qy=pmF0Esd)F+Y(c2V(Ya+BU$Q!<FgQ}TJqn@TVxAC$bK
zX7nQci`9N<q@;LKzkMXC#L$15f!4&9ypk~DSyEK;#k;}XNJjCQ<Kh1C2NlVje{5Fy
zR|FQ#)}*jhbMy&&_u^I+!)V=slC+9egq|-gd8x8Bp-1-@FR6+lt4cnra&sqHCHrfZ
ztMu0c#c}5&XvKlzm(TYnwvrFe$9s~IB{#3Niy%ET)`I-wWwK2BbP)-kW{fx>OVMY{
zHpAv$6cYE9B;`tWqgH>8Brs#m7cSXTw;sz5YQry)T!k#sDz1{)7Gxk->Pde>v?2B6
zGhZ@_-)SVf$wvO}BQlHh)D#EtBgD8Nm`)<48y3+`;Q0_5M(ByRw0@MDS{PRr$k?T!
z*9rxWzylvivM<!E1{yq!Ow@KI(cXkuwI7lxPbF49e=D`nKksUdTj@ATKIUof(FtTU
z-~Ap9CNaGFJ^Bx_k}r6ljx-MY50y*<<^^Q^+iZPiacMY$Y46U@yibSH`fFON59nc;
zWN2r0&>ES%!$0_#{?exECY65kp3+d~^P9JiVR4=;*}vdB{z*Tf_J3*Pche=5bkoj$
zLU$ALrk1;xc2meY?Vq31Pi6X_YHi9_)I>=--%?6f(#zFa!~r^;kW9^XkbXmGZ3Ulr
zh;}FYc;O+sh)BFqP;Gd`VfqQ_$uAtHJIGR=Q%0we_S%nSVy*YIDdqGmr6&*Z-W9Zt
z+P~)QD``7g{WXuRq)~0Ezok-=b%cAOEyX9fdu5{ay!}g_S4jtur?k>a+D#=P+RrEH
z2~Wgt-vxM0uk6&)f1oBpHf!%)q`eJfj&{~gLuo&+om8@yG&mfk4v};=L;ntuRHOsg
z4LhhaMLKne61-d}<R1&Ky|9CKtE26rYcbbsvr6ug<eXu)8RHs?iM^&tK%WSz+DB5m
z#$U%o@;2X8M>|F@)YXcc&o`X<1@osi37*V1j1%({_-!%2i`Jr^-bg0%w7Uc4@iKid
zj*pC$my+dLb*zlgx8*&D$vNbGZO<_ILt<zgO{KcfyWT!-_8X)5b8&K=fjwc}N!7;3
z%Qi2PuU$`(i)4Dq#9tW$YqPZ5W8}#MCzd!?o`=ZoA1kjRh8D5H8uG-={`(L<emtzT
z9`cy=aIlv0tSpC<*4mgH`E5!<d3~Pz3+b(0S|;}*gmA9{*@3e0DwI<Q*{4ljE_)NW
znz2HjMo7H&ZIPh+XcsMV8qVz=kFv^-=#}5Ks8wRZYMx`m{MA~{YS~W7N7}5l!fdv-
zX&rV<@6~Go>*Yv7kJo958|2pr8L5?T6dHlrZyXxr9c{tef}W#&@Q!@GBl7r-ujLMe
z%-7yMB-;qRUZ!;`liL$|?65ZSh`gSVNbSd?@Qt22sF{w*2MF=i9v+uR5qf05mRu?S
z?nXLj@!!eIW%4?&K7%z>E%B_JPsl=k@_XTwmi#XqgV)r9r0Ez&@Wyj;z1PeGk2xvY
zz4P)FFH)?1e_h@s(-R-_rFI;`1g+7IL!b@2_@rB)muUaKC2uE&i#x<r{S=Pv;LGcA
z3O{}Hn04YKZRu_KcX!nHf<F*0Z2G_Q7($-r7570ttyTOfrxN-{q2~XWh*m{`W_~E5
zGhC}`6wxti_aDixBU&34pp#)bQC=XVzjlr)-h_13ZpcbHroEw=nKG0h@m8qH8iaqb
z7T_)zUuY9NlzWsM<|$svd3tk!*43cQ4kMX-ZEvMDnZiHnt(+u>v;}>Xu?m^ZtNJO2
z$v=2ee`OIdY#g9WF@89aIE&A3HErt8Yxt`Jl!3<aO`>YsV^KUmJU|&qWX*G+k~0}y
zdgXd0ss~xd50oi=&=&5LDXEm+|4uWND~D9_isq<REDHIYTTUrKwCb3)<CHR!#5`Xv
zNrh$Jh3EBVU~Dy-NQu@{_K`X}+as=MT14&gMu!8HuDWEAd{~V#lKym*TWesd;;6Q(
zMhR8P^V&D(lx+&F)Of~4rG49-ns})hg7*{A6wvI=Xj|*}wu{O-KgXBO7Ge?|=+MnP
z$j;hteW{r*DYs?%?Pps5tJnoSyIsq;rpO9Cx`$`}thD!ge~)g{@6+ZsZF~6ki%I}L
z^s}<q@4@b7miJ$FTK;*rmV868!}3n8|1G5rr9bY_lIxXuZpMVIk~8f6Yx4BwWs>Ys
z+Uehv;UxLiW(m<a4i_KpB$D}vohE~_o;TZqSJ)f3=nIK`*$hk2#l#luU}Dcxw?W-j
zEH>@jy8XK?eEK~ln#|$+o-&?{((c?-s$}Gm_NOwhMUdy}CQSs|@*|AdtOp6+(7)Pv
z9Akd;f{jmNESo&fYZ&t<X04VnADQ&$58T-vvO(MB!MeH$sSooHG%pig7{AUJURV$M
z<~DiJi&I~=Fz~B9eKpAhv2oEp#K>ly0Ls2iTj$GK%YN3Sl4M(M>MmhZtHPobn8U>+
zPdnI#4fY5enBC0TuPStBP2xHc!hPGrIXB*|J^PVFYn~m@cFB8uN+=sd`f(o0Qal%p
z6TW?CcTCcL31trmNz-n1V&fToI6;e#V8Idef=Nps!%Ah+Q41Q+JZ0jib(zTSD0rb7
zpJRz+nl|k@wig|h`=qn6{SofQ7xJXxh1av@JB(vSz`TW(gJVWs7bH-zoZ+INtu+o~
zDdgZ6_2B<bXPuM7oa%F%)c?Ru%)=iBiovP91<GOE>(q&B(m4YzOwI<KWJ?H}Vz!M9
zo8T~d4CiB>XI&?oz#kr6W`!iWx_d=}Wl320+m_hgV0S-i>Dv?V^!?~F78V3dNJAXP
zCBr4j`mON$`8+AVTJdl<Tg~ncV=(wwY7e+cR^wLwJr;;K1S-M%Q$wlXPCpubCUN?a
zB)KeEjt@z)#KGE3eU@=N4|{?2^O%>QN5u3zpZ)^tkuyn<RznL+jy{uMEpr%sbdK?K
zx(Jcst^kGAX7Ayr%@*VDpt8cu)<pN=(bd>h^cjcI-)W&5BA10zPw6&SfaB6R=;Z7H
z$6@r={b9R6)bW<nS;z4w#Gg68K0H6x2CkIVLfkXVj?U?Qh_pWhy~tra2^0DE9ob<H
zBNZ#!jK!6bgk~Zk7G?JK?>}&S<t4fnW|o^PneQN;H=P-Cdg=zBGCL#d4ujVFg=N`Y
zENs&#u|w8wkl0~aRvYZr19&M?1O*}tJ8G<zW-E@wX*54}??8B$?diOri-q*{9mdgc
z&gJJ7eXFbzn(*TD$Z42?ze?5x%Zb0HwYEazZ)-t4g+DceMUZFt+!-vu5ZU|j?%#;#
z*XFRcq4v9X(0t*4H-~X&ydH-1ie_Ob=ikg=VKnj=-Y|nb>(zK1GO-`~;O#tZChJ3o
zKF3$gWbJ4BMY#eIl>bQ1Zd=J#Cg(|F&y}peh1K~*mlZlJEDN;v`Z5cf2c*!EZ9>o*
z`a6RbgP>gko?xxe_u{C5@T^Pd2jOAf@<kR(F7v1tSxo4F+fMIsh__9;_dAX?^WI|{
zFMN>=$oUjZ`!`!3IO<vrx1PdLSAdaVEw_IOo_Fc(fZ^841nbE->pAPU_W%3=o7R`{
zv1DQArs!^EhdPXto%VM(x4#I}^(3jA9bN4(hC?N~tdjXBIk%2T==<#L4hHtIw%?OY
zz6tzqo6K?v#U|7F+?QBFR4c45S?^l^%u2P-d#TX@_r7x&dqyJC7jR?|Fe$lawZ*J@
ze(fb@9J6sIG|SD_DPd7&YgX6*<XXtI^8DC=&%l~@L0cS(E4Au}>dmS^1}i_-DCAjP
z5S`8Ct{B=!ZovjUdEPA6x})7x=L~i)hw&a}Lh+NM&4TT_g}*tA1(FSX(=67mtKU6n
zTbR#eX9O{6gLBf2=950-mu9h`@XImI$cSxJ120vPIY(~#w0M+YtwhzFvoDy@=!h=k
zrqQe|?>n1?2F{%%+-)lC+#ZipdkfE;&AP<))a5wDDWU_KA=iTzji7bH3TPw=1DPce
zFJ+ujf`u&wDoUvpTzJ6GVu?8aSP`G*<!Lw8I~@7<N%kO^ITGDurt1?k!OhHU;(h0^
z=z)_b!c(*L-&tPbC?=x~jqLu|+Z99fHQb}ibRo{|+a|5e{Jl9Wh`LSWhfu19``sQ-
z>N!MIZ-C+b*N|}4iPkcl#SQM3!D7g-d`Je15*44p{Jlm!nX`ni&0v8oe_i}!O5fM`
z{tOmN)xrFJ1{)e^d$xH<H$^;N?`xj=GK-HG33-yOZ<-EbUw-B<hj#~)<lUhFhb4As
zm<Wl(7(JLDc$ozb@djlcd^~#qV%1vU7QFeMa!<1042*#~qupQQ!MCR1U6eOaH$in1
z_1t$Z>*Dq=NFBz*eCS-}M{e@*bJ=V%lb6kf&s_&|$6R)h<ne>Auy>~32qU;d95Y)A
z!q(smEBX(!jh&hI5E+<&Zfj$0Go5%i@NO<V3iwbLJ^*;U3pW8@?!wK$SMrj1EYxi*
z7q5*M_{Di>h<yiflF5d(zCJ*BeP49YmbjorSKEKk(lXg2itEFe1#C4*(5@}O{faE+
ze`Yfi`AHkJko```72azxn?&B#RxW1WP-54{y}@=;V$vGlWP@Z+h94P_2@c~!9+$_0
z`~BF;wY`KeQ-YNpi_ep+KUn`9F0LS35&HzIVO0>eeQ|hUwfE{3;xufAJG?lLg(qY~
z*=+L?yE^0^N&iraOj)B*R>+whvxH(&ScrYerw<(Bwh^*l)+Za^g~+}!|A7O`MaOeT
z9_t*@5DZHwkrwc*2K<L{C;;r-fTO<z++j=!lO#**Ri3<z^&|Uv!7>&Rb~DtqmvcZI
z#sM7#Syk$xNY0c;J$%nkFJrB9s-OV#Zu%SMWCXTQ(S}I&lSIr&Kqs@XJw^lqexj?D
zxr2@sw3TfXz{1?1E;LQRTYy!`uC*qTSgDd-1O`Lk{p`ZN!tV@{Iim~)4VS^=)AL!I
zPRD(OsU#(&NsK$Hp`nQh)ix3QoqX0i=URyFtvl9>vR3KtUV#-mZm+r%;c()(a0u>(
zyWAb8JIFo}z`{B}y^=9Joh~|X%1#$Oz!O-L55h$Po^>pmx}^=S?*{S$f2M$i1bDy=
zv-QAzu_|tgskr>2w>gY|@`3^!!Z-Xt0c#)hZU>=NBDA6%kPFpxv-On2XyLyLy-B=#
zAsb7!@Z3UXq`kUwUdaC0a<+I|co*WW4@W2R)a9&WOsg(pC4&rLzuH3YUJ-U|Kq@H9
z3PDo+r?W0U3t%sWypkzx`Htnx<oO&}agNgtwuLt=XT!);9<_q`cTd1c+1-$LD=!ow
z1M_3YfI+jP?LjbVufTP~{<a(5P@M-E`GOT}T*NViFUKvqtoCR4Ws4ULd65ZOP><{r
zmB?%pNF7?rSpMq@HoeVaCp)WUlC=W2S+VKMd{z<bLWhR&HASo~*~)hou~!r8J7K;h
z&K;F<T1Rp8N6Ph^B>I3TlQRyy)NoTgC$=aUwaB3p;vM5Z&TOs6l@sq=c8Nc4VeNXP
z1VPI>+{bJg-hjLZg+|?5;9*YOmhA7Oy@L417B+D9L{E{wQ*em?twDaQ6lDIfsHx@p
zUG@RV_A%$jmZN~AY}H{b4@829EP+mV`3aoKYobj!I`4x3UfT?_LDy2aDCXNQzW%^r
z&UX*9)4n`uC5xdkt@yH)tSec-KVFG1o?CpfmG$+G@zqxiul)%xVf!n5o0at<xA}Kg
zHV~ip9;;Zpl&vTS`!f(D*gjZihoA@RbXH`avbyLOz2~uOA!6Ms$8X*_Y_48EY$1Rk
z1;qYx04i7_&sxR0`o8zl14s5^^K`@aKoH}#eD^B0uJuB1-J6if<)$?3A|y99gO9ec
zF7A8!<w@oFowM=#73)Mj{rHDA)}4IBYiull6!Tj)bXz3#YL-S`<T<NZu-BhPID}I(
zIq<UFxtjIy|K~2jiTx0u4)1+gG&ckmd9#{@`R6#Li~mRJFQh@-{1%(kk}x7UIyVe+
zc;m8N%lE#;1{zx%@Z&*#6~Udt9cY~!I;Dd@dW#Jv<$TZ@7B|9IA<_Xv3*ou?sFJB5
zon<cpL%NID+{UHMyYyz81wl~y1&s`}OLPXPrQHR7WDV<|xE;j4tNB&#mCOcIbZ-l@
z0*m|ONJ!Sy{Hl;jmIadOg89JqOOh;Z)suiHbgG8=My!{_<JK}`-+o}`8wTTPg5aX1
zT~DA8w+E<m!z?2Z@6sE73%tzUr48a!R+hPSExsE^w18$_b-0AD`v0CbcQRB{G1YJs
z02R6rSG8-0LGR-i*W!rqL&aLwA!ie$-W$qLWhYKJIuB}#S48LC`g67Z9H2i(>d!3w
zxm15%(4V*T=Oz8Q)lbYd>(5F0vp|1t)Sv14bBz8>z;iD_#pKuX;&truQ!&U4N9Qj3
z(_epj>d))?^PK)H)1UjA@$cyPRsH#ZmlU&MIb-}q<u(18tt->TY33hsug&byh_8w!
zdU5R<!xK91ND<U(_dHRlJq<A`cx8wXwCMu^e@%24=q7wZFW{E3VLs!;ZeCr_f=Q0H
zdOe#@ilb!Hmm8V8d)S(7ELSAh-v5DM>3=cc^Slr>foE>T?<+}~Wh?t}MyvWQ&S_5|
ze_dAF$3LN+^32bvZhp;PC;VUe|EKv6vib_G-=d9F)Ysb$YWioG$nPE)Q%tHfrHd#K
zNotabPw_SwMUWLemhnfSY9KA2qXl+U@5(a|uV&KVx0sZQu@j^7M$j04ZDP`$x0w|3
z4wK&5%%oiy9$T0+7ULs~bj-{3#)tn_CKX_j>D!sK4sc9bLRwyN&7i{vPL9-Oo}7Pr
zvGqlnzuHBO?ve}hky$erXNApu1)5UsHYS+>n|NVSQBv79?VB#@ElN_gFCx^RSU@W5
z3#EYWObQ@HQmahgbe||mO68yRQag}Te!7=B3fiGjszxG&cB;@GrAnh__(-N0Z%N%p
zGavJfR8r5-s8mk+s2AzgE!ven>Q)9bZw^rB0o)#-{smAwP<<94Zjky5K<~k-raLk~
zm~N*^EoZ5c#~F52PS;HhQS+fyI7IE<;RZtU)p%73KZ3`34EL60*k)vncwF7azZ;^4
zLig7ps+Hc@!k5OXeFWSWt9J6ai@8)$)N9YG67|gu=RbqnMOgHiph~j>@aTX+Tk49l
zaP$FaeoDL~-Poc<4pjpQ;*dB@jRxdzn$!%CwI-D-AoGT++eDN`sQ6_)m5+W}od)pP
z(`pVtZ?l>PP-qrY_^)R5H>m!cs0PU(NwQjEOr6K1sTc>JQl(G?L8p0jvf622)T>OI
zFrP^^FF8ejqZyT0j3T9GV>-s;>4N5+Q`GKQV04P=*I68p_zDSir;>YC{}Aa7CVhc1
z0g)C9>NK~dsGZtoE@9G@H<`5FC34cdB1LUKx@IYpNDh-u2$@*?y1PyXfOo;AFXT^X
z+?Qq`jmNf>{x%mY>NM{=O6}e^J)cQyF^0?*-ndKB_n3AJ^_7Lo+E`EN?{djW^9`fa
z4mk})Ologo(q=K$Q;|G>S0whmm(J@1{%*k+o@RMUf_@33OkYO&f3&dkcn&;lZaW|V
zwqsgKp6gUS+f9(8f$`{6H8%9B$Sg3#zsu)gh+-9gXMkT8G+&#lww^20urbN67(bF=
zyzWx-0zML>*hQxSf3BHa(9@d9JpxrJ5S14=zwOmFnXS`>UC~T8Kxh7X^cmQh&wWR$
z9ojaD($H=$iviK)P1=aj>T@(AWD)w$LMCNmGyrdS1#~7V9GRHD0A+zR66uzzolH~H
zX6DpEz8PsK^io{e+B|bb25-mM4IKe}VXF+duo(_J=})V=y{2>)@G!=8=m<C!Yu*Pg
z)>g3gg+x{NA<miFIe*J@k?(sj+>v$yw!tQXfr|~z!0;KN>KpUL#>B#6v)5d>*lg%x
zXT3xL#=OR)9++zaoc%hJW?|t>!2e<-fbXmp<h3XlQ8p&jNT!$o_&i1d@aA<R>gP+;
z$}aE){08G7@a8qpyiP>DoXW)sKu5r&JVXFlDq!R?Yz}y24v@YWJwTWMpGC!pT{f={
zQALLfVE{S;{($m$8MuJAFjfI?p4QD%zIl0wGWi0(<z0ZjfLB&ADW@KUK<;5Y1TLVD
zjY(c}a87{XcxMFzHvv9}5d~bl$JS#AM+JQ8EtEO<vjCT1h?XT_z#1F__`!e{j0E7T
z02?t<fxE9|Ia0z}r=cXkMJ{|XU=@ZiB;Xa)+Z0T=3Yd<9*aTd_A{0hFZ~>2Fh~#Pj
z^x1$MO2P&J4`Kvos5<;n(6IRs&~Kx_yQ-2ukkLA!N@D?wT)2Q+T=;e#aZnA)F>wS5
zYY3Q$A#4d);KBtw<ig7UpFwqsASD4_#|VcX0=napAov3IcHs$tt8j5hg^qw#7$V07
zRNmF`9344@&X5iz(f;RR=uQBBi%|gnRlvw?cr^gWl}uWPu^2e6Wzv@zxxmBGGDJhW
xkJqMvqHBdGt2z`NOW*>Et|M>(FK_on(qgjcH}^2i8ESE;{DIc;kb2kq{{THQs2TtO

diff --git a/libmupen64plus/mupen64plus-core/src/api/vidext_sdl2_compat.h b/libmupen64plus/mupen64plus-core/src/api/vidext_sdl2_compat.h
index 53da2bf49b..6d8f781e35 100644
--- a/libmupen64plus/mupen64plus-core/src/api/vidext_sdl2_compat.h
+++ b/libmupen64plus/mupen64plus-core/src/api/vidext_sdl2_compat.h
@@ -636,6 +636,10 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
 
     /* If we're in OpenGL mode, just create a stub surface and we're done! */
     if (flags & SDL_OPENGL) {
+        // make sure to set version/flag attributes, those might have been changed from the defaults
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 1);
+        SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, 0);
         SDL_VideoContext = SDL_GL_CreateContext(SDL_VideoWindow);
         if (!SDL_VideoContext) {
             return NULL;
diff --git a/src/BizHawk.Bizware.Graphics.Controls/Controls/OpenGLControl.cs b/src/BizHawk.Bizware.Graphics.Controls/Controls/OpenGLControl.cs
index 107759e1f7..c9c5a6c354 100644
--- a/src/BizHawk.Bizware.Graphics.Controls/Controls/OpenGLControl.cs
+++ b/src/BizHawk.Bizware.Graphics.Controls/Controls/OpenGLControl.cs
@@ -41,7 +41,7 @@ namespace BizHawk.Bizware.Graphics.Controls
 		protected override void OnHandleCreated(EventArgs e)
 		{
 			base.OnHandleCreated(e);
-			Context = new(Handle, 3, 2, true, false);
+			Context = new(Handle, 3, 2, true);
 		}
 
 		protected override void OnHandleDestroyed(EventArgs e)
diff --git a/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs b/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs
index 3ae9573750..af66b7706b 100644
--- a/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs
+++ b/src/BizHawk.Bizware.Graphics/OpenGL/SDL2OpenGLContext.cs
@@ -30,17 +30,6 @@ namespace BizHawk.Bizware.Graphics
 				throw new($"Could not load default OpenGL library! SDL Error: {SDL_GetError()}");
 			}
 
-			// set some sensible defaults
-			SDL_GL_ResetAttributes();
-			if (SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_RED_SIZE, 8) is not 0
-				|| SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_GREEN_SIZE, 8) is not 0
-				|| SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_BLUE_SIZE, 8) is not 0
-				|| SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_ALPHA_SIZE, 0) is not 0
-				|| SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_DOUBLEBUFFER, 1) is not 0)
-			{
-				throw new($"Could not set GL attributes! SDL Error: {SDL_GetError()}");
-			}
-
 			// we will be turning a foreign window into an SDL window
 			// we need this so it knows that it is capable of using OpenGL functions
 			SDL_SetHint(SDL_HINT_VIDEO_FOREIGN_WINDOW_OPENGL, "1");
@@ -58,8 +47,19 @@ namespace BizHawk.Bizware.Graphics
 		private IntPtr _sdlWindow;
 		private IntPtr _glContext;
 
-		private void CreateContext(int majorVersion, int minorVersion, bool coreProfile, bool forwardCompatible)
+		private void CreateContext(int majorVersion, int minorVersion, bool coreProfile)
 		{
+			// set some sensible defaults
+			SDL_GL_ResetAttributes();
+			if (SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_RED_SIZE, 8) is not 0
+				|| SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_GREEN_SIZE, 8) is not 0
+				|| SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_BLUE_SIZE, 8) is not 0
+				|| SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_ALPHA_SIZE, 0) is not 0
+				|| SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_DOUBLEBUFFER, 1) is not 0)
+			{
+				throw new($"Could not set GL attributes! SDL Error: {SDL_GetError()}");
+			}
+
 			if (SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_CONTEXT_MAJOR_VERSION, majorVersion) != 0)
 			{
 				throw new($"Could not set GL Major Version! SDL Error: {SDL_GetError()}");
@@ -70,13 +70,6 @@ namespace BizHawk.Bizware.Graphics
 				throw new($"Could not set GL Minor Version! SDL Error: {SDL_GetError()}");
 			}
 
-			// TODO: Debug flag / debug callback with DEBUG build
-			if (SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_CONTEXT_FLAGS, forwardCompatible 
-					? (int)SDL_GLcontext.SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG : 0) != 0)
-			{
-				throw new($"Could not set GL Context Flags! SDL Error: {SDL_GetError()}");
-			}
-
 #if DEBUG_OPENGL
 			if (SDL_GL_SetAttribute(SDL_GLattr.SDL_GL_CONTEXT_FLAGS, (int)SDL_GLcontext.SDL_GL_CONTEXT_DEBUG_FLAG) != 0)
 			{
@@ -111,7 +104,7 @@ namespace BizHawk.Bizware.Graphics
 #endif
 		}
 
-		public SDL2OpenGLContext(IntPtr nativeWindowhandle, int majorVersion, int minorVersion, bool coreProfile, bool forwardCompatible)
+		public SDL2OpenGLContext(IntPtr nativeWindowhandle, int majorVersion, int minorVersion, bool coreProfile)
 		{
 			_sdlWindow = SDL_CreateWindowFrom(nativeWindowhandle);
 			if (_sdlWindow == IntPtr.Zero)
@@ -125,10 +118,10 @@ namespace BizHawk.Bizware.Graphics
 				throw new($"Could not set share context attribute! SDL Error: {SDL_GetError()}");
 			}
 
-			CreateContext(majorVersion, minorVersion, coreProfile, forwardCompatible);
+			CreateContext(majorVersion, minorVersion, coreProfile);
 		}
 
-		public SDL2OpenGLContext(int majorVersion, int minorVersion, bool coreProfile, bool forwardCompatible)
+		public SDL2OpenGLContext(int majorVersion, int minorVersion, bool coreProfile)
 		{
 			_sdlWindow = SDL_CreateWindow(null, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 1, 1,
 				SDL_WindowFlags.SDL_WINDOW_OPENGL | SDL_WindowFlags.SDL_WINDOW_HIDDEN);
@@ -144,7 +137,7 @@ namespace BizHawk.Bizware.Graphics
 				throw new($"Could not set share context attribute! SDL Error: {SDL_GetError()}");
 			}
 
-			CreateContext(majorVersion, minorVersion, coreProfile, forwardCompatible);
+			CreateContext(majorVersion, minorVersion, coreProfile);
 		}
 
 		public void Dispose()
diff --git a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/OpenGLProvider.cs b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/OpenGLProvider.cs
index 117e66c71f..c8418da1e0 100644
--- a/src/BizHawk.Client.EmuHawk/GraphicsImplementations/OpenGLProvider.cs
+++ b/src/BizHawk.Client.EmuHawk/GraphicsImplementations/OpenGLProvider.cs
@@ -13,8 +13,8 @@ namespace BizHawk.Client.EmuHawk
 		public bool SupportsGLVersion(int major, int minor)
 			=> OpenGLVersion.SupportsVersion(major, minor);
 
-		public object RequestGLContext(int major, int minor, bool coreProfile, bool forwardCompatible)
-			=> new SDL2OpenGLContext(major, minor, coreProfile, forwardCompatible);
+		public object RequestGLContext(int major, int minor, bool coreProfile)
+			=> new SDL2OpenGLContext(major, minor, coreProfile);
 
 		public void ReleaseGLContext(object context)
 			=> ((SDL2OpenGLContext)context).Dispose();
diff --git a/src/BizHawk.Emulation.Common/Interfaces/IOpenGLProvider.cs b/src/BizHawk.Emulation.Common/Interfaces/IOpenGLProvider.cs
index 3d498f5264..61e0e74935 100644
--- a/src/BizHawk.Emulation.Common/Interfaces/IOpenGLProvider.cs
+++ b/src/BizHawk.Emulation.Common/Interfaces/IOpenGLProvider.cs
@@ -14,13 +14,12 @@ namespace BizHawk.Emulation.Common
 		public bool SupportsGLVersion(int major, int minor);
 
 		/// <summary>
-		/// Requests an OpenGL context with specified major / minor
+		/// Requests an OpenGL context with specified major / minor version
 		/// The core profile can be requested (otherwise, the compatibility profile will be used)
-		/// The forward compatible bit can also be requested
 		/// The requested OpenGL context will be shared with the current context
 		/// Note: creating a context implicitly makes that created context current
 		/// </summary>
-		public object RequestGLContext(int major, int minor, bool coreProfile, bool forwardCompatible);
+		public object RequestGLContext(int major, int minor, bool coreProfile);
 
 		/// <summary>
 		/// Frees this OpenGL context
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.cs
index ac709d26b7..1b4c176ad4 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/3DS/Encore.cs
@@ -169,7 +169,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.N3DS
 
 		private IntPtr RequestGLContextCallback()
 		{
-			var context = _openGLProvider.RequestGLContext(4, 3, true, false);
+			var context = _openGLProvider.RequestGLContext(4, 3, true);
 			_glContexts.Add(context);
 			var handle = GCHandle.Alloc(context, GCHandleType.Weak);
 			return GCHandle.ToIntPtr(handle);
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
index 634d11137b..1d882581fb 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
@@ -162,7 +162,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 				}
 				else
 				{
-					_glContext = _openGLProvider.RequestGLContext(majorGlVersion, minorGlVersion, true, false);
+					_glContext = _openGLProvider.RequestGLContext(majorGlVersion, minorGlVersion, true);
 				}
 			}
 
@@ -174,7 +174,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 				}
 				else
 				{
-					_glContext = _openGLProvider.RequestGLContext(3, 1, true, false);
+					_glContext = _openGLProvider.RequestGLContext(3, 1, true);
 				}
 			}