56824 2011-03-22 05:23:43 -0700 [Qt] WebGL: renderbufferStorage() fails with internal format GL_RGBA4 2011-03-22 11:39:53 -0700 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 jarkko.j.sakkinen webkit-unassigned abarth benjamin commit-queue eric jarkko.j.sakkinen webkit.review.bot oldest_to_newest 371337 0 jarkko.j.sakkinen 2011-03-22 05:23:43 -0700 On desktop WebGL method renderbufferStorage() fails with internal format GL_RGBA4 This is shown by the layout test LayoutTests/fast/canvas/webgl/uninitialized-test.html 371339 1 jarkko.j.sakkinen 2011-03-22 05:24:40 -0700 I'm implementing fix in the spirit of this message: http://www.khronos.org/webgl/public-mailing-list/archives/1010/msg00126.html 371341 2 86455 jarkko.j.sakkinen 2011-03-22 05:36:09 -0700 Created attachment 86455 Fallback to GL_RGBA on desktop OpenGL. 371347 3 86455 benjamin 2011-03-22 06:11:27 -0700 Comment on attachment 86455 Fallback to GL_RGBA on desktop OpenGL. View in context: https://bugs.webkit.org/attachment.cgi?id=86455&action=review > Source/WebCore/ChangeLog:10 > + I would prefer you mention the test you are fixing with this patch in the changelog. Just so it is explicit how this change is tested. > Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:1099 > +#if !defined (QT_OPENGL_ES_2) We usually do not put space between defined and the parenthesis. > Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp:1100 > + if (internalformat == RGBA4 || internalformat == RGB565 || internalformat == RGB5_A1) What about DEPTH_STENCIL and DEPTH_COMPONENT16? (just saw those have special case in GraphicsContext3DOpenGL). 371357 4 jarkko.j.sakkinen 2011-03-22 06:36:02 -0700 You're right about your comments about GraphicsContext3DOpenGL. In this case we should use the same logic as there. I'll revise the patch. Thanks. 371384 5 86460 jarkko.j.sakkinen 2011-03-22 07:44:41 -0700 Created attachment 86460 Fixed defects that benjaminp reported. 371413 6 86460 commit-queue 2011-03-22 09:21:23 -0700 Comment on attachment 86460 Fixed defects that benjaminp reported. Clearing flags on attachment: 86460 Committed r81672: <http://trac.webkit.org/changeset/81672> 371414 7 commit-queue 2011-03-22 09:21:27 -0700 All reviewed patches have been landed. Closing bug. 371516 8 webkit.review.bot 2011-03-22 11:39:53 -0700 http://trac.webkit.org/changeset/81672 might have broken GTK Linux 32-bit Debug The following tests are not passing: inspector/debugger/debug-inlined-scripts.html 86455 2011-03-22 05:36:09 -0700 2011-03-22 07:44:41 -0700 Fallback to GL_RGBA on desktop OpenGL. 56284.diff text/plain 1722 jarkko.j.sakkinen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZGMwZDM5Li43ODNlZDAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTEtMDMtMjIgIEphcmtrbyBTYWtraW5lbiAgPGphcmtrby5qLnNha2tpbmVuQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdIFdlYkdMOiByZW5kZXJidWZmZXJTdG9yYWdlKCkgZmFpbHMgd2l0aCBpbnRlcm5hbCBmb3Jt YXQgR0xfUkdCQTQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU2ODI0CisKKyAgICAgICAgT24gZGVza3RvcCBPcGVuR0wgdXNlIEdMX1JHQkEgYXMgaW50 ZXJuYWwgZm9ybWF0IHdoZW4gZ2l2ZW4KKyAgICAgICAgR0xfUkdCQTQsIEdMX1JHQkE1NjUgb3Ig UkdCNV9BMS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4 dDNEUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0M0Q6OnJlbmRlcmJ1 ZmZlclN0b3JhZ2UpOgorCiAyMDExLTAzLTIxICBMZW8gWWFuZyAgPGxlby55YW5nQHRvcmNobW9i aWxlLmNvbS5jbj4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHQz RFF0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29u dGV4dDNEUXQuY3BwCmluZGV4IDhkMzU0N2EuLmU5ZWU4MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQu Y3BwCkBAIC0xMDk2LDcgKzEwOTYsMTIgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6cmVsZWFz ZVNoYWRlckNvbXBpbGVyKCkKIHZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OnJlbmRlcmJ1ZmZlclN0 b3JhZ2UoR0MzRGVudW0gdGFyZ2V0LCBHQzNEZW51bSBpbnRlcm5hbGZvcm1hdCwgR0MzRHNpemVp IHdpZHRoLCBHQzNEc2l6ZWkgaGVpZ2h0KQogewogICAgIG1faW50ZXJuYWwtPm1fZ2xXaWRnZXQt Pm1ha2VDdXJyZW50KCk7Ci0gICAgbV9pbnRlcm5hbC0+cmVuZGVyYnVmZmVyU3RvcmFnZSh0YXJn ZXQsIGludGVybmFsZm9ybWF0LCB3aWR0aCwgaGVpZ2h0KTsKKyNpZiAhZGVmaW5lZCAoUVRfT1BF TkdMX0VTXzIpCisgICAgaWYgKGludGVybmFsZm9ybWF0ID09IFJHQkE0IHx8IGludGVybmFsZm9y bWF0ID09IFJHQjU2NSB8fCBpbnRlcm5hbGZvcm1hdCA9PSBSR0I1X0ExKQorICAgICAgICBtX2lu dGVybmFsLT5yZW5kZXJidWZmZXJTdG9yYWdlKHRhcmdldCwgUkdCQSwgd2lkdGgsIGhlaWdodCk7 CisgICAgZWxzZQorI2VuZGlmCisgICAgICAgIG1faW50ZXJuYWwtPnJlbmRlcmJ1ZmZlclN0b3Jh Z2UodGFyZ2V0LCBpbnRlcm5hbGZvcm1hdCwgd2lkdGgsIGhlaWdodCk7CiB9CiAKIHZvaWQgR3Jh cGhpY3NDb250ZXh0M0Q6OnNhbXBsZUNvdmVyYWdlKEdDM0RjbGFtcGYgdmFsdWUsIEdDM0Rib29s ZWFuIGludmVydCkK 86460 2011-03-22 07:44:41 -0700 2011-03-22 09:21:22 -0700 Fixed defects that benjaminp reported. 56284-2.diff text/plain 2151 jarkko.j.sakkinen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZGMwZDM5Li5kNTQ3MDgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDMtMjIgIEphcmtrbyBTYWtraW5lbiAgPGphcmtrby5qLnNha2tpbmVuQGdtYWls LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb UXRdIFdlYkdMOiByZW5kZXJidWZmZXJTdG9yYWdlKCkgZmFpbHMgd2l0aCBpbnRlcm5hbCBmb3Jt YXQgR0xfUkdCQTQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU2ODI0CisKKyAgICAgICAgT24gZGVza3RvcCBPcGVuR0wgc3Vic3RpdHV0ZSBpbiByZW5k ZXJidWZmZXJTdG9yYWdlOgorICAgICAgICAtIEdMX0RFUFRIMjRfU1RFTkNJTDggZm9yIEdMX0RF UFRIX1NURU5DSUwKKyAgICAgICAgLSBHTF9ERVBUSF9DT01QT05FTlQgZm9yIEdMX0RFUFRIX0NP TVBPTkVOVDE2CisgICAgICAgIC0gR0xfUkdCQSBmb3IgR0xfUkdCQTQgYW5kIEdMX1JHQkE1NjUK KyAgICAgICAgLSBHTF9SR0IgZm9yIFJHQjVfQTEuCisKKyAgICAgICAgVGVzdHM6IGZhc3QvY2Fu dmFzL3dlYmdsL3VuaW5pdGlhbGl6ZWQtdGVzdC5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDNEOjpyZW5kZXJidWZmZXJTdG9yYWdlKToKKwogMjAxMS0wMy0yMSAgTGVv IFlhbmcgIDxsZW8ueWFuZ0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGlyayBTY2h1bHplLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0M0RRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcAppbmRleCA4ZDM1NDdhLi41MGRh OGMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFw aGljc0NvbnRleHQzRFF0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcApAQCAtNDYsNiArNDYsMTAgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogdHlwZWRlZiBjaGFyIEdMY2hhcjsKICNlbmRpZgogCisjaWYgIWRlZmluZWQo R0xfREVQVEgyNF9TVEVOQ0lMOCkKKyNkZWZpbmUgR0xfREVQVEgyNF9TVEVOQ0lMOCAweDg4RjAK KyNlbmRpZgorCiAjaWYgIWRlZmluZWQoQVBJRU5UUlkpCiAjZGVmaW5lIEFQSUVOVFJZCiAjZW5k aWYKQEAgLTEwOTYsNiArMTEwMCwyMyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpyZWxlYXNl U2hhZGVyQ29tcGlsZXIoKQogdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6cmVuZGVyYnVmZmVyU3Rv cmFnZShHQzNEZW51bSB0YXJnZXQsIEdDM0RlbnVtIGludGVybmFsZm9ybWF0LCBHQzNEc2l6ZWkg d2lkdGgsIEdDM0RzaXplaSBoZWlnaHQpCiB7CiAgICAgbV9pbnRlcm5hbC0+bV9nbFdpZGdldC0+ bWFrZUN1cnJlbnQoKTsKKyNpZiAhZGVmaW5lZChRVF9PUEVOR0xfRVNfMikKKyAgICBzd2l0Y2gg KGludGVybmFsZm9ybWF0KSB7CisgICAgY2FzZSBERVBUSF9TVEVOQ0lMOgorICAgICAgICBpbnRl cm5hbGZvcm1hdCA9IEdMX0RFUFRIMjRfU1RFTkNJTDg7CisgICAgICAgIGJyZWFrOworICAgIGNh c2UgREVQVEhfQ09NUE9ORU5UMTY6CisgICAgICAgIGludGVybmFsZm9ybWF0ID0gREVQVEhfQ09N UE9ORU5UOworICAgICAgICBicmVhazsKKyAgICBjYXNlIFJHQkE0OgorICAgIGNhc2UgUkdCNV9B MToKKyAgICAgICAgaW50ZXJuYWxmb3JtYXQgPSBSR0JBOworICAgICAgICBicmVhazsKKyAgICBj YXNlIFJHQjU2NToKKyAgICAgICAgaW50ZXJuYWxmb3JtYXQgPSBSR0I7CisgICAgICAgIGJyZWFr OworICAgIH0KKyNlbmRpZgogICAgIG1faW50ZXJuYWwtPnJlbmRlcmJ1ZmZlclN0b3JhZ2UodGFy Z2V0LCBpbnRlcm5hbGZvcm1hdCwgd2lkdGgsIGhlaWdodCk7CiB9CiAK