142498 2015-03-09 11:08:06 -0700 [GTK] Add a configure option to build with OpenGL ES 2 2015-03-10 06:20:11 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned commit-queue jdapena mrobinson zan oldest_to_newest 1075664 0 cgarcia 2015-03-09 11:08:06 -0700 It's not currently possible, I guess it's another regression of the CMake switch, or that we never supported it. 1075665 1 mrobinson 2015-03-09 11:13:53 -0700 OpenGLES2 should probably force EGL as well. GLX + OpenGLES doesn't really make sense, as far as I know. 1075666 2 248261 cgarcia 2015-03-09 11:14:02 -0700 Created attachment 248261 Patch 1075667 3 commit-queue 2015-03-09 11:16:58 -0700 Attachment 248261 did not pass style-queue: ERROR: Source/cmake/OptionsGTK.cmake:72: One space between command "endif" and its parentheses, should be "endif (" [whitespace/parentheses] [5] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1075668 4 248261 mrobinson 2015-03-09 11:18:12 -0700 Comment on attachment 248261 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248261&action=review Looks okay to me, but we should probably not allow combining GLX + OpenGLES. > Source/cmake/OptionsGTK.cmake:69 > + find_package(GLES REQUIRED) Unrelated to this patch, but FindGLES is poorly named. There exists a historical OpenGLES which is different than OpenGLES2. 1075669 5 cgarcia 2015-03-09 11:19:44 -0700 (In reply to comment #4) > Comment on attachment 248261 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=248261&action=review > > Looks okay to me, but we should probably not allow combining GLX + OpenGLES. It's not possible, I think GLX is searched in find_package(OpenGL), that is only called when OpenGLES is didabled. > > Source/cmake/OptionsGTK.cmake:69 > > + find_package(GLES REQUIRED) > > Unrelated to this patch, but FindGLES is poorly named. There exists a > historical OpenGLES which is different than OpenGLES2. Did't even know it :-) 1075670 6 mrobinson 2015-03-09 11:22:42 -0700 (In reply to comment #5) > It's not possible, I think GLX is searched in find_package(OpenGL), that is > only called when OpenGLES is didabled. It looks like EGL is always detected and GLX is detected when building for X11. The checks shouldn't succeed if EGL isn't found, but OpenGLES2 is enabled. 1075672 7 248262 cgarcia 2015-03-09 11:28:28 -0700 Created attachment 248262 Updated patch Use the FindOpenGLES2.cmake one, which is indeed much better because it tries with pkg-config first 1075673 8 cgarcia 2015-03-09 11:29:38 -0700 (In reply to comment #6) > (In reply to comment #5) > > > It's not possible, I think GLX is searched in find_package(OpenGL), that is > > only called when OpenGLES is didabled. > > It looks like EGL is always detected and GLX is detected when building for > X11. The checks shouldn't succeed if EGL isn't found, but OpenGLES2 is > enabled. Oh, good point, we need EGL when using OpenGLES2 1075675 9 248263 cgarcia 2015-03-09 11:32:45 -0700 Created attachment 248263 Updated patch Fail if EGL not found when using GLES2 1075676 10 mrobinson 2015-03-09 11:35:19 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=248262&action=review > Source/cmake/OptionsGTK.cmake:94 > + # FIXME: Should we search for cairo-glesv2 instead of cairo-gl in this case? Yeah, this FIXME looks to have the correct suggestion. We probably need to pass an argument to FindCairoGL. > Source/cmake/OptionsGTK.cmake:329 > +if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND)) I think the OPENGES2 + GLX combination is still bogus. :) One easy way to fix it is to error out early if EGL isn't found. 1075677 11 cgarcia 2015-03-09 11:37:57 -0700 (In reply to comment #10) > View in context: > https://bugs.webkit.org/attachment.cgi?id=248262&action=review > > > Source/cmake/OptionsGTK.cmake:94 > > + # FIXME: Should we search for cairo-glesv2 instead of cairo-gl in this case? > > Yeah, this FIXME looks to have the correct suggestion. We probably need to > pass an argument to FindCairoGL. > > > Source/cmake/OptionsGTK.cmake:329 > > +if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND)) > > I think the OPENGES2 + GLX combination is still bogus. :) Yes, it is, but it simply can't happen if I understood correctly how cmake works. GLX_FOUND is set by find_package(OpenGL), that is only called when OPENGLES2 option is not present, so it's not possible to have both. > One easy way to > fix it is to error out early if EGL isn't found. That's what the patch does. 1075679 12 cgarcia 2015-03-09 11:42:54 -0700 (In reply to comment #11) > (In reply to comment #10) > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=248262&action=review > > > > > Source/cmake/OptionsGTK.cmake:94 > > > + # FIXME: Should we search for cairo-glesv2 instead of cairo-gl in this case? > > > > Yeah, this FIXME looks to have the correct suggestion. We probably need to > > pass an argument to FindCairoGL. > > > > > Source/cmake/OptionsGTK.cmake:329 > > > +if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND)) > > > > I think the OPENGES2 + GLX combination is still bogus. :) > > Yes, it is, but it simply can't happen if I understood correctly how cmake > works. GLX_FOUND is set by find_package(OpenGL), that is only called when > OPENGLES2 option is not present, so it's not possible to have both. > check_include_files is the thing searching for GLX? and setting GLX_FOUND? is that the case, I'm indeed wrong. 1075682 13 mrobinson 2015-03-09 11:46:20 -0700 (In reply to comment #12) > check_include_files is the thing searching for GLX? and setting GLX_FOUND? > is that the case, I'm indeed wrong. That was my understanding, but I may be mistaken. 1075683 14 248265 cgarcia 2015-03-09 11:47:56 -0700 Created attachment 248265 Updated patch I was wrong 1075688 15 248265 mrobinson 2015-03-09 11:55:16 -0700 Comment on attachment 248265 Updated patch The day that we don't have to worry about GLX and Desktop GL cannot come soon enough. 1075951 16 cgarcia 2015-03-10 06:20:11 -0700 Committed r181321: <http://trac.webkit.org/changeset/181321> 248261 2015-03-09 11:14:02 -0700 2015-03-09 11:28:28 -0700 Patch wk-gles2.diff text/plain 6594 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBjMzY0ODE0Li5kMzgzZjEz IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTUtMDMtMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPiBh bmQgSm9zw6kgRGFwZW5hIFBheiAgPGpkYXBlbmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RL XSBBZGQgYSBjb25maWd1cmUgb3B0aW9uIHRvIGJ1aWxkIHdpdGggT3BlbkdMIEVTIDIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjQ5OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBFTkFCTEVfR0xF UzIgb3B0aW9uLiBJdCdzIGRpc2FibGVkIGJ5IGRlZmF1bHQsIGJ1dCBpZiBwYXNzZWQKKyAgICAg ICAgR0xFUzIgaXMgcmVxdWlyZWQgYW5kIE9wZW5HTCBpcyBub3QgZXZlbiBzZWFyY2hlZC4gT3Ro ZXJ3aXNlIHdlCisgICAgICAgIHNlYXJjaCBmb3IgT3BlbkdMIGFzIHVzdWFsLCB1c2luZyBpdCBv bmx5IGlmIHByZXNlbnQuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFr ZToKKwogMjAxNS0wMy0wMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAg ICAgICAgQ29udmVydCBNYW51YWxUZXN0cy9zdmctdG9vbHRpcC5zdmcgdG8gYSBEUlQgdGVzdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDI3NTMwNGEuLmFlNTQzMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAxNS0wMy0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ IGFuZCBKb3PDqSBEYXBlbmEgUGF6ICA8amRhcGVuYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIEFkZCBhIGNvbmZpZ3VyZSBvcHRpb24gdG8gYnVpbGQgd2l0aCBPcGVuR0wgRVMgMgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNDk4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVpbGQgR0xFUyBv ciBHTCBzcGVjaWZpYyBmaWxlcyBkZXBlbmRpbmcgb24gdGhlIGJ1aWxkIG9wdGlvbnMuCisKKyAg ICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToKKwogMjAxNS0wMy0wOSAgWGFiaWVyIFJvZHJpZ3Vl eiBDYWx2YXIgPGNhbHZhcmlzQGlnYWxpYS5jb20+IGFuZCBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u LmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgUmVhZGFibGVTdHJlYW1KU1NvdXJjZSBz aG91bGQgdXNlIEpTQzo6U3Ryb25nIFVuc3BlY2lmaWVkQm9vbFR5cGUgb3BlcmF0b3IKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYkNvcmUv UGxhdGZvcm1HVEsuY21ha2UKaW5kZXggODRiMmZhNC4uODQ4OWQ5ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYkNvcmUvUGxhdGZv cm1HVEsuY21ha2UKQEAgLTY1LDcgKzY1LDYgQEAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VT CiAKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwCiAg ICAgcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuY3BwCi0gICAgcGxhdGZvcm0vZ3JhcGhp Y3MvT3BlbkdMU2hpbXMuY3BwCiAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvV09GRkZpbGVGb3JtYXQu Y3BwCiAKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9CYWNraW5nU3RvcmVCYWNrZW5kQ2Fp cm9JbXBsLmNwcApAQCAtMTE2LDEwICsxMTUsNyBAQCBsaXN0KEFQUEVORCBXZWJDb3JlX1NPVVJD RVMKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5jcHAK ICAgICBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHAKIAotICAg IHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0wuY3BwCiAgICAgcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKLSAgICBw bGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMRVMuY3BwCi0gICAgcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMLmNwcAogICAgIHBs YXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAK ICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGVtcG9yYXJ5T3BlbkdMU2V0dGluZy5jcHAK IApAQCAtNDA1LDYgKzQwMSwyMiBAQCBpZiAoV1RGX1VTRV9FR0wpCiAgICAgKQogZW5kaWYgKCkK IAoraWYgKFdURl9VU0VfT1BFTkdMX0VTXzIpCisgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VS Q0VTCisgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xF Uy5jcHAKKyAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNE T3BlbkdMRVMuY3BwCisgICAgKQorZW5kaWYgKCkKKworaWYgKFdURl9VU0VfT1BFTkdMKQorICAg IGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUworICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9P cGVuR0xTaGltcy5jcHAKKworICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5z aW9uczNET3BlbkdMLmNwcAorICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhp Y3NDb250ZXh0M0RPcGVuR0wuY3BwCisgICAgKQorZW5kaWYgKCkKKwogaWYgKEVOQUJMRV9QTFVH SU5fUFJPQ0VTU19HVEsyKQogICAgICMgV2ViS2l0UGx1Z2luUHJvY2VzczIgbmVlZHMgYSB2ZXJz aW9uIG9mIFdlYkNvcmUgY29tcGlsZWQgYWdhaW5zdCBHVEsrMiwgc28gd2UndmUgaXNvbGF0ZWQg YWxsIHRoZSBHVEsrCiAgICAgIyBkZXBlbmRlbnQgZmlsZXMgaW50byBhIHNlcGFyYXRlIGxpYnJh cnkgd2hpY2ggY2FuIGJlIHVzZWQgdG8gY29uc3RydWN0IGEgR1RLKzIgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9u c0dUSy5jbWFrZQppbmRleCA0ZDlhZmU4Li42YzEwNDVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21h a2UvT3B0aW9uc0dUSy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpA QCAtMTYsNiArMTYsNyBAQCBzZXQoRU5BQkxFX0dUS0RPQyBPRkYgQ0FDSEUgQk9PTCAiV2hldGhl ciBvciBub3QgdG8gdXNlIGdlbmVyYXRlIGd0a2RvYy4iKQogc2V0KEVOQUJMRV9YMTFfVEFSR0VU IE9OIENBQ0hFIEJPT0wgIldoZXRoZXIgdG8gZW5hYmxlIHN1cHBvcnQgZm9yIHRoZSBYMTEgd2lu ZG93aW5nIHRhcmdldC4iKQogc2V0KEVOQUJMRV9XQVlMQU5EX1RBUkdFVCBPRkYgQ0FDSEUgQk9P TCAiV2hldGhlciB0byBlbmFibGUgc3VwcG9ydCBmb3IgdGhlIFdheWxhbmQgd2luZG93aW5nIHRh cmdldC4iKQogc2V0KEVOQUJMRV9JTlRST1NQRUNUSU9OIE9OIENBQ0hFIEJPT0wgIldoZXRoZXIg dG8gZW5hYmxlIEdPYmplY3QgaW50cm9zcGVjdGlvbi4iKQorc2V0KEVOQUJMRV9HTEVTMiBPRkYg Q0FDSEUgQk9PTCAiV2hldGhlciB0byBlbmFibGUgT3BlbkdMIEVTIDIuMC4iKQogCiAjIFRoZXNl IGFyZSBzaGFyZWQgdmFyaWFibGVzLCBidXQgd2Ugc3BlY2lhbCBjYXNlIHRoZWlyIGRlZmluaXRp b24gc28gdGhhdCB3ZSBjYW4gdXNlIHRoZQogIyBDTUFLRV9JTlNUQUxMXyogdmFyaWFibGVzIHRo YXQgYXJlIHBvcHVsYXRlZCBieSB0aGUgR05VSW5zdGFsbERpcnMgbWFjcm8uCkBAIC00Niw3ICs0 Nyw2IEBAIGZpbmRfcGFja2FnZShBVEsgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoV2ViUCBSRVFV SVJFRCkKIGZpbmRfcGFja2FnZShBVFNQSSAyLjUuMykKIGZpbmRfcGFja2FnZShHT2JqZWN0SW50 cm9zcGVjdGlvbikKLWZpbmRfcGFja2FnZShPcGVuR0wpCiBmaW5kX3BhY2thZ2UoRUdMKQogZmlu ZF9wYWNrYWdlKEdlb0NsdWUyIDIuMS41KQogZmluZF9wYWNrYWdlKEdudVRMUyAzLjAuMCkKQEAg LTY1LDIyICs2NSwzMyBAQCBpZiAoRU5BQkxFX1gxMV9UQVJHRVQpCiAgICAgY2hlY2tfaW5jbHVk ZV9maWxlcygiR0wvZ2x4LmgiIEdMWF9GT1VORCkKIGVuZGlmICgpCiAKK2lmIChFTkFCTEVfR0xF UzIpCisgICAgZmluZF9wYWNrYWdlKEdMRVMgUkVRVUlSRUQpCitlbHNlICgpCisgICAgZmluZF9w YWNrYWdlKE9wZW5HTCkKK2VuZGlmKCkKKwogV0VCS0lUX09QVElPTl9CRUdJTigpCiBXRUJLSVRf T1BUSU9OX0RFRklORShFTkFCTEVfUExVR0lOX1BST0NFU1NfR1RLMiAiV2hldGhlciB0byBidWls ZCBXZWJLaXRQbHVnaW5Qcm9jZXNzMiB0byBsb2FkIEdUSzIgYmFzZWQgcGx1Z2lucy4iIE9OKQog Ci1pZiAoT1BFTkdMX0ZPVU5EIEFORCAoR0xYX0ZPVU5EIE9SIEVHTF9GT1VORCkpCitpZiAoKE9Q RU5HTF9GT1VORCBPUiBPUEVOR0xFUzJfRk9VTkQpIEFORCAoR0xYX0ZPVU5EIE9SIEVHTF9GT1VO RCkpCiAgICAgV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX1dFQkdMIE9O KQogCi0gICAgaWYgKEdMWF9GT1VORCkKLSAgICAgICAgbGlzdChBUFBFTkQgQ0FJUk9fR0xfQ09N UE9ORU5UUyBjYWlyby1nbHgpCi0gICAgZW5kaWYgKCkKLSAgICBpZiAoRUdMX0ZPVU5EKQotICAg ICAgICBsaXN0KEFQUEVORCBDQUlST19HTF9DT01QT05FTlRTIGNhaXJvLWVnbCkKLSAgICBlbmRp ZiAoKQotICAgIGZpbmRfcGFja2FnZShDYWlyb0dMIDEuMTAuMiBDT01QT05FTlRTICR7Q0FJUk9f R0xfQ09NUE9ORU5UU30pCi0gICAgaWYgKENBSVJPX0dMX0ZPVU5EKQotICAgICAgICBXRUJLSVRf T1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTIE9O KQorICAgIGlmIChPUEVOR0xfRk9VTkQpCisgICAgICAgIGlmIChHTFhfRk9VTkQpCisgICAgICAg ICAgICBsaXN0KEFQUEVORCBDQUlST19HTF9DT01QT05FTlRTIGNhaXJvLWdseCkKKyAgICAgICAg ZW5kaWYgKCkKKyAgICAgICAgaWYgKEVHTF9GT1VORCkKKyAgICAgICAgICAgIGxpc3QoQVBQRU5E IENBSVJPX0dMX0NPTVBPTkVOVFMgY2Fpcm8tZWdsKQorICAgICAgICBlbmRpZiAoKQorICAgICAg ICBmaW5kX3BhY2thZ2UoQ2Fpcm9HTCAxLjEwLjIgQ09NUE9ORU5UUyAke0NBSVJPX0dMX0NPTVBP TkVOVFN9KQorICAgICAgICBpZiAoQ0FJUk9fR0xfRk9VTkQpCisgICAgICAgICAgICBXRUJLSVRf T1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTIE9O KQorICAgICAgICBlbHNlICgpCisgICAgICAgICAgICBXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9S VF9WQUxVRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTIE9GRikKKyAgICAgICAgZW5kaWYg KCkKICAgICBlbHNlICgpCisgICAgICAgICMgRklYTUU6IFNob3VsZCB3ZSBzZWFyY2ggZm9yIGNh aXJvLWdsZXN2MiBpbnN0ZWFkIG9mIGNhaXJvLWdsIGluIHRoaXMgY2FzZT8KICAgICAgICAgV0VC S0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZB UyBPRkYpCiAgICAgZW5kaWYgKCkKIGVsc2UgKCkKQEAgLTMxNSwxNiArMzI2LDIzIEBAIGlmIChF TkFCTEVfU1BFTExDSEVDSykKICAgICBmaW5kX3BhY2thZ2UoRW5jaGFudCBSRVFVSVJFRCkKIGVu ZGlmICgpCiAKLWlmIChPUEVOR0xfRk9VTkQgQU5EIChHTFhfRk9VTkQgT1IgRUdMX0ZPVU5EKSkK K2lmICgoT1BFTkdMX0ZPVU5EIE9SIE9QRU5HTEVTMl9GT1VORCkgQU5EIChHTFhfRk9VTkQgT1Ig RUdMX0ZPVU5EKSkKICAgICBzZXQoRU5BQkxFX1RFWFRVUkVfTUFQUEVSIDEpCiAgICAgc2V0KFdU Rl9VU0VfM0RfR1JBUEhJQ1MgMSkKIAotICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0VfT1BF TkdMPTEpCiAgICAgYWRkX2RlZmluaXRpb25zKC1EV1RGX1VTRV8zRF9HUkFQSElDUz0xKQogICAg IGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0VfVEVYVFVSRV9NQVBQRVI9MSkKICAgICBhZGRfZGVm aW5pdGlvbnMoLURXVEZfVVNFX1RFWFRVUkVfTUFQUEVSX0dMPTEpCiAgICAgYWRkX2RlZmluaXRp b25zKC1ERU5BQkxFXzNEX1JFTkRFUklORz0xKQogCisgICAgaWYgKE9QRU5HTEVTMl9GT1VORCkK KyAgICAgICAgc2V0KFdURl9VU0VfT1BFTkdMX0VTXzIgMSkKKyAgICAgICAgYWRkX2RlZmluaXRp b25zKC1EV1RGX1VTRV9PUEVOR0xfRVNfMj0xKQorICAgIGVsc2UgKCkKKyAgICAgICAgc2V0KFdU Rl9VU0VfT1BFTkdMIDEpCisgICAgICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0VfT1BFTkdM PTEpCisgICAgZW5kaWYgKCkKKwogICAgIGlmIChFR0xfRk9VTkQpCiAgICAgICAgIGFkZF9kZWZp bml0aW9ucygtRFdURl9VU0VfRUdMPTEpCiAgICAgZW5kaWYgKCkK 248262 2015-03-09 11:28:28 -0700 2015-03-09 11:32:45 -0700 Updated patch wk-gles2.diff text/plain 6600 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBjMzY0ODE0Li5kMzgzZjEz IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTUtMDMtMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPiBh bmQgSm9zw6kgRGFwZW5hIFBheiAgPGpkYXBlbmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RL XSBBZGQgYSBjb25maWd1cmUgb3B0aW9uIHRvIGJ1aWxkIHdpdGggT3BlbkdMIEVTIDIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjQ5OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBFTkFCTEVfR0xF UzIgb3B0aW9uLiBJdCdzIGRpc2FibGVkIGJ5IGRlZmF1bHQsIGJ1dCBpZiBwYXNzZWQKKyAgICAg ICAgR0xFUzIgaXMgcmVxdWlyZWQgYW5kIE9wZW5HTCBpcyBub3QgZXZlbiBzZWFyY2hlZC4gT3Ro ZXJ3aXNlIHdlCisgICAgICAgIHNlYXJjaCBmb3IgT3BlbkdMIGFzIHVzdWFsLCB1c2luZyBpdCBv bmx5IGlmIHByZXNlbnQuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFr ZToKKwogMjAxNS0wMy0wMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAg ICAgICAgQ29udmVydCBNYW51YWxUZXN0cy9zdmctdG9vbHRpcC5zdmcgdG8gYSBEUlQgdGVzdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDI3NTMwNGEuLmFlNTQzMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAxNS0wMy0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ IGFuZCBKb3PDqSBEYXBlbmEgUGF6ICA8amRhcGVuYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIEFkZCBhIGNvbmZpZ3VyZSBvcHRpb24gdG8gYnVpbGQgd2l0aCBPcGVuR0wgRVMgMgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNDk4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVpbGQgR0xFUyBv ciBHTCBzcGVjaWZpYyBmaWxlcyBkZXBlbmRpbmcgb24gdGhlIGJ1aWxkIG9wdGlvbnMuCisKKyAg ICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToKKwogMjAxNS0wMy0wOSAgWGFiaWVyIFJvZHJpZ3Vl eiBDYWx2YXIgPGNhbHZhcmlzQGlnYWxpYS5jb20+IGFuZCBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u LmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgUmVhZGFibGVTdHJlYW1KU1NvdXJjZSBz aG91bGQgdXNlIEpTQzo6U3Ryb25nIFVuc3BlY2lmaWVkQm9vbFR5cGUgb3BlcmF0b3IKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYkNvcmUv UGxhdGZvcm1HVEsuY21ha2UKaW5kZXggODRiMmZhNC4uODQ4OWQ5ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYkNvcmUvUGxhdGZv cm1HVEsuY21ha2UKQEAgLTY1LDcgKzY1LDYgQEAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VT CiAKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwCiAg ICAgcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuY3BwCi0gICAgcGxhdGZvcm0vZ3JhcGhp Y3MvT3BlbkdMU2hpbXMuY3BwCiAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvV09GRkZpbGVGb3JtYXQu Y3BwCiAKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9CYWNraW5nU3RvcmVCYWNrZW5kQ2Fp cm9JbXBsLmNwcApAQCAtMTE2LDEwICsxMTUsNyBAQCBsaXN0KEFQUEVORCBXZWJDb3JlX1NPVVJD RVMKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5jcHAK ICAgICBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHAKIAotICAg IHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0wuY3BwCiAgICAgcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKLSAgICBw bGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMRVMuY3BwCi0gICAgcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMLmNwcAogICAgIHBs YXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAK ICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGVtcG9yYXJ5T3BlbkdMU2V0dGluZy5jcHAK IApAQCAtNDA1LDYgKzQwMSwyMiBAQCBpZiAoV1RGX1VTRV9FR0wpCiAgICAgKQogZW5kaWYgKCkK IAoraWYgKFdURl9VU0VfT1BFTkdMX0VTXzIpCisgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VS Q0VTCisgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xF Uy5jcHAKKyAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNE T3BlbkdMRVMuY3BwCisgICAgKQorZW5kaWYgKCkKKworaWYgKFdURl9VU0VfT1BFTkdMKQorICAg IGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUworICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9P cGVuR0xTaGltcy5jcHAKKworICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5z aW9uczNET3BlbkdMLmNwcAorICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhp Y3NDb250ZXh0M0RPcGVuR0wuY3BwCisgICAgKQorZW5kaWYgKCkKKwogaWYgKEVOQUJMRV9QTFVH SU5fUFJPQ0VTU19HVEsyKQogICAgICMgV2ViS2l0UGx1Z2luUHJvY2VzczIgbmVlZHMgYSB2ZXJz aW9uIG9mIFdlYkNvcmUgY29tcGlsZWQgYWdhaW5zdCBHVEsrMiwgc28gd2UndmUgaXNvbGF0ZWQg YWxsIHRoZSBHVEsrCiAgICAgIyBkZXBlbmRlbnQgZmlsZXMgaW50byBhIHNlcGFyYXRlIGxpYnJh cnkgd2hpY2ggY2FuIGJlIHVzZWQgdG8gY29uc3RydWN0IGEgR1RLKzIgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9u c0dUSy5jbWFrZQppbmRleCA0ZDlhZmU4Li42YTRhYWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21h a2UvT3B0aW9uc0dUSy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpA QCAtMTYsNiArMTYsNyBAQCBzZXQoRU5BQkxFX0dUS0RPQyBPRkYgQ0FDSEUgQk9PTCAiV2hldGhl ciBvciBub3QgdG8gdXNlIGdlbmVyYXRlIGd0a2RvYy4iKQogc2V0KEVOQUJMRV9YMTFfVEFSR0VU IE9OIENBQ0hFIEJPT0wgIldoZXRoZXIgdG8gZW5hYmxlIHN1cHBvcnQgZm9yIHRoZSBYMTEgd2lu ZG93aW5nIHRhcmdldC4iKQogc2V0KEVOQUJMRV9XQVlMQU5EX1RBUkdFVCBPRkYgQ0FDSEUgQk9P TCAiV2hldGhlciB0byBlbmFibGUgc3VwcG9ydCBmb3IgdGhlIFdheWxhbmQgd2luZG93aW5nIHRh cmdldC4iKQogc2V0KEVOQUJMRV9JTlRST1NQRUNUSU9OIE9OIENBQ0hFIEJPT0wgIldoZXRoZXIg dG8gZW5hYmxlIEdPYmplY3QgaW50cm9zcGVjdGlvbi4iKQorc2V0KEVOQUJMRV9HTEVTMiBPRkYg Q0FDSEUgQk9PTCAiV2hldGhlciB0byBlbmFibGUgT3BlbkdMIEVTIDIuMC4iKQogCiAjIFRoZXNl IGFyZSBzaGFyZWQgdmFyaWFibGVzLCBidXQgd2Ugc3BlY2lhbCBjYXNlIHRoZWlyIGRlZmluaXRp b24gc28gdGhhdCB3ZSBjYW4gdXNlIHRoZQogIyBDTUFLRV9JTlNUQUxMXyogdmFyaWFibGVzIHRo YXQgYXJlIHBvcHVsYXRlZCBieSB0aGUgR05VSW5zdGFsbERpcnMgbWFjcm8uCkBAIC00Niw3ICs0 Nyw2IEBAIGZpbmRfcGFja2FnZShBVEsgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoV2ViUCBSRVFV SVJFRCkKIGZpbmRfcGFja2FnZShBVFNQSSAyLjUuMykKIGZpbmRfcGFja2FnZShHT2JqZWN0SW50 cm9zcGVjdGlvbikKLWZpbmRfcGFja2FnZShPcGVuR0wpCiBmaW5kX3BhY2thZ2UoRUdMKQogZmlu ZF9wYWNrYWdlKEdlb0NsdWUyIDIuMS41KQogZmluZF9wYWNrYWdlKEdudVRMUyAzLjAuMCkKQEAg LTY1LDIyICs2NSwzMyBAQCBpZiAoRU5BQkxFX1gxMV9UQVJHRVQpCiAgICAgY2hlY2tfaW5jbHVk ZV9maWxlcygiR0wvZ2x4LmgiIEdMWF9GT1VORCkKIGVuZGlmICgpCiAKK2lmIChFTkFCTEVfR0xF UzIpCisgICAgZmluZF9wYWNrYWdlKE9wZW5HTEVTMiBSRVFVSVJFRCkKK2Vsc2UgKCkKKyAgICBm aW5kX3BhY2thZ2UoT3BlbkdMKQorZW5kaWYgKCkKKwogV0VCS0lUX09QVElPTl9CRUdJTigpCiBX RUJLSVRfT1BUSU9OX0RFRklORShFTkFCTEVfUExVR0lOX1BST0NFU1NfR1RLMiAiV2hldGhlciB0 byBidWlsZCBXZWJLaXRQbHVnaW5Qcm9jZXNzMiB0byBsb2FkIEdUSzIgYmFzZWQgcGx1Z2lucy4i IE9OKQogCi1pZiAoT1BFTkdMX0ZPVU5EIEFORCAoR0xYX0ZPVU5EIE9SIEVHTF9GT1VORCkpCitp ZiAoKE9QRU5HTF9GT1VORCBPUiBPUEVOR0xFUzJfRk9VTkQpIEFORCAoR0xYX0ZPVU5EIE9SIEVH TF9GT1VORCkpCiAgICAgV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX1dF QkdMIE9OKQogCi0gICAgaWYgKEdMWF9GT1VORCkKLSAgICAgICAgbGlzdChBUFBFTkQgQ0FJUk9f R0xfQ09NUE9ORU5UUyBjYWlyby1nbHgpCi0gICAgZW5kaWYgKCkKLSAgICBpZiAoRUdMX0ZPVU5E KQotICAgICAgICBsaXN0KEFQUEVORCBDQUlST19HTF9DT01QT05FTlRTIGNhaXJvLWVnbCkKLSAg ICBlbmRpZiAoKQotICAgIGZpbmRfcGFja2FnZShDYWlyb0dMIDEuMTAuMiBDT01QT05FTlRTICR7 Q0FJUk9fR0xfQ09NUE9ORU5UU30pCi0gICAgaWYgKENBSVJPX0dMX0ZPVU5EKQotICAgICAgICBX RUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FO VkFTIE9OKQorICAgIGlmIChPUEVOR0xfRk9VTkQpCisgICAgICAgIGlmIChHTFhfRk9VTkQpCisg ICAgICAgICAgICBsaXN0KEFQUEVORCBDQUlST19HTF9DT01QT05FTlRTIGNhaXJvLWdseCkKKyAg ICAgICAgZW5kaWYgKCkKKyAgICAgICAgaWYgKEVHTF9GT1VORCkKKyAgICAgICAgICAgIGxpc3Qo QVBQRU5EIENBSVJPX0dMX0NPTVBPTkVOVFMgY2Fpcm8tZWdsKQorICAgICAgICBlbmRpZiAoKQor ICAgICAgICBmaW5kX3BhY2thZ2UoQ2Fpcm9HTCAxLjEwLjIgQ09NUE9ORU5UUyAke0NBSVJPX0dM X0NPTVBPTkVOVFN9KQorICAgICAgICBpZiAoQ0FJUk9fR0xfRk9VTkQpCisgICAgICAgICAgICBX RUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FO VkFTIE9OKQorICAgICAgICBlbHNlICgpCisgICAgICAgICAgICBXRUJLSVRfT1BUSU9OX0RFRkFV TFRfUE9SVF9WQUxVRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTIE9GRikKKyAgICAgICAg ZW5kaWYgKCkKICAgICBlbHNlICgpCisgICAgICAgICMgRklYTUU6IFNob3VsZCB3ZSBzZWFyY2gg Zm9yIGNhaXJvLWdsZXN2MiBpbnN0ZWFkIG9mIGNhaXJvLWdsIGluIHRoaXMgY2FzZT8KICAgICAg ICAgV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0FDQ0VMRVJBVEVEXzJE X0NBTlZBUyBPRkYpCiAgICAgZW5kaWYgKCkKIGVsc2UgKCkKQEAgLTMxNSwxNiArMzI2LDIzIEBA IGlmIChFTkFCTEVfU1BFTExDSEVDSykKICAgICBmaW5kX3BhY2thZ2UoRW5jaGFudCBSRVFVSVJF RCkKIGVuZGlmICgpCiAKLWlmIChPUEVOR0xfRk9VTkQgQU5EIChHTFhfRk9VTkQgT1IgRUdMX0ZP VU5EKSkKK2lmICgoT1BFTkdMX0ZPVU5EIE9SIE9QRU5HTEVTMl9GT1VORCkgQU5EIChHTFhfRk9V TkQgT1IgRUdMX0ZPVU5EKSkKICAgICBzZXQoRU5BQkxFX1RFWFRVUkVfTUFQUEVSIDEpCiAgICAg c2V0KFdURl9VU0VfM0RfR1JBUEhJQ1MgMSkKIAotICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9V U0VfT1BFTkdMPTEpCiAgICAgYWRkX2RlZmluaXRpb25zKC1EV1RGX1VTRV8zRF9HUkFQSElDUz0x KQogICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0VfVEVYVFVSRV9NQVBQRVI9MSkKICAgICBh ZGRfZGVmaW5pdGlvbnMoLURXVEZfVVNFX1RFWFRVUkVfTUFQUEVSX0dMPTEpCiAgICAgYWRkX2Rl ZmluaXRpb25zKC1ERU5BQkxFXzNEX1JFTkRFUklORz0xKQogCisgICAgaWYgKE9QRU5HTEVTMl9G T1VORCkKKyAgICAgICAgc2V0KFdURl9VU0VfT1BFTkdMX0VTXzIgMSkKKyAgICAgICAgYWRkX2Rl ZmluaXRpb25zKC1EV1RGX1VTRV9PUEVOR0xfRVNfMj0xKQorICAgIGVsc2UgKCkKKyAgICAgICAg c2V0KFdURl9VU0VfT1BFTkdMIDEpCisgICAgICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0Vf T1BFTkdMPTEpCisgICAgZW5kaWYgKCkKKwogICAgIGlmIChFR0xfRk9VTkQpCiAgICAgICAgIGFk ZF9kZWZpbml0aW9ucygtRFdURl9VU0VfRUdMPTEpCiAgICAgZW5kaWYgKCkK 248263 2015-03-09 11:32:45 -0700 2015-03-09 11:47:56 -0700 Updated patch wk-gles2.diff text/plain 6724 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBjMzY0ODE0Li5kMzgzZjEz IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTUtMDMtMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPiBh bmQgSm9zw6kgRGFwZW5hIFBheiAgPGpkYXBlbmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RL XSBBZGQgYSBjb25maWd1cmUgb3B0aW9uIHRvIGJ1aWxkIHdpdGggT3BlbkdMIEVTIDIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjQ5OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBFTkFCTEVfR0xF UzIgb3B0aW9uLiBJdCdzIGRpc2FibGVkIGJ5IGRlZmF1bHQsIGJ1dCBpZiBwYXNzZWQKKyAgICAg ICAgR0xFUzIgaXMgcmVxdWlyZWQgYW5kIE9wZW5HTCBpcyBub3QgZXZlbiBzZWFyY2hlZC4gT3Ro ZXJ3aXNlIHdlCisgICAgICAgIHNlYXJjaCBmb3IgT3BlbkdMIGFzIHVzdWFsLCB1c2luZyBpdCBv bmx5IGlmIHByZXNlbnQuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFr ZToKKwogMjAxNS0wMy0wMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAg ICAgICAgQ29udmVydCBNYW51YWxUZXN0cy9zdmctdG9vbHRpcC5zdmcgdG8gYSBEUlQgdGVzdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDI3NTMwNGEuLmFlNTQzMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAxNS0wMy0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ IGFuZCBKb3PDqSBEYXBlbmEgUGF6ICA8amRhcGVuYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIEFkZCBhIGNvbmZpZ3VyZSBvcHRpb24gdG8gYnVpbGQgd2l0aCBPcGVuR0wgRVMgMgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNDk4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVpbGQgR0xFUyBv ciBHTCBzcGVjaWZpYyBmaWxlcyBkZXBlbmRpbmcgb24gdGhlIGJ1aWxkIG9wdGlvbnMuCisKKyAg ICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToKKwogMjAxNS0wMy0wOSAgWGFiaWVyIFJvZHJpZ3Vl eiBDYWx2YXIgPGNhbHZhcmlzQGlnYWxpYS5jb20+IGFuZCBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u LmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgUmVhZGFibGVTdHJlYW1KU1NvdXJjZSBz aG91bGQgdXNlIEpTQzo6U3Ryb25nIFVuc3BlY2lmaWVkQm9vbFR5cGUgb3BlcmF0b3IKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYkNvcmUv UGxhdGZvcm1HVEsuY21ha2UKaW5kZXggODRiMmZhNC4uODQ4OWQ5ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYkNvcmUvUGxhdGZv cm1HVEsuY21ha2UKQEAgLTY1LDcgKzY1LDYgQEAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VT CiAKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwCiAg ICAgcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuY3BwCi0gICAgcGxhdGZvcm0vZ3JhcGhp Y3MvT3BlbkdMU2hpbXMuY3BwCiAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvV09GRkZpbGVGb3JtYXQu Y3BwCiAKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9CYWNraW5nU3RvcmVCYWNrZW5kQ2Fp cm9JbXBsLmNwcApAQCAtMTE2LDEwICsxMTUsNyBAQCBsaXN0KEFQUEVORCBXZWJDb3JlX1NPVVJD RVMKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5jcHAK ICAgICBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHAKIAotICAg IHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0wuY3BwCiAgICAgcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKLSAgICBw bGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMRVMuY3BwCi0gICAgcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMLmNwcAogICAgIHBs YXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAK ICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGVtcG9yYXJ5T3BlbkdMU2V0dGluZy5jcHAK IApAQCAtNDA1LDYgKzQwMSwyMiBAQCBpZiAoV1RGX1VTRV9FR0wpCiAgICAgKQogZW5kaWYgKCkK IAoraWYgKFdURl9VU0VfT1BFTkdMX0VTXzIpCisgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VS Q0VTCisgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xF Uy5jcHAKKyAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNE T3BlbkdMRVMuY3BwCisgICAgKQorZW5kaWYgKCkKKworaWYgKFdURl9VU0VfT1BFTkdMKQorICAg IGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUworICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9P cGVuR0xTaGltcy5jcHAKKworICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5z aW9uczNET3BlbkdMLmNwcAorICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhp Y3NDb250ZXh0M0RPcGVuR0wuY3BwCisgICAgKQorZW5kaWYgKCkKKwogaWYgKEVOQUJMRV9QTFVH SU5fUFJPQ0VTU19HVEsyKQogICAgICMgV2ViS2l0UGx1Z2luUHJvY2VzczIgbmVlZHMgYSB2ZXJz aW9uIG9mIFdlYkNvcmUgY29tcGlsZWQgYWdhaW5zdCBHVEsrMiwgc28gd2UndmUgaXNvbGF0ZWQg YWxsIHRoZSBHVEsrCiAgICAgIyBkZXBlbmRlbnQgZmlsZXMgaW50byBhIHNlcGFyYXRlIGxpYnJh cnkgd2hpY2ggY2FuIGJlIHVzZWQgdG8gY29uc3RydWN0IGEgR1RLKzIgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9u c0dUSy5jbWFrZQppbmRleCA0ZDlhZmU4Li4zMWU5MDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21h a2UvT3B0aW9uc0dUSy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpA QCAtMTYsNiArMTYsNyBAQCBzZXQoRU5BQkxFX0dUS0RPQyBPRkYgQ0FDSEUgQk9PTCAiV2hldGhl ciBvciBub3QgdG8gdXNlIGdlbmVyYXRlIGd0a2RvYy4iKQogc2V0KEVOQUJMRV9YMTFfVEFSR0VU IE9OIENBQ0hFIEJPT0wgIldoZXRoZXIgdG8gZW5hYmxlIHN1cHBvcnQgZm9yIHRoZSBYMTEgd2lu ZG93aW5nIHRhcmdldC4iKQogc2V0KEVOQUJMRV9XQVlMQU5EX1RBUkdFVCBPRkYgQ0FDSEUgQk9P TCAiV2hldGhlciB0byBlbmFibGUgc3VwcG9ydCBmb3IgdGhlIFdheWxhbmQgd2luZG93aW5nIHRh cmdldC4iKQogc2V0KEVOQUJMRV9JTlRST1NQRUNUSU9OIE9OIENBQ0hFIEJPT0wgIldoZXRoZXIg dG8gZW5hYmxlIEdPYmplY3QgaW50cm9zcGVjdGlvbi4iKQorc2V0KEVOQUJMRV9HTEVTMiBPRkYg Q0FDSEUgQk9PTCAiV2hldGhlciB0byBlbmFibGUgT3BlbkdMIEVTIDIuMC4iKQogCiAjIFRoZXNl IGFyZSBzaGFyZWQgdmFyaWFibGVzLCBidXQgd2Ugc3BlY2lhbCBjYXNlIHRoZWlyIGRlZmluaXRp b24gc28gdGhhdCB3ZSBjYW4gdXNlIHRoZQogIyBDTUFLRV9JTlNUQUxMXyogdmFyaWFibGVzIHRo YXQgYXJlIHBvcHVsYXRlZCBieSB0aGUgR05VSW5zdGFsbERpcnMgbWFjcm8uCkBAIC00Niw3ICs0 Nyw2IEBAIGZpbmRfcGFja2FnZShBVEsgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoV2ViUCBSRVFV SVJFRCkKIGZpbmRfcGFja2FnZShBVFNQSSAyLjUuMykKIGZpbmRfcGFja2FnZShHT2JqZWN0SW50 cm9zcGVjdGlvbikKLWZpbmRfcGFja2FnZShPcGVuR0wpCiBmaW5kX3BhY2thZ2UoRUdMKQogZmlu ZF9wYWNrYWdlKEdlb0NsdWUyIDIuMS41KQogZmluZF9wYWNrYWdlKEdudVRMUyAzLjAuMCkKQEAg LTY1LDIyICs2NSwzNiBAQCBpZiAoRU5BQkxFX1gxMV9UQVJHRVQpCiAgICAgY2hlY2tfaW5jbHVk ZV9maWxlcygiR0wvZ2x4LmgiIEdMWF9GT1VORCkKIGVuZGlmICgpCiAKK2lmIChFTkFCTEVfR0xF UzIpCisgICAgZmluZF9wYWNrYWdlKE9wZW5HTEVTMiBSRVFVSVJFRCkKKyAgICBpZiAoT1BFTkdM RVMyX0ZPVU5EIEFORCBOT1QoRUdMX0ZPVU5EKSkKKyAgICAgICAgbWVzc2FnZShGQVRBTF9FUlJP UiAiRUdMIGlzIG5lZWRlZCBmb3IgT3BlbkdMIEVTIDIuMC4iKQorICAgIGVuZGlmICgpCitlbHNl ICgpCisgICAgZmluZF9wYWNrYWdlKE9wZW5HTCkKK2VuZGlmICgpCisKIFdFQktJVF9PUFRJT05f QkVHSU4oKQogV0VCS0lUX09QVElPTl9ERUZJTkUoRU5BQkxFX1BMVUdJTl9QUk9DRVNTX0dUSzIg IldoZXRoZXIgdG8gYnVpbGQgV2ViS2l0UGx1Z2luUHJvY2VzczIgdG8gbG9hZCBHVEsyIGJhc2Vk IHBsdWdpbnMuIiBPTikKIAotaWYgKE9QRU5HTF9GT1VORCBBTkQgKEdMWF9GT1VORCBPUiBFR0xf Rk9VTkQpKQoraWYgKChPUEVOR0xfRk9VTkQgT1IgT1BFTkdMRVMyX0ZPVU5EKSBBTkQgKEdMWF9G T1VORCBPUiBFR0xfRk9VTkQpKQogICAgIFdFQktJVF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVF KEVOQUJMRV9XRUJHTCBPTikKIAotICAgIGlmIChHTFhfRk9VTkQpCi0gICAgICAgIGxpc3QoQVBQ RU5EIENBSVJPX0dMX0NPTVBPTkVOVFMgY2Fpcm8tZ2x4KQotICAgIGVuZGlmICgpCi0gICAgaWYg KEVHTF9GT1VORCkKLSAgICAgICAgbGlzdChBUFBFTkQgQ0FJUk9fR0xfQ09NUE9ORU5UUyBjYWly by1lZ2wpCi0gICAgZW5kaWYgKCkKLSAgICBmaW5kX3BhY2thZ2UoQ2Fpcm9HTCAxLjEwLjIgQ09N UE9ORU5UUyAke0NBSVJPX0dMX0NPTVBPTkVOVFN9KQotICAgIGlmIChDQUlST19HTF9GT1VORCkK LSAgICAgICAgV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0FDQ0VMRVJB VEVEXzJEX0NBTlZBUyBPTikKKyAgICBpZiAoT1BFTkdMX0ZPVU5EKQorICAgICAgICBpZiAoR0xY X0ZPVU5EKQorICAgICAgICAgICAgbGlzdChBUFBFTkQgQ0FJUk9fR0xfQ09NUE9ORU5UUyBjYWly by1nbHgpCisgICAgICAgIGVuZGlmICgpCisgICAgICAgIGlmIChFR0xfRk9VTkQpCisgICAgICAg ICAgICBsaXN0KEFQUEVORCBDQUlST19HTF9DT01QT05FTlRTIGNhaXJvLWVnbCkKKyAgICAgICAg ZW5kaWYgKCkKKyAgICAgICAgZmluZF9wYWNrYWdlKENhaXJvR0wgMS4xMC4yIENPTVBPTkVOVFMg JHtDQUlST19HTF9DT01QT05FTlRTfSkKKyAgICAgICAgaWYgKENBSVJPX0dMX0ZPVU5EKQorICAg ICAgICAgICAgV0VCS0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0FDQ0VMRVJB VEVEXzJEX0NBTlZBUyBPTikKKyAgICAgICAgZWxzZSAoKQorICAgICAgICAgICAgV0VCS0lUX09Q VElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUyBPRkYp CisgICAgICAgIGVuZGlmICgpCiAgICAgZWxzZSAoKQorICAgICAgICAjIEZJWE1FOiBTaG91bGQg d2Ugc2VhcmNoIGZvciBjYWlyby1nbGVzdjIgaW5zdGVhZCBvZiBjYWlyby1nbCBpbiB0aGlzIGNh c2U/CiAgICAgICAgIFdFQktJVF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVOQUJMRV9BQ0NF TEVSQVRFRF8yRF9DQU5WQVMgT0ZGKQogICAgIGVuZGlmICgpCiBlbHNlICgpCkBAIC0zMTUsMTYg KzMyOSwyMyBAQCBpZiAoRU5BQkxFX1NQRUxMQ0hFQ0spCiAgICAgZmluZF9wYWNrYWdlKEVuY2hh bnQgUkVRVUlSRUQpCiBlbmRpZiAoKQogCi1pZiAoT1BFTkdMX0ZPVU5EIEFORCAoR0xYX0ZPVU5E IE9SIEVHTF9GT1VORCkpCitpZiAoKE9QRU5HTF9GT1VORCBPUiBPUEVOR0xFUzJfRk9VTkQpIEFO RCAoR0xYX0ZPVU5EIE9SIEVHTF9GT1VORCkpCiAgICAgc2V0KEVOQUJMRV9URVhUVVJFX01BUFBF UiAxKQogICAgIHNldChXVEZfVVNFXzNEX0dSQVBISUNTIDEpCiAKLSAgICBhZGRfZGVmaW5pdGlv bnMoLURXVEZfVVNFX09QRU5HTD0xKQogICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0VfM0Rf R1JBUEhJQ1M9MSkKICAgICBhZGRfZGVmaW5pdGlvbnMoLURXVEZfVVNFX1RFWFRVUkVfTUFQUEVS PTEpCiAgICAgYWRkX2RlZmluaXRpb25zKC1EV1RGX1VTRV9URVhUVVJFX01BUFBFUl9HTD0xKQog ICAgIGFkZF9kZWZpbml0aW9ucygtREVOQUJMRV8zRF9SRU5ERVJJTkc9MSkKIAorICAgIGlmIChP UEVOR0xFUzJfRk9VTkQpCisgICAgICAgIHNldChXVEZfVVNFX09QRU5HTF9FU18yIDEpCisgICAg ICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0VfT1BFTkdMX0VTXzI9MSkKKyAgICBlbHNlICgp CisgICAgICAgIHNldChXVEZfVVNFX09QRU5HTCAxKQorICAgICAgICBhZGRfZGVmaW5pdGlvbnMo LURXVEZfVVNFX09QRU5HTD0xKQorICAgIGVuZGlmICgpCisKICAgICBpZiAoRUdMX0ZPVU5EKQog ICAgICAgICBhZGRfZGVmaW5pdGlvbnMoLURXVEZfVVNFX0VHTD0xKQogICAgIGVuZGlmICgpCg== 248265 2015-03-09 11:47:56 -0700 2015-03-09 11:55:16 -0700 Updated patch wk-gles2.diff text/plain 7260 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCBjMzY0ODE0Li5kMzgzZjEz IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAK KzIwMTUtMDMtMDkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPiBh bmQgSm9zw6kgRGFwZW5hIFBheiAgPGpkYXBlbmFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RL XSBBZGQgYSBjb25maWd1cmUgb3B0aW9uIHRvIGJ1aWxkIHdpdGggT3BlbkdMIEVTIDIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjQ5OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBFTkFCTEVfR0xF UzIgb3B0aW9uLiBJdCdzIGRpc2FibGVkIGJ5IGRlZmF1bHQsIGJ1dCBpZiBwYXNzZWQKKyAgICAg ICAgR0xFUzIgaXMgcmVxdWlyZWQgYW5kIE9wZW5HTCBpcyBub3QgZXZlbiBzZWFyY2hlZC4gT3Ro ZXJ3aXNlIHdlCisgICAgICAgIHNlYXJjaCBmb3IgT3BlbkdMIGFzIHVzdWFsLCB1c2luZyBpdCBv bmx5IGlmIHByZXNlbnQuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFr ZToKKwogMjAxNS0wMy0wMyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAg ICAgICAgQ29udmVydCBNYW51YWxUZXN0cy9zdmctdG9vbHRpcC5zdmcgdG8gYSBEUlQgdGVzdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDI3NTMwNGEuLmFlNTQzMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAxNS0wMy0wOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ IGFuZCBKb3PDqSBEYXBlbmEgUGF6ICA8amRhcGVuYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtH VEtdIEFkZCBhIGNvbmZpZ3VyZSBvcHRpb24gdG8gYnVpbGQgd2l0aCBPcGVuR0wgRVMgMgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNDk4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQnVpbGQgR0xFUyBv ciBHTCBzcGVjaWZpYyBmaWxlcyBkZXBlbmRpbmcgb24gdGhlIGJ1aWxkIG9wdGlvbnMuCisKKyAg ICAgICAgKiBQbGF0Zm9ybUdUSy5jbWFrZToKKwogMjAxNS0wMy0wOSAgWGFiaWVyIFJvZHJpZ3Vl eiBDYWx2YXIgPGNhbHZhcmlzQGlnYWxpYS5jb20+IGFuZCBZb3Vlbm4gRmFibGV0ICA8eW91ZW5u LmZhYmxldEBjcmYuY2Fub24uZnI+CiAKICAgICAgICAgUmVhZGFibGVTdHJlYW1KU1NvdXJjZSBz aG91bGQgdXNlIEpTQzo6U3Ryb25nIFVuc3BlY2lmaWVkQm9vbFR5cGUgb3BlcmF0b3IKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlIGIvU291cmNlL1dlYkNvcmUv UGxhdGZvcm1HVEsuY21ha2UKaW5kZXggODRiMmZhNC4uODQ4OWQ5ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvUGxhdGZvcm1HVEsuY21ha2UKKysrIGIvU291cmNlL1dlYkNvcmUvUGxhdGZv cm1HVEsuY21ha2UKQEAgLTY1LDcgKzY1LDYgQEAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VSQ0VT CiAKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQzRFByaXZhdGUuY3BwCiAg ICAgcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2VTb3VyY2UuY3BwCi0gICAgcGxhdGZvcm0vZ3JhcGhp Y3MvT3BlbkdMU2hpbXMuY3BwCiAgICAgcGxhdGZvcm0vZ3JhcGhpY3MvV09GRkZpbGVGb3JtYXQu Y3BwCiAKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9CYWNraW5nU3RvcmVCYWNrZW5kQ2Fp cm9JbXBsLmNwcApAQCAtMTE2LDEwICsxMTUsNyBAQCBsaXN0KEFQUEVORCBXZWJDb3JlX1NPVVJD RVMKICAgICBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6ekZhY2VDYWlyby5jcHAK ICAgICBwbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHAKIAotICAg IHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0wuY3BwCiAgICAgcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0V4dGVuc2lvbnMzRE9wZW5HTENvbW1vbi5jcHAKLSAgICBw bGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMRVMuY3BwCi0gICAgcGxh dGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNET3BlbkdMLmNwcAogICAgIHBs YXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAK ICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvVGVtcG9yYXJ5T3BlbkdMU2V0dGluZy5jcHAK IApAQCAtNDA1LDYgKzQwMSwyMiBAQCBpZiAoV1RGX1VTRV9FR0wpCiAgICAgKQogZW5kaWYgKCkK IAoraWYgKFdURl9VU0VfT1BFTkdMX0VTXzIpCisgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9TT1VS Q0VTCisgICAgICAgIHBsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0xF Uy5jcHAKKyAgICAgICAgcGxhdGZvcm0vZ3JhcGhpY3Mvb3BlbmdsL0dyYXBoaWNzQ29udGV4dDNE T3BlbkdMRVMuY3BwCisgICAgKQorZW5kaWYgKCkKKworaWYgKFdURl9VU0VfT1BFTkdMKQorICAg IGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUworICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9P cGVuR0xTaGltcy5jcHAKKworICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvRXh0ZW5z aW9uczNET3BlbkdMLmNwcAorICAgICAgICBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhp Y3NDb250ZXh0M0RPcGVuR0wuY3BwCisgICAgKQorZW5kaWYgKCkKKwogaWYgKEVOQUJMRV9QTFVH SU5fUFJPQ0VTU19HVEsyKQogICAgICMgV2ViS2l0UGx1Z2luUHJvY2VzczIgbmVlZHMgYSB2ZXJz aW9uIG9mIFdlYkNvcmUgY29tcGlsZWQgYWdhaW5zdCBHVEsrMiwgc28gd2UndmUgaXNvbGF0ZWQg YWxsIHRoZSBHVEsrCiAgICAgIyBkZXBlbmRlbnQgZmlsZXMgaW50byBhIHNlcGFyYXRlIGxpYnJh cnkgd2hpY2ggY2FuIGJlIHVzZWQgdG8gY29uc3RydWN0IGEgR1RLKzIgV2ViQ29yZQpkaWZmIC0t Z2l0IGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UgYi9Tb3VyY2UvY21ha2UvT3B0aW9u c0dUSy5jbWFrZQppbmRleCA0ZDlhZmU4Li43MTcyYzczIDEwMDY0NAotLS0gYS9Tb3VyY2UvY21h a2UvT3B0aW9uc0dUSy5jbWFrZQorKysgYi9Tb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZQpA QCAtMTYsNiArMTYsNyBAQCBzZXQoRU5BQkxFX0dUS0RPQyBPRkYgQ0FDSEUgQk9PTCAiV2hldGhl ciBvciBub3QgdG8gdXNlIGdlbmVyYXRlIGd0a2RvYy4iKQogc2V0KEVOQUJMRV9YMTFfVEFSR0VU IE9OIENBQ0hFIEJPT0wgIldoZXRoZXIgdG8gZW5hYmxlIHN1cHBvcnQgZm9yIHRoZSBYMTEgd2lu ZG93aW5nIHRhcmdldC4iKQogc2V0KEVOQUJMRV9XQVlMQU5EX1RBUkdFVCBPRkYgQ0FDSEUgQk9P TCAiV2hldGhlciB0byBlbmFibGUgc3VwcG9ydCBmb3IgdGhlIFdheWxhbmQgd2luZG93aW5nIHRh cmdldC4iKQogc2V0KEVOQUJMRV9JTlRST1NQRUNUSU9OIE9OIENBQ0hFIEJPT0wgIldoZXRoZXIg dG8gZW5hYmxlIEdPYmplY3QgaW50cm9zcGVjdGlvbi4iKQorc2V0KEVOQUJMRV9HTEVTMiBPRkYg Q0FDSEUgQk9PTCAiV2hldGhlciB0byBlbmFibGUgT3BlbkdMIEVTIDIuMC4iKQogCiAjIFRoZXNl IGFyZSBzaGFyZWQgdmFyaWFibGVzLCBidXQgd2Ugc3BlY2lhbCBjYXNlIHRoZWlyIGRlZmluaXRp b24gc28gdGhhdCB3ZSBjYW4gdXNlIHRoZQogIyBDTUFLRV9JTlNUQUxMXyogdmFyaWFibGVzIHRo YXQgYXJlIHBvcHVsYXRlZCBieSB0aGUgR05VSW5zdGFsbERpcnMgbWFjcm8uCkBAIC00Niw3ICs0 Nyw2IEBAIGZpbmRfcGFja2FnZShBVEsgUkVRVUlSRUQpCiBmaW5kX3BhY2thZ2UoV2ViUCBSRVFV SVJFRCkKIGZpbmRfcGFja2FnZShBVFNQSSAyLjUuMykKIGZpbmRfcGFja2FnZShHT2JqZWN0SW50 cm9zcGVjdGlvbikKLWZpbmRfcGFja2FnZShPcGVuR0wpCiBmaW5kX3BhY2thZ2UoRUdMKQogZmlu ZF9wYWNrYWdlKEdlb0NsdWUyIDIuMS41KQogZmluZF9wYWNrYWdlKEdudVRMUyAzLjAuMCkKQEAg LTU2LDMxICs1Niw0NyBAQCBpZiAoTk9UIEdFT0NMVUUyX0ZPVU5EKQogICAgIGZpbmRfcGFja2Fn ZShHZW9DbHVlKQogZW5kaWYgKCkKIAoraWYgKEVOQUJMRV9HTEVTMikKKyAgICBmaW5kX3BhY2th Z2UoT3BlbkdMRVMyIFJFUVVJUkVEKQorICAgIGlmIChPUEVOR0xFUzJfRk9VTkQgQU5EIE5PVChF R0xfRk9VTkQpKQorICAgICAgICBtZXNzYWdlKEZBVEFMX0VSUk9SICJFR0wgaXMgbmVlZGVkIGZv ciBPcGVuR0wgRVMgMi4wLiIpCisgICAgZW5kaWYgKCkKK2Vsc2UgKCkKKyAgICBmaW5kX3BhY2th Z2UoT3BlbkdMKQorZW5kaWYgKCkKKwogaWYgKEVOQUJMRV9YMTFfVEFSR0VUKQogICAgICMgV2l0 aCBjbWFrZSAzLjIueCB3ZSBoYXZlIHRvIGV4cGxpY2l0bHkgYXNrIGZvciBYMTEgb3RoZXJ3aXNl IHRoZSBYMTFfWDExX0xJQgogICAgICMgdmFyaWFibGUgd29uJ3QgYmUgc2V0IHRodXMgdGhlIFgx MSBsaW5rZXIgZmxhZ3Mgd29uJ3QgYmUgYWRkZWQgYW5kIHRoZSBidWlsZAogICAgICMgd2lsbCBm YWlsLgogICAgIGZpbmRfcGFja2FnZShYMTEgUkVRVUlSRUQpCi0gICAgIyBXZSBkb24ndCB1c2Ug ZmluZF9wYWNrYWdlIGZvciBHTFggYmVjYXVzZSBpdCBpcyBwYXJ0IG9mIC1sR0wsIHVubGlrZSBF R0wuCi0gICAgY2hlY2tfaW5jbHVkZV9maWxlcygiR0wvZ2x4LmgiIEdMWF9GT1VORCkKKyAgICBp ZiAoT1BFTkdMX0ZPVU5EKQorICAgICAgICAjIFdlIGRvbid0IHVzZSBmaW5kX3BhY2thZ2UgZm9y IEdMWCBiZWNhdXNlIGl0IGlzIHBhcnQgb2YgLWxHTCwgdW5saWtlIEVHTC4KKyAgICAgICAgY2hl Y2tfaW5jbHVkZV9maWxlcygiR0wvZ2x4LmgiIEdMWF9GT1VORCkKKyAgICBlbmRpZiAoKQogZW5k aWYgKCkKIAogV0VCS0lUX09QVElPTl9CRUdJTigpCiBXRUJLSVRfT1BUSU9OX0RFRklORShFTkFC TEVfUExVR0lOX1BST0NFU1NfR1RLMiAiV2hldGhlciB0byBidWlsZCBXZWJLaXRQbHVnaW5Qcm9j ZXNzMiB0byBsb2FkIEdUSzIgYmFzZWQgcGx1Z2lucy4iIE9OKQogCi1pZiAoT1BFTkdMX0ZPVU5E IEFORCAoR0xYX0ZPVU5EIE9SIEVHTF9GT1VORCkpCitpZiAoKE9QRU5HTF9GT1VORCBPUiBPUEVO R0xFUzJfRk9VTkQpIEFORCAoR0xYX0ZPVU5EIE9SIEVHTF9GT1VORCkpCiAgICAgV0VCS0lUX09Q VElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX1dFQkdMIE9OKQogCi0gICAgaWYgKEdMWF9G T1VORCkKLSAgICAgICAgbGlzdChBUFBFTkQgQ0FJUk9fR0xfQ09NUE9ORU5UUyBjYWlyby1nbHgp Ci0gICAgZW5kaWYgKCkKLSAgICBpZiAoRUdMX0ZPVU5EKQotICAgICAgICBsaXN0KEFQUEVORCBD QUlST19HTF9DT01QT05FTlRTIGNhaXJvLWVnbCkKLSAgICBlbmRpZiAoKQotICAgIGZpbmRfcGFj a2FnZShDYWlyb0dMIDEuMTAuMiBDT01QT05FTlRTICR7Q0FJUk9fR0xfQ09NUE9ORU5UU30pCi0g ICAgaWYgKENBSVJPX0dMX0ZPVU5EKQotICAgICAgICBXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9S VF9WQUxVRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTIE9OKQorICAgIGlmIChPUEVOR0xf Rk9VTkQpCisgICAgICAgIGlmIChHTFhfRk9VTkQpCisgICAgICAgICAgICBsaXN0KEFQUEVORCBD QUlST19HTF9DT01QT05FTlRTIGNhaXJvLWdseCkKKyAgICAgICAgZW5kaWYgKCkKKyAgICAgICAg aWYgKEVHTF9GT1VORCkKKyAgICAgICAgICAgIGxpc3QoQVBQRU5EIENBSVJPX0dMX0NPTVBPTkVO VFMgY2Fpcm8tZWdsKQorICAgICAgICBlbmRpZiAoKQorICAgICAgICBmaW5kX3BhY2thZ2UoQ2Fp cm9HTCAxLjEwLjIgQ09NUE9ORU5UUyAke0NBSVJPX0dMX0NPTVBPTkVOVFN9KQorICAgICAgICBp ZiAoQ0FJUk9fR0xfRk9VTkQpCisgICAgICAgICAgICBXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9S VF9WQUxVRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTIE9OKQorICAgICAgICBlbHNlICgp CisgICAgICAgICAgICBXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfQUND RUxFUkFURURfMkRfQ0FOVkFTIE9GRikKKyAgICAgICAgZW5kaWYgKCkKICAgICBlbHNlICgpCisg ICAgICAgICMgRklYTUU6IFNob3VsZCB3ZSBzZWFyY2ggZm9yIGNhaXJvLWdsZXN2MiBpbnN0ZWFk IG9mIGNhaXJvLWdsIGluIHRoaXMgY2FzZT8KICAgICAgICAgV0VCS0lUX09QVElPTl9ERUZBVUxU X1BPUlRfVkFMVUUoRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUyBPRkYpCiAgICAgZW5kaWYg KCkKIGVsc2UgKCkKQEAgLTMxNSwxNiArMzMxLDIzIEBAIGlmIChFTkFCTEVfU1BFTExDSEVDSykK ICAgICBmaW5kX3BhY2thZ2UoRW5jaGFudCBSRVFVSVJFRCkKIGVuZGlmICgpCiAKLWlmIChPUEVO R0xfRk9VTkQgQU5EIChHTFhfRk9VTkQgT1IgRUdMX0ZPVU5EKSkKK2lmICgoT1BFTkdMX0ZPVU5E IE9SIE9QRU5HTEVTMl9GT1VORCkgQU5EIChHTFhfRk9VTkQgT1IgRUdMX0ZPVU5EKSkKICAgICBz ZXQoRU5BQkxFX1RFWFRVUkVfTUFQUEVSIDEpCiAgICAgc2V0KFdURl9VU0VfM0RfR1JBUEhJQ1Mg MSkKIAotICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0VfT1BFTkdMPTEpCiAgICAgYWRkX2Rl ZmluaXRpb25zKC1EV1RGX1VTRV8zRF9HUkFQSElDUz0xKQogICAgIGFkZF9kZWZpbml0aW9ucygt RFdURl9VU0VfVEVYVFVSRV9NQVBQRVI9MSkKICAgICBhZGRfZGVmaW5pdGlvbnMoLURXVEZfVVNF X1RFWFRVUkVfTUFQUEVSX0dMPTEpCiAgICAgYWRkX2RlZmluaXRpb25zKC1ERU5BQkxFXzNEX1JF TkRFUklORz0xKQogCisgICAgaWYgKE9QRU5HTEVTMl9GT1VORCkKKyAgICAgICAgc2V0KFdURl9V U0VfT1BFTkdMX0VTXzIgMSkKKyAgICAgICAgYWRkX2RlZmluaXRpb25zKC1EV1RGX1VTRV9PUEVO R0xfRVNfMj0xKQorICAgIGVsc2UgKCkKKyAgICAgICAgc2V0KFdURl9VU0VfT1BFTkdMIDEpCisg ICAgICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0VfT1BFTkdMPTEpCisgICAgZW5kaWYgKCkK KwogICAgIGlmIChFR0xfRk9VTkQpCiAgICAgICAgIGFkZF9kZWZpbml0aW9ucygtRFdURl9VU0Vf RUdMPTEpCiAgICAgZW5kaWYgKCkK