35423 2010-02-26 00:10:17 -0800 [Qt] Compile error with 3d-canvas 2010-02-26 13:16:10 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 1 noam webkit-unassigned commit-queue jarkko.sakkinen oldest_to_newest 194018 0 noam 2010-02-26 00:10:17 -0800 When building QtWebkit with 3d-canvas enabled, a compile error occured. That's because the following functions are called directly: glActiveTexture, glSampleCoverage, glBlendEquation, while they should be called using getProcAddress. 194028 1 jarkko.sakkinen 2010-02-26 00:31:27 -0800 I'll start to look into this. 194031 2 49572 jarkko.sakkinen 2010-02-26 01:03:12 -0800 Created attachment 49572 Find function pointers using GET_PROC_ADDRESS macro. 194255 3 49572 commit-queue 2010-02-26 13:16:06 -0800 Comment on attachment 49572 Find function pointers using GET_PROC_ADDRESS macro. Clearing flags on attachment: 49572 Committed r55304: <http://trac.webkit.org/changeset/55304> 194256 4 commit-queue 2010-02-26 13:16:10 -0800 All reviewed patches have been landed. Closing bug. 49572 2010-02-26 01:03:12 -0800 2010-02-26 13:16:06 -0800 Find function pointers using GET_PROC_ADDRESS macro. 35423-1.diff text/plain 5142 jarkko.sakkinen ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTM3NzM2Yy4uMWRiZDU5ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wMi0yNiAgSmFya2tvIFNha2tp bmVuICA8amFya2tvLnNha2tpbmVuQHRpZXRvLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb21waWxhdGlvbiBmYWlsZWQgYmVjYXVzZSBmdW5j dGlvbnMgZ2xTYW1wbGVDb3ZlcmFnZSwgZ2xCbGVuZEVxdWF0aW9uCisgICAgICAgIGFuZCBnbEFj dGl2ZVRleHR1cmUgd2VyZSBub3QgYXZhaWxhYmxlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU0MjMKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NDb250ZXh0M0RJbnRlcm5hbDo6R3JhcGhpY3NDb250ZXh0M0RJbnRlcm5hbCk6CisgICAgICAg IChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6YWN0aXZlVGV4dHVyZSk6CisgICAgICAgIChX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQzRDo6YmxlbmRFcXVhdGlvbik6CisgICAgICAgIChXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQzRDo6c2FtcGxlQ292ZXJhZ2UpOgorCiAyMDEwLTAyLTI1ICBN YXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQnJhZHkg RWlkc29uLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGlj c0NvbnRleHQzRFF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3ND b250ZXh0M0RRdC5jcHAKaW5kZXggNWE1Nzk1OC4uOTgxMGZiYiAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9HcmFwaGljc0NvbnRleHQzRFF0LmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dDNEUXQuY3BwCkBAIC01OSw2 ICs1OSw3IEBAIHR5cGVkZWYgdm9pZCAoQVBJRU5UUlkqIGdsQmluZEJ1ZmZlclR5cGUpIChHTGVu dW0sIEdMdWludCk7CiB0eXBlZGVmIHZvaWQgKEFQSUVOVFJZKiBnbEJpbmRGcmFtZWJ1ZmZlclR5 cGUpIChHTGVudW0sIEdMdWludCk7CiB0eXBlZGVmIHZvaWQgKEFQSUVOVFJZKiBnbEJpbmRSZW5k ZXJidWZmZXJUeXBlKSAoR0xlbnVtLCBHTHVpbnQpOwogdHlwZWRlZiB2b2lkIChBUElFTlRSWSog Z2xCbGVuZENvbG9yVHlwZSkgKEdMY2xhbXBmLCBHTGNsYW1wZiwgR0xjbGFtcGYsIEdMY2xhbXBm KTsKK3R5cGVkZWYgdm9pZCAoQVBJRU5UUlkqIGdsQmxlbmRFcXVhdGlvblR5cGUpIChHTGVudW0p OwogdHlwZWRlZiB2b2lkIChBUElFTlRSWSogZ2xCbGVuZEVxdWF0aW9uU2VwYXJhdGVUeXBlKShH TGVudW0sIEdMZW51bSk7CiB0eXBlZGVmIHZvaWQgKEFQSUVOVFJZKiBnbEJsZW5kRnVuY1NlcGFy YXRlVHlwZSkoR0xlbnVtIHNyY1JHQiwgR0xlbnVtIGRzdFJHQiwgR0xlbnVtIHNyY0FscGhhLCBH TGVudW0gZHN0QWxwaGEpOwogdHlwZWRlZiB2b2lkIChBUElFTlRSWSogZ2xCdWZmZXJEYXRhVHlw ZSkgKEdMZW51bSwgR0xzaXplaXB0ciwgY29uc3QgR0x2b2lkKiwgR0xlbnVtKTsKQEAgLTEwNSw2 ICsxMDYsNyBAQCB0eXBlZGVmIEdMYm9vbGVhbiAoQVBJRU5UUlkqIGdsSXNSZW5kZXJidWZmZXJU eXBlKSAoR0x1aW50KTsKIHR5cGVkZWYgR0xib29sZWFuIChBUElFTlRSWSogZ2xJc1NoYWRlclR5 cGUpIChHTHVpbnQpOwogdHlwZWRlZiB2b2lkIChBUElFTlRSWSogZ2xMaW5rUHJvZ3JhbVR5cGUp IChHTHVpbnQpOwogdHlwZWRlZiB2b2lkIChBUElFTlRSWSogZ2xSZW5kZXJidWZmZXJTdG9yYWdl VHlwZSkgKEdMZW51bSwgR0xlbnVtLCBHTHNpemVpLCBHTHNpemVpKTsKK3R5cGVkZWYgdm9pZCAo QVBJRU5UUlkqIGdsU2FtcGxlQ292ZXJhZ2VUeXBlKSAoR0xjbGFtcGYsIEdMYm9vbGVhbik7CiB0 eXBlZGVmIHZvaWQgKEFQSUVOVFJZKiBnbFNoYWRlclNvdXJjZVR5cGUpIChHTHVpbnQsIEdMc2l6 ZWksIGNvbnN0IGNoYXIqKiwgY29uc3QgR0xpbnQqKTsKIHR5cGVkZWYgdm9pZCAoQVBJRU5UUlkq IGdsU3RlbmNpbEZ1bmNTZXBhcmF0ZVR5cGUpIChHTGVudW0sIEdMZW51bSwgR0xpbnQsIEdMdWlu dCk7CiB0eXBlZGVmIHZvaWQgKEFQSUVOVFJZKiBnbFN0ZW5jaWxNYXNrU2VwYXJhdGVUeXBlKSAo R0xlbnVtLCBHTHVpbnQpOwpAQCAtMTU0LDYgKzE1Niw3IEBAIHB1YmxpYzoKICAgICBnbEJpbmRG cmFtZWJ1ZmZlclR5cGUgYmluZEZyYW1lYnVmZmVyOwogICAgIGdsQmluZFJlbmRlcmJ1ZmZlclR5 cGUgYmluZFJlbmRlcmJ1ZmZlcjsKICAgICBnbEJsZW5kQ29sb3JUeXBlIGJsZW5kQ29sb3I7Cisg ICAgZ2xCbGVuZEVxdWF0aW9uVHlwZSBibGVuZEVxdWF0aW9uOwogICAgIGdsQmxlbmRFcXVhdGlv blNlcGFyYXRlVHlwZSBibGVuZEVxdWF0aW9uU2VwYXJhdGU7CiAgICAgZ2xCbGVuZEZ1bmNTZXBh cmF0ZVR5cGUgYmxlbmRGdW5jU2VwYXJhdGU7CiAgICAgZ2xCdWZmZXJEYXRhVHlwZSBidWZmZXJE YXRhOwpAQCAtMjAwLDYgKzIwMyw3IEBAIHB1YmxpYzoKICAgICBnbElzU2hhZGVyVHlwZSBpc1No YWRlcjsKICAgICBnbExpbmtQcm9ncmFtVHlwZSBsaW5rUHJvZ3JhbTsKICAgICBnbFJlbmRlcmJ1 ZmZlclN0b3JhZ2VUeXBlIHJlbmRlcmJ1ZmZlclN0b3JhZ2U7CisgICAgZ2xTYW1wbGVDb3ZlcmFn ZVR5cGUgc2FtcGxlQ292ZXJhZ2U7CiAgICAgZ2xTaGFkZXJTb3VyY2VUeXBlIHNoYWRlclNvdXJj ZTsKICAgICBnbFN0ZW5jaWxGdW5jU2VwYXJhdGVUeXBlIHN0ZW5jaWxGdW5jU2VwYXJhdGU7CiAg ICAgZ2xTdGVuY2lsTWFza1NlcGFyYXRlVHlwZSBzdGVuY2lsTWFza1NlcGFyYXRlOwpAQCAtMjkz LDYgKzI5Nyw3IEBAIEdyYXBoaWNzQ29udGV4dDNESW50ZXJuYWw6OkdyYXBoaWNzQ29udGV4dDNE SW50ZXJuYWwoR3JhcGhpY3NDb250ZXh0M0Q6OkF0dHJpYnV0CiAgICAgYmluZEZyYW1lYnVmZmVy ID0gR0VUX1BST0NfQUREUkVTUyhnbEJpbmRGcmFtZWJ1ZmZlcik7CiAgICAgYmluZFJlbmRlcmJ1 ZmZlciA9IEdFVF9QUk9DX0FERFJFU1MoZ2xCaW5kUmVuZGVyYnVmZmVyKTsKICAgICBibGVuZENv bG9yID0gR0VUX1BST0NfQUREUkVTUyhnbEJsZW5kQ29sb3IpOworICAgIGJsZW5kRXF1YXRpb24g PSBHRVRfUFJPQ19BRERSRVNTKGdsQmxlbmRFcXVhdGlvbik7CiAgICAgYmxlbmRFcXVhdGlvblNl cGFyYXRlID0gR0VUX1BST0NfQUREUkVTUyhnbEJsZW5kRXF1YXRpb25TZXBhcmF0ZSk7CiAgICAg YmxlbmRGdW5jU2VwYXJhdGUgPSBHRVRfUFJPQ19BRERSRVNTKGdsQmxlbmRGdW5jU2VwYXJhdGUp OwogICAgIGJ1ZmZlckRhdGEgPSBHRVRfUFJPQ19BRERSRVNTKGdsQnVmZmVyRGF0YSk7CkBAIC0z MzksNiArMzQ0LDcgQEAgR3JhcGhpY3NDb250ZXh0M0RJbnRlcm5hbDo6R3JhcGhpY3NDb250ZXh0 M0RJbnRlcm5hbChHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXQKICAgICBpc1NoYWRlciA9IEdF VF9QUk9DX0FERFJFU1MoZ2xJc1NoYWRlcik7CiAgICAgbGlua1Byb2dyYW0gPSBHRVRfUFJPQ19B RERSRVNTKGdsTGlua1Byb2dyYW0pOwogICAgIHJlbmRlcmJ1ZmZlclN0b3JhZ2UgPSBHRVRfUFJP Q19BRERSRVNTKGdsUmVuZGVyYnVmZmVyU3RvcmFnZSk7CisgICAgc2FtcGxlQ292ZXJhZ2UgPSBH RVRfUFJPQ19BRERSRVNTKGdsU2FtcGxlQ292ZXJhZ2UpOwogICAgIHNoYWRlclNvdXJjZSA9IEdF VF9QUk9DX0FERFJFU1MoZ2xTaGFkZXJTb3VyY2UpOwogICAgIHN0ZW5jaWxGdW5jU2VwYXJhdGUg PSBHRVRfUFJPQ19BRERSRVNTKGdsU3RlbmNpbEZ1bmNTZXBhcmF0ZSk7CiAgICAgc3RlbmNpbE1h c2tTZXBhcmF0ZSA9IEdFVF9QUk9DX0FERFJFU1MoZ2xTdGVuY2lsTWFza1NlcGFyYXRlKTsKQEAg LTUzMSw3ICs1MzcsNyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDNEOjpyZXNoYXBlKGludCB3aWR0 aCwgaW50IGhlaWdodCkKIHZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OmFjdGl2ZVRleHR1cmUodW5z aWduZWQgbG9uZyB0ZXh0dXJlKQogewogICAgIG1faW50ZXJuYWwtPm1fZ2xXaWRnZXQtPm1ha2VD dXJyZW50KCk7Ci0gICAgZ2xBY3RpdmVUZXh0dXJlKHRleHR1cmUpOworICAgIG1faW50ZXJuYWwt PmFjdGl2ZVRleHR1cmUodGV4dHVyZSk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0M0Q6OmF0 dGFjaFNoYWRlcihXZWJHTFByb2dyYW0qIHByb2dyYW0sIFdlYkdMU2hhZGVyKiBzaGFkZXIpCkBA IC01ODMsNyArNTg5LDcgQEAgdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6YmxlbmRDb2xvcihkb3Vi bGUgcmVkLCBkb3VibGUgZ3JlZW4sIGRvdWJsZSBibHVlLCBkb3VibGUKIHZvaWQgR3JhcGhpY3ND b250ZXh0M0Q6OmJsZW5kRXF1YXRpb24odW5zaWduZWQgbG9uZyBtb2RlKQogewogICAgIG1faW50 ZXJuYWwtPm1fZ2xXaWRnZXQtPm1ha2VDdXJyZW50KCk7Ci0gICAgZ2xCbGVuZEVxdWF0aW9uKG1v ZGUpOworICAgIG1faW50ZXJuYWwtPmJsZW5kRXF1YXRpb24obW9kZSk7CiB9CiAKIHZvaWQgR3Jh cGhpY3NDb250ZXh0M0Q6OmJsZW5kRXF1YXRpb25TZXBhcmF0ZSh1bnNpZ25lZCBsb25nIG1vZGVS R0IsIHVuc2lnbmVkIGxvbmcgbW9kZUFscGhhKQpAQCAtMTAwNCw3ICsxMDEwLDcgQEAgdm9pZCBH cmFwaGljc0NvbnRleHQzRDo6cmVuZGVyYnVmZmVyU3RvcmFnZSh1bnNpZ25lZCBsb25nIHRhcmdl dCwgdW5zaWduZWQgbG9uZwogdm9pZCBHcmFwaGljc0NvbnRleHQzRDo6c2FtcGxlQ292ZXJhZ2Uo ZG91YmxlIHZhbHVlLCBib29sIGludmVydCkKIHsKICAgICBtX2ludGVybmFsLT5tX2dsV2lkZ2V0 LT5tYWtlQ3VycmVudCgpOwotICAgIGdsU2FtcGxlQ292ZXJhZ2Uoc3RhdGljX2Nhc3Q8ZmxvYXQ+ KHZhbHVlKSwgaW52ZXJ0KTsKKyAgICBtX2ludGVybmFsLT5zYW1wbGVDb3ZlcmFnZShzdGF0aWNf Y2FzdDxmbG9hdD4odmFsdWUpLCBpbnZlcnQpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDNE OjpzY2lzc29yKGxvbmcgeCwgbG9uZyB5LCB1bnNpZ25lZCBsb25nIHdpZHRoLCB1bnNpZ25lZCBs b25nIGhlaWdodCkK