123915 2013-11-06 12:42:37 -0800 [WebGL] We should not allow generateMipMap on compressed textures 2013-11-06 15:07:10 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 123916 1 bfulgham bfulgham commit-queue dino esprehn+autocc gyuyoung.kim kondapallykalyan noam roger_fong oldest_to_newest 947847 0 bfulgham 2013-11-06 12:42:37 -0800 The WebGL conformance test suite generates an error for the Mac WebGL implementation because our implementation of glGenerateMipmaps accepts compressed textures as inputs. The specification calls for this to generate a GL INVALID_OPERATION error with the message ""trying to generate mipmaps from compressed texture". This bug enforces the WebGL 1.0 constraint on our software. 947867 1 bfulgham 2013-11-06 13:11:41 -0800 <rdar://problem/15201274> 947869 2 216212 bfulgham 2013-11-06 13:17:41 -0800 Created attachment 216212 Patch 947875 3 216212 dino 2013-11-06 13:25:50 -0800 Comment on attachment 216212 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=216212&action=review > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:2227 > +#if OS(DARWIN) Considering this is WebGL conformance, do you think this should be on all platforms? 947877 4 bfulgham 2013-11-06 13:28:22 -0800 (In reply to comment #3) > (From update of attachment 216212 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=216212&action=review > > > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:2227 > > +#if OS(DARWIN) > > Considering this is WebGL conformance, do you think this should be on all platforms? Good question! I changed from "glGenerateMipmapEXT" to "glGenerateMipmap", which might be all that is necessary on most platforms. In those cases, GL itself should generate the error. However, our own Apple implementation sneakily maps glGenerateMipmap -> glGenerateMipMapEXT so we can never get the desired error behavior. It probably wouldn't hurt to remove the #if/def, since it just causes WebGL to generate the error, rather than the underlying GL implementation. I'll go ahead and remove it while landing. 947942 5 bfulgham 2013-11-06 15:07:10 -0800 Committed r158798: <http://trac.webkit.org/changeset/158798> 216212 2013-11-06 13:17:41 -0800 2013-11-06 13:25:50 -0800 Patch bug-123915-20131106131738.patch text/plain 5624 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1ODc3OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTExLTA2ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJHTF0gV2Ugc2hvdWxk IG5vdCBhbGxvdyBnZW5lcmF0ZU1pcE1hcCBvbiBjb21wcmVzc2VkIHRleHR1cmVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjM5MTUKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzE1MjAxMjc0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEZvdW5kIGJ5IGV4aXN0aW5nIGNvbmZvcm1hbmNlL2V4dGVuc2lv bnMvd2ViZ2wtY29tcHJlc3NlZC10ZXh0dXJlLXMzdGMuaHRtbAorCisgICAgICAgICogaHRtbC9j YW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdM UmVuZGVyaW5nQ29udGV4dDo6Y29tcHJlc3NlZFRleEltYWdlMkQpOiBTZXQgY29tcHJlc3NlZCBm bGFnLgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0Ojpjb21wcmVzc2Vk VGV4U3ViSW1hZ2UyRCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdD b250ZXh0OjpnZW5lcmF0ZU1pcG1hcCk6IEZvciBBcHBsZSBidWlsZHMsIGNoZWNrIHN0YXRlCisg ICAgICAgIG9mIGNvbXByZXNzZWQgZmxhZyBhbmQgZ2VuZXJhdGUgYXBwcm9wcmlhdGUgV2ViR0wg ZXJyb3IgaWYgbmVjZXNzYXJ5LgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMVGV4dHVyZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFRleHR1cmU6OldlYkdMVGV4dHVyZSk6IFNldCBj b21wcmVzc2VkIGZsYWcgdG8gZmFsc2UgYnkgZGVmYXVsdAorICAgICAgICAoV2ViQ29yZTo6V2Vi R0xUZXh0dXJlOjppc0NvbXByZXNzZWQpOiBBZGRlZAorICAgICAgICAoV2ViQ29yZTo6V2ViR0xU ZXh0dXJlOjpzZXRDb21wcmVzc2VkKTogQWRkZWQKKyAgICAgICAgKiBodG1sL2NhbnZhcy9XZWJH TFRleHR1cmUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhpY3ND b250ZXh0M0RPcGVuR0xDb21tb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250 ZXh0M0Q6OmdlbmVyYXRlTWlwbWFwKTogU3dpdGNoIGltcGxlbWVudGF0aW9uIHRvIHVzZSBwcm9w ZXIKKyAgICAgICAgZ2xHZW5lcmF0ZU1pcG1hcHMsIHJhdGhlciB0aGFuIHRoZSBnbEdlbmVyYXRl TWlwbWFwc0VYVCBtZXRob2QuCisKIDIwMTMtMTEtMDYgIEJlbSBKb25lcy1CZXkgIDxiam9uZXNi ZUBhZG9iZS5jb20+CiAKICAgICAgICAgUmVuYW1lIHJlZ2lvbiBsaW5lIG9mZnNldCBtZXRob2Rz CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVy aW5nQ29udGV4dC5jcHAJKHJldmlzaW9uIDE1ODcwMCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwv Y2FudmFzL1dlYkdMUmVuZGVyaW5nQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNDAs NiArMTM0MCw3IEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0Ojpjb21wcmVzc2VkVGUKICAg ICBncmFwaGljc0NvbnRleHQzRCgpLT5jb21wcmVzc2VkVGV4SW1hZ2UyRCh0YXJnZXQsIGxldmVs LCBpbnRlcm5hbGZvcm1hdCwgd2lkdGgsIGhlaWdodCwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBib3JkZXIsIGRhdGEtPmJ5dGVMZW5ndGgoKSwgZGF0YS0+ YmFzZUFkZHJlc3MoKSk7CiAgICAgdGV4LT5zZXRMZXZlbEluZm8odGFyZ2V0LCBsZXZlbCwgaW50 ZXJuYWxmb3JtYXQsIHdpZHRoLCBoZWlnaHQsIEdyYXBoaWNzQ29udGV4dDNEOjpVTlNJR05FRF9C WVRFKTsKKyAgICB0ZXgtPnNldENvbXByZXNzZWQoKTsKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGlj c0NhbGwoZmFsc2UpOwogfQogCkBAIC0xMzcxLDYgKzEzNzIsNyBAQCB2b2lkIFdlYkdMUmVuZGVy aW5nQ29udGV4dDo6Y29tcHJlc3NlZFRlCiAKICAgICBncmFwaGljc0NvbnRleHQzRCgpLT5jb21w cmVzc2VkVGV4U3ViSW1hZ2UyRCh0YXJnZXQsIGxldmVsLCB4b2Zmc2V0LCB5b2Zmc2V0LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdpZHRoLCBoZWln aHQsIGZvcm1hdCwgZGF0YS0+Ynl0ZUxlbmd0aCgpLCBkYXRhLT5iYXNlQWRkcmVzcygpKTsKKyAg ICB0ZXgtPnNldENvbXByZXNzZWQoKTsKICAgICBjbGVhbnVwQWZ0ZXJHcmFwaGljc0NhbGwoZmFs c2UpOwogfQogCkBAIC0yMjIyLDYgKzIyMjQsMTMgQEAgdm9pZCBXZWJHTFJlbmRlcmluZ0NvbnRl eHQ6OmdlbmVyYXRlTWlwbQogICAgICAgICBzeW50aGVzaXplR0xFcnJvcihHcmFwaGljc0NvbnRl eHQzRDo6SU5WQUxJRF9PUEVSQVRJT04sICJnZW5lcmF0ZU1pcG1hcCIsICJsZXZlbCAwIG5vdCBw b3dlciBvZiAyIG9yIG5vdCBhbGwgdGhlIHNhbWUgc2l6ZSIpOwogICAgICAgICByZXR1cm47CiAg ICAgfQorI2lmIE9TKERBUldJTikKKyAgICAvLyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEyMzkxNi4gQ29tcHJlc3NlZCB0ZXh0dXJlcyBzaG91bGQgYmUg YWxsb3dlZCBpbiBXZWJHTCAyOgorICAgIGlmICh0ZXgtPmlzQ29tcHJlc3NlZCgpKSB7CisgICAg ICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dDNEOjpJTlZBTElEX09QRVJBVElP TiwgImdlbmVyYXRlTWlwbWFwIiwgInRyeWluZyB0byBnZW5lcmF0ZSBtaXBtYXBzIGZyb20gY29t cHJlc3NlZCB0ZXh0dXJlIik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisjZW5kaWYKICAgICBp ZiAoIXZhbGlkYXRlU2V0dGFibGVUZXhGb3JtYXQoImdlbmVyYXRlTWlwbWFwIiwgdGV4LT5nZXRJ bnRlcm5hbEZvcm1hdCh0YXJnZXQsIDApKSkKICAgICAgICAgcmV0dXJuOwogCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFRleHR1cmUuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMVGV4dHVyZS5jcHAJKHJldmlzaW9uIDE1ODcw MCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMVGV4dHVyZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTUwLDYgKzUwLDcgQEAgV2ViR0xUZXh0dXJlOjpXZWJHTFRleHR1cmUoV2Vi R0xSZW5kZXJpbgogICAgICwgbV9pc05QT1QoZmFsc2UpCiAgICAgLCBtX2lzQ29tcGxldGUoZmFs c2UpCiAgICAgLCBtX25lZWRUb1VzZUJsYWNrVGV4dHVyZShmYWxzZSkKKyAgICAsIG1faXNDb21w cmVzc2VkKGZhbHNlKQogewogICAgIHNldE9iamVjdChjdHgtPmdyYXBoaWNzQ29udGV4dDNEKCkt PmNyZWF0ZVRleHR1cmUoKSk7CiB9CkBAIC0yMzksNiArMjQwLDE5IEBAIGJvb2wgV2ViR0xUZXh0 dXJlOjpuZWVkVG9Vc2VCbGFja1RleHR1cmUKICAgICByZXR1cm4gbV9uZWVkVG9Vc2VCbGFja1Rl eHR1cmU7CiB9CiAKK2Jvb2wgV2ViR0xUZXh0dXJlOjppc0NvbXByZXNzZWQoKSBjb25zdAorewor ICAgIGlmICghb2JqZWN0KCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gbV9p c0NvbXByZXNzZWQ7Cit9CisKK3ZvaWQgV2ViR0xUZXh0dXJlOjpzZXRDb21wcmVzc2VkKCkKK3sK KyAgICBBU1NFUlQob2JqZWN0KCkpOworICAgIG1faXNDb21wcmVzc2VkID0gdHJ1ZTsKK30KKyAg ICAKIHZvaWQgV2ViR0xUZXh0dXJlOjpkZWxldGVPYmplY3RJbXBsKEdyYXBoaWNzQ29udGV4dDNE KiBjb250ZXh0M2QsIFBsYXRmb3JtM0RPYmplY3Qgb2JqZWN0KQogewogICAgIGNvbnRleHQzZC0+ ZGVsZXRlVGV4dHVyZShvYmplY3QpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xUZXh0dXJlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMv V2ViR0xUZXh0dXJlLmgJKHJldmlzaW9uIDE1ODcwMCkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwv Y2FudmFzL1dlYkdMVGV4dHVyZS5oCSh3b3JraW5nIGNvcHkpCkBAIC02Niw2ICs2Niw5IEBAIHB1 YmxpYzoKICAgICAvLyBEZXRlcm1pbmUgaWYgdGV4dHVyZSBzYW1wbGluZyBzaG91bGQgYWx3YXlz IHJldHVybiBbMCwgMCwgMCwgMV0gKE9wZW5HTCBFUyAyLjAgU2VjIDMuOC4yKS4KICAgICBib29s IG5lZWRUb1VzZUJsYWNrVGV4dHVyZSgpIGNvbnN0OwogCisgICAgYm9vbCBpc0NvbXByZXNzZWQo KSBjb25zdDsKKyAgICB2b2lkIHNldENvbXByZXNzZWQoKTsKKwogICAgIGJvb2wgaGFzRXZlckJl ZW5Cb3VuZCgpIGNvbnN0IHsgcmV0dXJuIG9iamVjdCgpICYmIG1fdGFyZ2V0OyB9CiAKICAgICBz dGF0aWMgR0MzRGludCBjb21wdXRlTGV2ZWxDb3VudChHQzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXpl aSBoZWlnaHQpOwpAQCAtMTIzLDYgKzEyNiw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzTlBP VDsKICAgICBib29sIG1faXNDb21wbGV0ZTsKICAgICBib29sIG1fbmVlZFRvVXNlQmxhY2tUZXh0 dXJlOworICAgIGJvb2wgbV9pc0NvbXByZXNzZWQ7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9vcGVuZ2wvR3JhcGhp Y3NDb250ZXh0M0RPcGVuR0xDb21tb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5j cHAJKHJldmlzaW9uIDE1ODcwMCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L29wZW5nbC9HcmFwaGljc0NvbnRleHQzRE9wZW5HTENvbW1vbi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTY2NSw3ICs2NjUsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpmcm9udEZhY2UoR0Mz RGVuCiB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpnZW5lcmF0ZU1pcG1hcChHQzNEZW51bSB0YXJn ZXQpCiB7CiAgICAgbWFrZUNvbnRleHRDdXJyZW50KCk7Ci0gICAgOjpnbEdlbmVyYXRlTWlwbWFw RVhUKHRhcmdldCk7CisgICAgOjpnbEdlbmVyYXRlTWlwbWFwKHRhcmdldCk7CiB9CiAKIGJvb2wg R3JhcGhpY3NDb250ZXh0M0Q6OmdldEFjdGl2ZUF0dHJpYihQbGF0Zm9ybTNET2JqZWN0IHByb2dy YW0sIEdDM0R1aW50IGluZGV4LCBBY3RpdmVJbmZvJiBpbmZvKQo=