From e42f611458b77cb521ead381007f7bbf01efc593 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Sat, 2 Jan 2021 14:29:22 +0700 Subject: [PATCH] Update GL4ES link missing framework --- Natives/egl_bridge.c | 22 ++++++++++++---------- Natives/resources/Frameworks/libGL.dylib | Bin 3985416 -> 3985416 bytes 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Natives/egl_bridge.c b/Natives/egl_bridge.c index 5f5bb970..2d69d4d8 100644 --- a/Natives/egl_bridge.c +++ b/Natives/egl_bridge.c @@ -47,15 +47,6 @@ JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_utils_JREUtils_saveGLContext(JNI debug("OpenGLES context is NULL..."); assert(CURR_GL_CONTEXT != NULL); } - assert(makeCurrentContext(CURR_GL_CONTEXT)); - debug("makeCurrent success"); - - void *libGL = dlopen("libGL.dylib", RTLD_GLOBAL); - debug("libGL = %p", libGL); - gl4esInitialize_func *gl4esInitialize = (gl4esInitialize_func*) dlsym(libGL, "initialize_gl4es"); - debug("initialize_gl4es = %p", gl4esInitialize); - gl4esInitialize(); - debug("GL4ES init success"); } JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglGetCurrentContext(JNIEnv* env, jclass clazz) { @@ -68,8 +59,19 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglInit(JNIEnv* env, j */ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* env, jclass clazz, jlong window) { debug("ES2Bridge: making current\n"); - jboolean ret = 1; // makeCurrentContext(CURR_GL_CONTEXT); + + jboolean ret = makeCurrentContext(CURR_GL_CONTEXT); debug("ES2Bridge: makeCurrent() returns %d\n", ret); + + void *libGL = dlopen("libGL.dylib", RTLD_GLOBAL); + debug("libGL = %p", libGL); + + gl4esInitialize_func *gl4esInitialize = (gl4esInitialize_func*) dlsym(libGL, "initialize_gl4es"); + debug("initialize_gl4es = %p", gl4esInitialize); + + gl4esInitialize(); + debug("GL4ES init success"); + return ret; } diff --git a/Natives/resources/Frameworks/libGL.dylib b/Natives/resources/Frameworks/libGL.dylib index bbac02d93af7da95aaa8186ed291632f3bd40ea7..4e5670fbfaa828c07332947340bf5cd25f112a38 100644 GIT binary patch delta 6810 zcmZ9Q2RzjO|G@1%vWcv-vhVCYA~Qr*66c(d)!D+wjFfB%aZy6~T4hAYo;f2US4LdE ziN+}-@&6p^`}^NLJRgtG^L6j}`n=zt&)X%V@ubNhoTIzz`wS!`q$J>n3WNaN*oCaGRGOw%U@>kGGLWO%q$F}S;ekO&UpaFx zHxwKdE_W6M_eF;Kqpk+ZSq32ejLZ#fWIg`G{)V!|sI{r(!A8JQ+|77QDM;?)0 znk+PaAv$RxniPZ#gdBvTaUq(LMvl!C?k6Y+6NJgbpd|7t>M*FfeA2Hf%En(+RP5G3 z^x>FD2095N3w!(7ZqDz6@`;2*W;2`uKQGLb;BvLpz<#@Q zqwTl&EGyHe7Z8sXz*>2A+V0(|iOa*n=^*YV@&@GuQ&pwx1H-vH+urXK(UDx8E`t=C z+j5jqe%`M?pXUWxw7%wxN$4QYOQA-ZL6WlJZzZFgM&sImnle_ir> z78|jD?Yh`U)mlUVew5PIz;`2~r+pQ@6S=>(()#vONTu_$&iQF;&u9gH-|n5F&e_KF zoTbjQGgXCNqN;)~E4-wFc{ulh_~(IwDOCxi9#eFtC7+~E?@_CNd^WTZFmt6Lag*!K z%`#wwt}LeMhA_liqEwLXyelwf8#8aT_^aRU0P|@68Cgi_^bhlb)MxgWtBqGvzuM+d z*{JVPS4?|4rHDVUTGN)xX13XbZ?_xLs zjq=pJQ7+1DP#!ky&Z0MWTE#VJ!Jg%GE@Oau#e3K@zkV5(amFl&z3j6I$Z7wplPpz> zO~U1gdNRM)Fc?U(@$~HPpD7=^-l#pDwHW*rUiECvVqV={`Bb(*Vr~4}-F4fS)Z#a8 zFN!Fd)k{M7Jm`ns!IknFY@&f%6;DiR_`}+fy+4K>geQx1{J6iRW=Y?PPYUxV6&Uw{ zhMH{L7FOmqnqa5DL!I%U^s1Ant zG~;n5tmL=!%L8&z8W+6IO3w@sDLHcOZ0CKc@Zj)Y5rmwnNZ0;U{+-29C#8{ zXOPPeS2V#3jVO3B0k`D4I7B9+6*1{>26l0^kuLT=o^yh?*UQgwiAUCHYIT_?TAms? zpd=wVIQTqsE;CV(fnq@_!(~A=J@1zQJn!_~DI4l2DOp#4?H2V&*VngpehmvLd`Ao` z;H>ZDeSxavvAqZ^{rtAndP{}}9w?~vWQP4LE%jFl{2Hyz@D7lmCWHH;FrC8O5H7sf zHCES$buFS+^iJ=1$Zhh(yYh6-H3=~(+=YChh<%;ID*q;^$>LnXuE1r|ph;sZDAkKU z^E8H4JZm`^p0aqUN=H3qVD{%}O;n2cX4%tC8=(bHQ7e*9>e-9J#YyaP2VSU%=#ETl zeuXuO5NF8(bR`W73>4U2eXEcxX(p#0y`4)K*J48W#o_ib+>b5K$mDP`nMf=S0H=}` zXZWs{!BjH!iT?>@PVMWN+IEH`-rQQ}TAy9A%yTQ!R=E2juYGur`Y>Dh13BG-43swG zObPK6%L1M9)xTDGCMFmQph2 zqN(ZG@}aDcbF_xOC2;gV|E#-z5<@L`*DXw7CG*Mzwq%btkSuUQa}p7vr-UFarCNRK zpnl$eQRy~pCU`haTpHen(EXu=wj4%{@g}L!E#Za^YnZFLFvH=6iM1>I_=hBLz@{<# zmBvU&a`Y+u2U@edFRE5ir&b{cj>`>XrlJM20^pT9DPw?uv(WkVRJG(Jg)DoO@-BKO z1-`^;M6@QH7JrJmvYI@~?W#p%^8*t#8h<9d<={PJiE`?D56Z$1&u^D?xz*6aE0Qsg z^7^S4HRhUyH55B{NZ(AyXv1{@6Gp$%$oHFGS>OGKX@?bZ-l82tt$ks`6cG)d9$hGS z2gR+Gq|ICYV-M9Ss!7-Zs5Xz1>jeF$N06b#n$?)BFP3CWr_-!mJ<8TwN>WTjj8jgm z4iSin6h}*m&}T-f443u?7q29Q+q}xjtQ5G#F~j=e%yQf;Wm~~nfQsuiS-&eA2eyyK zMzP&QHyo_Q;Mr+jJjQ4J&ZuB(l$6HK9^&73rP_YKw zD2s{eyS0At{d#Y8X$1pA#oXi{Q z&)-fx@DC(w{7|)1J$&DX2~zgOp_XF{*9(bw#Zz9x{Egwmi9HcqOmnMkOUB55zYLh)dS=p}I}uG=TfB&X+sn0gWJ-;ir&v4W~z zM%4p((ieYJ2JZdLBoj@ugO}Y(#GoAE12}Q^?0qYYz)@lghpNCWZ|DTuj~yaq_Ksj6|siP^_#2ApFi1nE5`xiW#&xS@T8&%}G=9 z^L(6IgCM(o*~k^PT>17IbgRrNZ(jUhV4=ddG_IcZLX9q`9-)g&J$IVrsPKa?ubf>N z<9AC{F!%q*Dp=-w=`f@72EyeilCvIo_*IudM*u<3PG}SP2q`^ zuWUSJ0M!C%ALbG8aS^?!=XD*U@=2`=;W8v7x)Zy@6Zn{RU3Lv?a?RWxV|k1 zT`OHhIt&>OPb-x-kx2b$UC(9gcV1Cf;Y6Bvj{=SgH(S|a_rU?x_i(IyM(v@bTgjX7!eTlTnX?tp$CUGT`9z{SiXW62P31USjGkJ7CRybGJ&Nvo`Eo_;8=^^QQ9bOH(cooCF1xXG5?kV(fA)52f89Sd$nR_bohf); z>t5a(6UtAT*Sp?htLn~q&*o%|SjN~d393iRRq8ib@>N{t;pjCwCo#e@gkg-hCFbuA zeSC*^HQaE)4N94b!Pm-M9a+C>!k;JvGJnpsVX8>%2)*o>%hBKy-KqO85^ecR{Jq0M znz7Lc4%OVzj$mc76n>~(ZVvq7s2+w^sj>wop~p}@<^|PKKC^oXvExI!#S&lTBpWI5 z-O1Dk728?Oow|-!95!^V+va}QK0uEyLzdA+g|AA_zH`WMvY)Bjp(TIBLA4A1Zvbv^ zXQ#{#L7JA#5*j{g0qgn4^)+cTq)qX`qX-Oy906GIxr5M|Wtxt>>n1 zATjewYLNA%t0ox@_4^0Xs3zo9y*yiwH4GTr>m*HFkBJVX-F?4~$^K3uK9#Q7dMbZ8 z>nZk0wj?$uJE1bR#}tqXz8n4&Lu;9Y^`&4QSv;!rU8i<=Yf^KQuN#`p4X12px%{8xwjV&?&%lA?38b?@tCb_>!NRwtkZ`}A&tFO>BB z_vap)_g=7@{aJE=T;N4SWxU;umz>$v2z+EhOz<{gjM zZ^nivik4bRNVKtU-kg$=aPY^gr9`{rZf7*tN!Q-X$Czz!q$ zY@EYILN9~Q5;mq3!uma-*Sv0OCMg_Lb9v1kH>iZIV-fYLn!r8t&#noW|GLp-{M^lc zF|UVyI>1s&dN#6C@7oHRdFIj=bD8EPz1YOdOfuh$=<0k8WqhZUo^mY$*=01{@lRQw zd`vvE3J$NpQdOdjZ}TRmWDDTXdCVZP$*~2v%OV38a8UDiSG#Y?ibnTi&lTtiaMp90 zs$K&h^R^CkI|=biLwW)gkQe?L;U#p`SC_S6_5r|^38A+$GW8(?mhsxME-8B6f7?wU#uwMjIO z<-2AI)JoSoqDo74%bz47Afp4rQ00D84l`Ph($x@_(!`M+1eoOcbSqVn&D2r-V5e-p z7?FK`?ajxqdKI}zXQjrq4ZTN67YifUfGVoOmpsNYzAH6LU{3@75)yoLyJuz6c*QZy z#|u;APNF=6VdHXp*2*&CXM2LlrUW%9T}d4HaSA}HY4`G1XCB9@Dsg5XA9Z- zOhq$}sq~e8q%l&dY{&m9433*ReDhja?MbZi)<#CoKfZX4CG+M!;G{B-+}M}oAu0vWkxsh$>_Go9Vn?r6lITL$mL=sj&d6s4P1xNVr< ze$D6naMefX!l0BPevQsdRwov{t%p%L$$pQYH>tpI(KV*Wa^1juO7fB+V;R7q;6q|Y^yM%)z`2KM=W9kv4X=N3r)MVOjK42*lbN>0r zSJAmS1X@7LbB|Pc;DCv_icR{a;22W$aU<$cK-bJok6{Zj>#_WAG<(3UB9Q{?n@82)2g0_-Rx5){qvIZ{e`za?mKl4a)$}`eCGqt zwxNx>DkD01x5zI}Il~QF-~Wg#**jj9Ep%Prs@&Q$UrF-eF+DIuEkDOp6uabjnBR;) zQ}+2r3!jhk%ht!O#Z50}ZzWIMi()!A0#Q%n5aD1!kF$HZ`U35pCzb&xrvSNrOKz@| zpu8X5-?#iziU*6zFV%$#d5C^x9U+$#p)btn?^7;yedBmdBypx%o?>U}^GC`Z+8vHg zvTyx%Rd4nNOX}iL<>rz~^{xiH<5L}lC2Ss;hcx%j7)PTMAGyGjzgLxfG~D5VtMOCq zM0Bl})I1Is)f*whQB@#qOnz!#XyCnTn`$I^ljPQ}s{H0G*vIz8mlGCRYls)~@Ao3i z4^Juw~ z3nB+14*~^&fhd3|f+&F~gQ$S0f~bM0gJ?7g1#5QEHN5B*mcR_ewCB!5SV}SuEFTWs^9pdcj552{S4xIicv;2(N8=hZ_wOg-VduZJ2O6iAS5f`HTdldBjq z(81=w)WLlY`%FHJ`2ClP^uxfBAI<+T5Jb3LgeK8{)DuO}@;`bs!h zVIrR(axB4t|C#Xzq5}UC`8OipA#zeMegB(5S|Vp5avsou|E(ZQR6vr*HHloG$W4jd zipU*_+?|vJ_E{Q& zNP|Cp%boWAEXC43vuA!byy}-mhFNK~HN>CX4D&iuiF#jV(x#d@!T-GX#G#UL=0cZQ zL4|&@;$p{#jkVyQw!I9)gSGo_AG@!lxc&1uIAZJ#k(K^z4sY_eyn?f=m(W%U+7G%!BRa{k)mO?VWinDmry_7mIv_uWK|E{qo~W zzx>wR)-%70^*xR~{ZmH4dyo2Kcm0d0u^?|N5N)3a=!>g~dWetrcWw)z4+BvRg-moG zOevN-6z>JK4X??gu%qATR+*#Dcpjpc%E)on5f5uH39n_;jZz$utXkd+OP|M0Q8Se@ zPpEw1QtyW*>H@U}9$G?qIPG$&Jm!R?v|oIveii0p9&u(j{JZ03tuX?9IYdfm5OR0y zq1~^tERZF}Ao24;%nO~Swd5LW2PVe8CNIjLsS#Y?t#*8rl0G# zeb=9nbHa*p{KyG7Q;Ppwdz-l*%=sEoZ60Xb1?AW6U28ahXD9ik;u(~$|4Uo;r?VO!i} z?du0E&hY#c?3qh8DjpLqx*vK2&oBhhSLtHS&aQZCTT>)H!mn@H)g;~{7#Y*Wmoam9 z=bdCxjBE%6e)ANbCnBV!>&jL?o4i6wy-{_2(6i z^1;rKCHfZWQCm@^d$Kt7RViFP^0FlE&JZQ;#@Ykl!0$$_dsIE+T$aNkSG$cmBN351 zJ28T|)d*STA^TAq(DVeZJ@bA!Jgv1|f!TG6WeinuR=3uzh6K))bgR2aSCW79&?Q{S zAyJk`yefW&^NVF>?q~GE3Nrt0t|E>O&uHxt8|6m95MP;=GdCw%j%|pOIe1_pqdF=C zhE$Q`w#8A3etc{%Qe_|9ya$CKS3YiLc9>l&KBE+rRFt2?w2 zA&XKNnt6l!wdeXgQ5KU6^~RT=>4&sBGQD6_kvh8Xr5QNsm1VVgYRjCjCNa@p5nX1_ zMZcaIs#F4&QzScMhBKspy-D^*uQh54VtGh*RJ?-044`=GCTjM)Tmq^Gd<@p|THZU+ zgU!@hV|nqIUn<@cil+*Dh1^=`mQiy>lG%4XTAEyBiyO#V$GQ9L$#+Q>ZBDI~7Y%w8 zSZAYP`nMh#$Dv2XgloF4L)g$1zFObrKG-x0ytuow5hFMh#8Ca5YBSMt1i2tiO*Ijk zPiVn(4)?X=eGVPF`l^zFjv5VQSkSU}lBwenEL_2X7SByBQcoVXs7ybDGE-?hZTe?H znZ5*!DIU_y%WnL|i>z=^cO8Z{JLEt)G%LTNc?>K%Lwh3!zN(Z=6fAgpxf&OvrQ&zI z2lC-%F~Mn;q|3o|7oDn^B{ZuUc>{vJ3Dk*#*_nmFsxM(GOII-lXAL>@utrMWyU(xh zNaHAQl#1mW-6ri)w6b*7G*ov$wchQc6-PQ8plvDX#9|W^-vI6o_=LL8z$-@ zX_t`v{%j*;`X6oHMs#Uf z>xIQFmZDl)KgrBr+7ZyKdGJ}y^Q&AZ+pqzf;Q`y2w0d$*@5|nd2a_AWTexvl!<>r{ z_rYlkkhfWa5t-;Uw)|&lvz0@wvjz5A7NxQ!PMCc-#`}if)!Rb|NL*%`EnXQd|B1_) z@k?Um7oAnX!H4CQEaUs+N2h4v=LbE!EHTzd)O79AL+pXB%t3l@1T7~SwIexRf}wn7 zBGgJqsy2#r9A(Srgl8nLOpAOOx%+q?=A)eim%Hc5EfMq~Q3JQQnA_0CV0F4;DsHR| zG7`|In^(a9wQG=$uh9Ffa2Ug8Dzta`<;{nE_mN7SicV{@r4n2+k)=(%=Tp@>nOg5F zpe`|gb7XX0)a{1HrVmRqWGhkaQjs_RoQf_JxV{P+J`7^_Hk>iJDZ zw_Z}ZAHj>D_+@WOGZ}hKb+sH*&w!n6rPeTOz-tWh`PCLiw`JGV-ngapJ}D}N>6K#S zo#Ll-anCf`c1#JQaAYgd?T!R3FUMJGjQcqbd~%!OO& zO#MpujZue@)y2H|3zCr`Pyc!JUM6=6f`E!VHPWhlgMKm9d%0~;Z2@TVca%8ZsO3P_ z3~`AIdDvTlXP!806}?HRtJM^H+uxqN<>YK-B7QdI;5KTE=lCMOr|Z?j%MerVv`-Ss zl`{M%%`m)qP*Xr~pezX)F_|*f?qYB-feE&97{t*t>0F@>Bl|rgbUdvB7%oD++h4v`83lRdhjyr}!ZB&$hA*$=jXqoMNSaC;$}!Kq(fL8I zqe);kq|?j=cVR-bip!Wj^2hV0BD0C6ov6sSgDNGi2G1MYc{1)63@;%gQN03O#p>E& zhWT3{yL_0H?yPn+SbS)WJg#$mCj*gWH|8F4m_r9Kc@nBMr&HKkW}^ylc<>T zs&Kpa{DzfTa*-%7sH^LMTG{GWNr6^-vRp2^^ZfwfaTUkRirUP8+;$v!q@?fieN>lB zoSVHX_wAGhbv!3EG>mBlguT|3hErWq8#X{cP)tsCWb_gC#D03hG-sN=F*01aEO$x3 zJ=S~+Y`~i98om(Gxg7D*kGAbcpsRLB6urB)kas-Q4z%z|+0B~;jg3g(b&GB7=~Js( zD_uJAQ?Qs*1+P=d=}O3V2M*N-_E6&rc#WnVT1oa@k6{1SrOr2`rY3$#6GfN#q`+&g z!n*yqwEu=_ysC_DO~sLJ{(w%gJLA~KD^+sYKp{p<;Awfbs$#J3L7jBUmovqf(f`^& zp2Vbbc590SXY6v_H&0T5z!@*}tI?%CXtqi0{fuhpn6o`?<~Q(h4tetKb5HS6mpDyK zeN2ZGP9|bukH;a=ZopPHqnyJ4Vd7N4dj9Kz%LQwF5cph}n(9U+#=v7bD(bsb$;H9n zu*CSG99ZIgD^04qRdpFn($J|YNfQy#!Y$$6akIF^5fFGXv{Q9s31dLQFN|$|Qi1Bc zp*-ULr{4zgT9nhsQL?J;UAU3j>#*`WJUaZ0wk?{XcCN1#>l&Q!wA9^s(Mq@cS|yto z`XxfR1o*z^#p%F#S%r9q0 zqF>G*T*Dbl#k(mcA%2L?$ND8Qx3-~@E^m)jHyd^)f+qJLc4iI>adFr)?e@u)?J?yG zxvejxO!4_q{=Q>+4s7-eCo*!53k*iAJg?^-wYdB~wloP(rz=(BW4NEkwR!wxxz~}} zEl#6uEkOkn?mhbsMf=tD_x3BcL8B+}(Dc@n^f^l0jNXXq+|wB=UcAQ)N~za$e-->a zO0C65w}`yCW>gGvKHq>m$&lMj#Wnk$?N}|HwWcy(>3ZgvP>S8AW{F9^y;yVh`x&gJ zlr2g(48Fc{5i}|-RT`pX^>QM#m6qGg z&uuoEpT;nD>1-&5XE~aw26e5t_7~$U$`-h^gakP3*mkwSgJDKUJR&nWG!bq&oLPA4 zs})r+JqE$5wj>JhG{HYZqWz(xQ5bJ-$E#rpDkseMjP zYe+e3O*79OW|51Q^yh8Ixmq-XSlq*08t2=9`;mdL@N?ESG7cDaPRO%?Wr?--Moh%hJ*4!ib>@I5WDji&#X~B zEWU=4h#4MlL2;xpp7x49K3@pUcvfW$ZhuBF@o{V5c=ADoiz3EpnU7nqV+&I%=RYV{ znzeKIXZZ%0oPMfMa&(d%jaB_vpd~Ge?6qq0yqF*5R@GT7SdnI4GgUFwwM!OZq}i0&fAU+o^Icb^{rEU)TdMe$6uX2t z`ToMsF~6uvR;b*=MSt^0F;It%6cL0iFI&S_=QkrRgiJvkj-tE%;*cSi{?zE`erWmK zE2A3hrg=Qp82N#FF5qIf;r!ddh-UnH##7HN!^Fz`I;7R^kX&~_%;n6I;F6MGJ8=Ro z;op|hjiVPpEkK(dc0-hUn@_I;iyR#rq|nQ)jKu3MlaN9BzFa3qzd_OH=yoXld086c z;IHNDt=vm@@ecw-AGcss;-qWOdU_lhJ#_zBvwm$F?fkOWRuj#?lZf9rS5oifz0{i0 z>Jja%c=yY|bV`ViIWj%B;Io78(+sQFAz8%_Uaa!4xkQdZU}C6(l0RgBTn{?!xW-`b zPHA>6SdYpNaNj8r)hTraV zChYTF86sn8DIEldQO$)9HdcechF@1N2m}domk&*yN(xpuWs20zeRjtAH>aY zpmK6+Y>+GQ=p0^@Hk7$K{h^O$8Ot&)WvzZv@#%SA$}@|19+yZjp4l{~q3@C`x2pY< zqfr@&tiB;~_3s*}ugykfv9fYShH0L}uO12_-B3BU!w4R8T~ z2Y?rV4}c%wB7gvZAiyO6Apl{3%K#z(AOJ9cD1aEi6##Jn2!I5DBmflPDu5J#G=L0% zEPxzqN2 zo-m&fdzh;`Atrnj^YcL>y!@U22E~tq{thsALdf3P0pUSNmN|(dVGjO(b5;J0{nx2B zs|pGj*Be1-WC$cU-i9N+31R^V%)!IM8%D5O1oQTDCj52evxGz+@1UbKuN=uy=?VMRk2JvFk09Fw0haZ*RuN=?1Kk0obMQDCGvO%W^!ji(}+Be$V-U4>ZJZa_;_m|N@ykWP9h&9@^?f&P2@Nt|3Q5cz#7&n Hv