82178 2012-03-26 02:16:57 -0700 [Qt]WK2] TextureMapperShaderManager should query the program map before creating new shader program instances. 2012-03-26 04:18:01 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zeno zeno noam oldest_to_newest 587552 0 zeno 2012-03-26 02:16:57 -0700 This bug was introduced by r111986 and the subsequent compile fix r111992. ThextureMapperShaderManager has a map that holds references to all shader programs. If this map does not contain a shader program of the requested type, a new shader program should be created and a reference to it will be stored in the map. If the requested type exists in the map already, a reference to the existing instance shall be returned. See also: https://bugs.webkit.org/show_bug.cgi?id=82049 587572 1 133761 zeno 2012-03-26 03:15:54 -0700 Created attachment 133761 patch for review. 587605 2 133761 zeno 2012-03-26 04:17:53 -0700 Comment on attachment 133761 patch for review. Clearing flags on attachment: 133761 Committed r112075: <http://trac.webkit.org/changeset/112075> 587606 3 zeno 2012-03-26 04:18:01 -0700 All reviewed patches have been landed. Closing bug. 133761 2012-03-26 03:15:54 -0700 2012-03-26 04:17:53 -0700 patch for review. 82178_20120326-121427.patch text/plain 1655 zeno ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ZGE4NTBkLi43MjhlNTA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDMtMjYgIFplbm8gQWxiaXNzZXIgIDx6ZW5vQHdlYmtpdC5vcmc+CisKKyAgICAg ICAgW1F0XVdLMl0gVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIgc2hvdWxkIHF1ZXJ5IHRoZSBw cm9ncmFtIG1hcCBiZWZvcmUgY3JlYXRpbmcgbmV3IHNoYWRlciBwcm9ncmFtIGluc3RhbmNlcy4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyMTc4CisK KyAgICAgICAgSWYgVGV4dHVyZU1hcHBlclNoYWRlck1hbmFnZXIgYWxyZWFkeSBoYXMgYSByZWZl cmVuY2UgdG8gYW4gaW5zdGFuY2Ugb2YgdGhlCisgICAgICAgIHJlcXVlc3RlZCBzaGFkZXIgcHJv Z3JhbSB0eXBlLCB0aGlzIGluc3RhbmNlIHNob3VsZCBiZSByZXVzZWQgaW5zdGVhZCBvZgorICAg ICAgICBjcmVhdGluZyBhIG5ldyBvbmUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBl clNoYWRlck1hbmFnZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJTaGFkZXJN YW5hZ2VyOjpnZXRTaGFkZXJQcm9ncmFtKToKKwogMjAxMi0wMy0yNiAgUGF2ZWwgRmVsZG1hbiAg PHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBicmVha3Bv aW50cyBzaG91bGQgYmUgZGlzYWJsZWQgd2hpbGUgbGl2ZSBlZGl0aW5nIEphdmFTY3JpcHQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlclNoYWRlck1hbmFnZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5oCmluZGV4IGRjN2RmY2UuLmQ4NDMy NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyU2hhZGVyTWFuYWdlci5oCkBAIC0xMDcsNiAr MTA3LDEwIEBAIHB1YmxpYzoKICAgICAgICAgaWYgKHNoYWRlclR5cGUgPT0gSW52YWxpZCkKICAg ICAgICAgICAgIHJldHVybiBwcm9ncmFtOwogCisgICAgICAgIFRleHR1cmVNYXBwZXJTaGFkZXJQ cm9ncmFtTWFwOjppdGVyYXRvciBpdCA9IG1fdGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW1NYXAu ZmluZChzaGFkZXJUeXBlKTsKKyAgICAgICAgaWYgKGl0ICE9IG1fdGV4dHVyZU1hcHBlclNoYWRl clByb2dyYW1NYXAuZW5kKCkpCisgICAgICAgICAgICByZXR1cm4gaXQtPnNlY29uZDsKKwogICAg ICAgICBzd2l0Y2ggKHNoYWRlclR5cGUpIHsKICAgICAgICAgY2FzZSBTaW1wbGU6CiAgICAgICAg ICAgICBwcm9ncmFtID0gVGV4dHVyZU1hcHBlclNoYWRlclByb2dyYW1TaW1wbGU6OmNyZWF0ZSgp Owo=