218231 2020-10-27 07:35:01 -0700 [WPE] REGRESSION(r268992) Redefinition of min() inside TextureMapperShaderProgram for GLES > 3.0 2020-10-27 08:34:08 -0700 1 1 1 Unclassified WebKit WPE WebKit WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 magomez magomez bugs-noreply cmarcelo ews-watchlist kondapallykalyan luiz noam svillar oldest_to_newest 1701864 0 magomez 2020-10-27 07:35:01 -0700 r268992 added a definition of the function min() inside the shader, as that function is not defined in GLES2. But when using GLES we don't check for the version, so the new function is defined for every version, causing an error when GLES is bigger than 3.0 and the function is already defined. I'll go for the simpler path and remove the usage of the min function, so we don't need to add version checks when using GLES. 1701868 1 412419 magomez 2020-10-27 07:43:36 -0700 Created attachment 412419 Patch 1701885 2 ews-feeder 2020-10-27 08:34:06 -0700 Committed r269040: <https://trac.webkit.org/changeset/269040> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412419. 412419 2020-10-27 07:43:36 -0700 2020-10-27 08:34:07 -0700 Patch bug-218231-20201027154334.patch text/plain 3014 magomez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MDM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjQxMzA2NjY4ODJmZjdk ZTEzMzk0NGQ3MzI5YzlkYWMzZTUxMGFhNS4uZDk0OTQ4MjdiODMzMGUzODczYTRhODFkYTkzNTIz ZDJlNmViZWIxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIwLTEwLTI3ICBNaWd1 ZWwgR29tZXogIDxtYWdvbWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW1dQRV0gUkVHUkVTU0lP TihyMjY4OTkyKSBSZWRlZmluaXRpb24gb2YgbWluKCkgaW5zaWRlIFRleHR1cmVNYXBwZXJTaGFk ZXJQcm9ncmFtIGZvciBHTEVTID4gMy4wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTgyMzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZW1vdmUgdGhlIGRlZmluaXRpb24gb2YgdGhlIG1pbigpIGZ1bmN0 aW9uIGFuZCByZXBsYWNlIGl0cyB1c2FnZSB3aXRoIGFuIGlmLiBUaGlzIHdvcmtzIGZvcgorICAg ICAgICBldmVyeSBHTFNMIHZlcnNpb24uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW06OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpT VFJJTkdJRlkpOiBEZWxldGVkLgorCiAyMDIwLTEwLTI3ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5v cm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXSBEZXZpY2UgbW9uaXRvciBp c3N1ZSBpbiBBdWRpb0Rlc3RpbmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0uY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJTaGFkZXJQ cm9ncmFtLmNwcAppbmRleCBjY2YwODI4OTRlYzVmNThlZmIyZjEzODIzNzE1MDlkZWE4YWE2MGMz Li4zNmYxMmM4ZjkxODZjNjliMTQzZGVkMzM0ZTY5Yzc4MjhmM2YwNGI0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlclNoYWRl clByb2dyYW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9UZXh0dXJlTWFwcGVyU2hhZGVyUHJvZ3JhbS5jcHAKQEAgLTIyNSwxNyArMjI1LDYgQEAgc3Rh dGljIGNvbnN0IGNoYXIqIGZyYWdtZW50VGVtcGxhdGVHRTMyMFZhcnMgPQogICAgICAgICBpbiB2 ZWMyIHZfdHJhbnNmb3JtZWRUZXhDb29yZDsKICAgICAgICAgaW4gdmVjNCB2X25vblByb2plY3Rl ZFBvc2l0aW9uOwogICAgICk7Ci0jZWxzZQotLy8gbWluKGdlbklUeXBlKSBpc24ndCBzdXBwb3J0 ZWQgZm9yIEdMU0wgRVMgPCAzLjAuCi1zdGF0aWMgY29uc3QgY2hhciogZnJhZ21lbnRUZW1wbGF0 ZUVTID0KLSAgICBTVFJJTkdJRlkoCi0gICAgICAgIGludCBtaW4oaW50IHgsIGludCB5KQotICAg ICAgICB7Ci0gICAgICAgICAgICBpZiAoeCA8IHkpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHg7 Ci0gICAgICAgICAgICByZXR1cm4geTsKLSAgICAgICAgfQotICAgICk7CiAjZW5kaWYKIAogc3Rh dGljIGNvbnN0IGNoYXIqIGZyYWdtZW50VGVtcGxhdGVDb21tb24gPQpAQCAtNDc3LDcgKzQ2Niwx MCBAQCBzdGF0aWMgY29uc3QgY2hhciogZnJhZ21lbnRUZW1wbGF0ZUNvbW1vbiA9CiAgICAgICAg ICAgICAvLyBXZSBjYW4ndCB1c2UgZ2xfZnJhZ0Nvb3JkIGZvciB0aGUgZnJhZ21lbnQgcG9zaXRp b24gYmVjYXVzZSB0aGF0cyB0aGUgcHJvamVjdGVkIHBvaW50CiAgICAgICAgICAgICAvLyBhbmQg dGhlIHByb2plY3Rpb24gc2NyZXdzIHRoZSBaIGNvbXBvbmVudC4gV2UgbmVlZCB0aGUgcmVhbCAz RCBwb3NpdGlvbiB0aGF0IGNvbWVzIGZyb20KICAgICAgICAgICAgIC8vIHRoZSBub25Qcm9qZWN0 ZWRQb3NpdGlvbiB2YXJpYWJsZS4KLSAgICAgICAgICAgIGludCBuUmVjdHMgPSBtaW4oUk9VTkRF RF9SRUNUX01BWF9SRUNUUywgdV9yb3VuZGVkUmVjdE51bWJlcik7CisgICAgICAgICAgICBpbnQg blJlY3RzID0gdV9yb3VuZGVkUmVjdE51bWJlcjsKKyAgICAgICAgICAgIGlmIChuUmVjdHMgPiBS T1VOREVEX1JFQ1RfTUFYX1JFQ1RTKQorICAgICAgICAgICAgICAgIG5SZWN0cyA9IFJPVU5ERURf UkVDVF9NQVhfUkVDVFM7CisKICAgICAgICAgICAgIGZvciAoaW50IHJlY3RJbmRleCA9IDA7IHJl Y3RJbmRleCA8IG5SZWN0czsgcmVjdEluZGV4KyspIHsKICAgICAgICAgICAgICAgICB2ZWM0IGZy YWdDb29yZCA9IHVfcm91bmRlZFJlY3RJbnZlcnNlVHJhbnNmb3JtTWF0cml4W3JlY3RJbmRleF0g KiB2X25vblByb2plY3RlZFBvc2l0aW9uOwogICAgICAgICAgICAgICAgIGNvbG9yICo9IHJvdW5k ZWRSZWN0Q292ZXJhZ2UoZnJhZ0Nvb3JkLnh5LCByZWN0SW5kZXggKiAzKTsKQEAgLTU4Nyw3ICs1 NzksNiBAQCBSZWY8VGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW0+IFRleHR1cmVNYXBwZXJTaGFk ZXJQcm9ncmFtOjpjcmVhdGUoVGV4dHVyZU1hcHBlcgogICAgIC8vIEFwcGVuZCB0aGUgYXBwcm9w cmlhdGUgaW5wdXQvb3V0cHV0IHZhcmlhYmxlIGRlZmluaXRpb25zLgogI2lmIFVTRShPUEVOR0xf RVMpCiAgICAgZnJhZ21lbnRTaGFkZXJCdWlsZGVyLmFwcGVuZChmcmFnbWVudFRlbXBsYXRlTFQz MjBWYXJzKTsKLSAgICBmcmFnbWVudFNoYWRlckJ1aWxkZXIuYXBwZW5kKGZyYWdtZW50VGVtcGxh dGVFUyk7CiAjZWxzZQogICAgIGlmIChnbFZlcnNpb24gPj0gMzIwKQogICAgICAgICBmcmFnbWVu dFNoYWRlckJ1aWxkZXIuYXBwZW5kKGZyYWdtZW50VGVtcGxhdGVHRTMyMFZhcnMpOwo=