From b741d2998222bf7a3c773f8eae3fd9f5747f4cdb Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Sun, 3 Jan 2021 11:00:42 +0700 Subject: [PATCH] Maybe force FunctionProvider get func "gl4es_" --- .../src/main/java/org/lwjgl/opengl/GL.java | 9 ++++++++- Natives/egl_bridge.c | 2 +- Natives/resources/Frameworks/libGL.dylib | Bin 3985416 -> 3985416 bytes 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/JavaApp/src/main/java/org/lwjgl/opengl/GL.java b/JavaApp/src/main/java/org/lwjgl/opengl/GL.java index 8ed12d1e..fbe7aef0 100644 --- a/JavaApp/src/main/java/org/lwjgl/opengl/GL.java +++ b/JavaApp/src/main/java/org/lwjgl/opengl/GL.java @@ -180,9 +180,16 @@ public final class GL { break; case MACOSX: functionProvider = new SharedLibraryGL(OPENGL) { + private final long gl4es_GetProcAddress = library.getFunctionAddress("gl4es_GetProcAddress"); + @Override long getExtensionAddress(long name) { - return NULL; + return gl4es_GetProcAddress == NULL ? NULL : callPP(name, gl4es_GetProcAddress); + } + + @Override + long getFunctionAddress(String name) { + return super.getFunctionAddress("gl4es_" + name); } }; break; diff --git a/Natives/egl_bridge.c b/Natives/egl_bridge.c index 7573c131..acefb0e0 100644 --- a/Natives/egl_bridge.c +++ b/Natives/egl_bridge.c @@ -64,7 +64,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv* debug("ES2Bridge: making current\n"); jboolean ret = 1; // makeCurrentContext(CURR_GL_CONTEXT); - + void *libGL = dlopen("libGL.dylib", RTLD_GLOBAL); debug("libGL = %p", libGL); diff --git a/Natives/resources/Frameworks/libGL.dylib b/Natives/resources/Frameworks/libGL.dylib index 4e5670fbfaa828c07332947340bf5cd25f112a38..74a931c5e78d1e7d218bb81312432e526fa2bf9a 100644 GIT binary patch delta 1401 zcmW;IeLNF*0LO7M53S{4g{kFnLgry6^Ay=AiiYKI^3=L5(Fr+u9Ab+wRvwaKOHUkz zW|fH+$+P7W&b@Rb*R^U)6pQ;^f4u+v{PF!>s*%cH0=RFK)D`gVUzz<5kUG&gAN#m; z{GvpOAyJYCwg3tMgfCH2gxpoZU>$Aj9kDoutU-}4Yf$PY(GZnV0gVmr;7Ub zTZuekR)Zp&X5G^@eR`MK@;aQd2zB->=86a8?A_^1QC7G|ZIE48$?cSZ(Z>dScTb#m z(TPW+$C$M=L4)7n2lTo88Z9N>aub2T)He*JuKsC$Q!Q|TOK~#$yuf?e=#>7Uc=Eh& z#?I%eXFl))zvxyWZ0J`;(L;3w=PE4FNsLz!Q^&qp+-cnVH090rGM(30a-MJM#>2>N z+_4sWRo&SR#Wc^>o@wJp*!+nIqz}pTMSTv{z8ld>g9%NUI-^(pBQUkjg>ZZVa!ep$ z8WozY4V+tt>J)7$?3m%T{u3gu4E?(PYkPChWAZAVn79ysFhO=msz*!^cxDHZlPmX5 zq6Qe~5&h)ugkf{!VL#!8BXtGcnQ?MaRc@@1EVoQ7)XL=B7`DniUbcrtjYVxPqQX&L z651IwGY;Y1n&vHqRhoFg&``E8xc{T?Z5=kMwju|m#;NVsALi)KS>63nOT|vM#F^6@ zuA|ODsHT-ZcyLON2sOm89jS3Z3t@r9zU!ic1UkmI>aDFB2}!lhvTnO&7g{ChTUv&h zh@2B`H?`&DHaEo+KCE1Q7=$lSQ0BpCPq#x1RARPjXbiahv2oPiXXTN0(yhsI%|R+& ziIPcJ>Kq`fLyj7Ho)77J-*6%ltFG=g=a^x=52yY6eWRIqk1s)P*K-9dN^(9IA6N0P zx>qLS6fx38?j;iHwq<;>w7^(fboE-@FXd_TWg(*GNy0GR|6{!4cxht(g33`Es`^58 z@0twH!p5dLpsv2zfPTtdy0Zu=z>H7S$B?X}RP!nV=#}R(pNak!ZbQ+Exb91N(&T~> z;&bzsvq6?LVt=S98$vux@slM?_<%8g}}M$M;AlXHw&#HtZ;S_Z45 zaNXuz9ISHQC1v*vWw8CY7Oh{MRAQrgxwXyEg+;NPOyOTD6)ocP=N*LbA!_GAwISDu z%L-F=p^@%_&M#?fncR;LZ?r?7S;IV5W#03QQ#waBJ>uW;M(Fvmv z1C4JFd`xG}Qkv?9DT`*ucNi`-XZru7IQ*(ud3^=nxBM-=Lzo$6-LQKBl*E|tp?~fM;BC^w>SEL|WgOceNY6GHqPg?GY zYmoWeC@&78r1L?*>1!O4hP6!&%Ai<}%Uw2y`8|2HEHHI7Liaw?564YgLQ@CLA;xA8 zVv3{v&wO?xl>9cAA3Rrr#YEWYDbronHR*EUAClTgBTE&Z_i}tPS;(Ef}j4o)O3Q;2v-JFfUN)&*apCW?SLwv2B-rX036r>?BqAXHS5W_W56VL**0R*4}>;iTJNMH}33+Ms*fB|3#7y&527}yJ#0H%N$un#Z? m(0~PC30MKv00yuDuz)SFAFu;(fIZ*5)(X delta 1401 zcmW;IeK-?%00(fd^RgLR-kY~=Uba?yF|To6;@CAxLXonjUGBWyPLay4XBfs+3#W3{ zk??eS@zNC1HL+nembWN8iSDHH5_ws6zw3|BpWo;Ee7|`&meuosdy^2O*iT2w$XM6s z_i3B>Crrvg?gE6j08s}t08Kzkv;fi8s?jC6c~Z!pBoCglUR$KBhjfN>ewhfG+LT19 z-NTLrD#+(g`sUW!n+Mcp^u;6m#&B+NX_HY1T&Y27eBB#L zQ?g_yV!+@ECTdrc0)ykE{P+@4Kh=V+&GFm$Wlk=~@lWUCo0O#`;V6DGNBci@@QMdYBMuwecYsZeLZl z9Mw%FD&Gb(3$`fZkNtD2e3}2I&l5IGTUlmXkH?Y;r5{Jy<>9X%qU5NKer2};MHEa9 z9;&!SbCoXH^*RSzFP1OscZU^|Dg<~8IS%D(`TeEo$T*|P!l%8otxqt=%P09^YAJj7!Gv#}^l%P#Qm#`SC9ly*veujMf4bjm z6E0J@T~irS4NaxD&o=~=S~IA$WjmSkNjRS*Ho?BkqRKBZV8)IfGO=;DMTl+Td~JxC zwmjqGf*wO#=xj*|k z8^;k$WC+JLl>P!|;%<+d#gm!Pk0A6`&#C>9epDjlaEvdSrTD`^V=^_ZWkE|S#LzD* zyVl3MW*z5EVuuLB9XsBI7P~#K={m|<^t~YPKHORUs^#MG2xxkaaIh$0CUcybjT20` z3&+-!*t0w4C^HmGS*BHciO6EPFG9-kJJ3%t#vpSI@&kWEjtjCRh{1jRE6?xFk-;Q={pam{bl?vd`SCAgyer zbLn$Rfv~5d_DDmz9m{?JDbvJbq2-q)-L6$}gNJ{@=8W7WX{`@^nAKj_TQ_;Cu_%eG zA5`{KHgMUsbi7MrT)@V_(3A4YZ7lgs-K%?ovu@;6A7kV#)mP32u3IoXtRd@};`z#Z zHD~PoWEwM&x)Ze3Z~P8E*#28YQ4l^~jlbbe`ZNkU)}q@Lq26=MM-y+9nRJ`4lQq?d z0T)_3=7?lyzvTUal9X?7ypUe+