126926 2014-01-13 12:22:31 -0800 [WebGL] WebGLRenderingContext::validateCompressedTexDimensions Improperly Calculates Values 2014-01-15 09:06:40 -0800 1 1 1 Unclassified WebKit WebGL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham commit-queue dino esprehn+autocc gyuyoung.kim kondapallykalyan roger_fong simon.fraser webkit-bug-importer oldest_to_newest 967446 0 bfulgham 2014-01-13 12:22:31 -0800 The logic in WebGLRenderingContext::validateCompressedTexDimensions is overly permissive. For example, it claims that 256x256 is a valid set of dimensions for a 1x1 buffer. 968091 1 bfulgham 2014-01-14 16:34:03 -0800 <rdar://problem/15818118> 968099 2 bfulgham 2014-01-14 16:52:03 -0800 Part of the problem is that it doesn't actually validate that the dimensions are correct, just that they are even multiples of the compression block size. 968115 3 221218 bfulgham 2014-01-14 17:49:27 -0800 Created attachment 221218 Patch 968119 4 221218 dino 2014-01-14 17:52:44 -0800 Comment on attachment 221218 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=221218&action=review > Source/WebCore/html/canvas/WebGLRenderingContext.cpp:5391 > + const GC3Dint maxTextureSize = (target) ? m_maxTextureSize : m_maxCubeMapTextureSize; No need for () 968122 5 bfulgham 2014-01-14 17:59:42 -0800 Committed r162031: <http://trac.webkit.org/changeset/162031> 968185 6 simon.fraser 2014-01-14 23:09:37 -0800 Still seeing some test output diffs: http://build.webkit.org/results/Apple%20Mavericks%20Release%20WK2%20(Tests)/r162050%20(2225)/fast/canvas/webgl/webgl-compressed-texture-size-limit-pretty-diff.html 968337 7 bfulgham 2014-01-15 09:06:08 -0800 (In reply to comment #6) > Still seeing some test output diffs: > http://build.webkit.org/results/Apple%20Mavericks%20Release%20WK2%20(Tests)/r162050%20(2225)/fast/canvas/webgl/webgl-compressed-texture-size-limit-pretty-diff.html I added a ML baseline for the difference in driver error output. 968338 8 bfulgham 2014-01-15 09:06:40 -0800 ML Rebaseline in https://trac.webkit.org/r162070. 221218 2014-01-14 17:49:27 -0800 2014-01-14 17:52:44 -0800 Patch bug-126926-20140114174926.patch text/plain 5062 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjAyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAxLTE0ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJHTF0gV2ViR0xSZW5k ZXJpbmdDb250ZXh0Ojp2YWxpZGF0ZUNvbXByZXNzZWRUZXhEaW1lbnNpb25zIGltcHJvcGVybHkg Y2FsY3VsYXRlcyB2YWx1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEyNjkyNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRlc3QgY292ZXJhZ2UgaW4gZmFzdC9jYW52YXMvd2ViZ2wvd2ViZ2wtY29tcHJl c3NlZC10ZXh0dXJlLXNpemUtbGltaXQuaHRtbAorCisgICAgICAgICogaHRtbC9jYW52YXMvV2Vi R0xSZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdMUmVuZGVyaW5n Q29udGV4dDo6Y29tcHJlc3NlZFRleEltYWdlMkQpOiBQYXNzIHRhcmdldCB0bworICAgICAgICB2 YWxpZGF0aW9uIGZ1bmN0aW9uLgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250 ZXh0Ojp2YWxpZGF0ZUNvbXByZXNzZWRUZXhEaW1lbnNpb25zKTogUmV2aXNlCisgICAgICAgIGNh bGN1bGF0aW9uIHRvIGFsc28gY29uZmlybSBzaXplIGlzIGluIGJvdW5kcy4KKyAgICAgICAgKFdl YkNvcmU6OldlYkdMUmVuZGVyaW5nQ29udGV4dDo6dmFsaWRhdGVDb21wcmVzc2VkVGV4U3ViRGlt ZW5zaW9ucyk6IFBhc3MKKyAgICAgICB0YXJnZXQgdG8gdmFsaWRhdGlvbiBmdW5jdGlvbi4KKyAg ICAgICAgKiBodG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuaDogTW9kaWZ5IHNpZ25h dHVyZS4KKwogMjAxNC0wMS0xNCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNv bT4KIAogICAgICAgICBBdm9pZCBQTEFURk9STSgpIG1hY3JvcyBpbiBleHBvcnRlZCBoZWFkZXJz LgpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRl cmluZ0NvbnRleHQuY3BwCShyZXZpc2lvbiAxNjIwMDkpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzI2 LDcgKzEzMjYsNyBAQCB2b2lkIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Y29tcHJlc3NlZFRlCiAg ICAgICAgIHN5bnRoZXNpemVHTEVycm9yKEdyYXBoaWNzQ29udGV4dDNEOjpJTlZBTElEX1ZBTFVF LCAiY29tcHJlc3NlZFRleEltYWdlMkQiLCAiYm9yZGVyIG5vdCAwIik7CiAgICAgICAgIHJldHVy bjsKICAgICB9Ci0gICAgaWYgKCF2YWxpZGF0ZUNvbXByZXNzZWRUZXhEaW1lbnNpb25zKCJjb21w cmVzc2VkVGV4SW1hZ2UyRCIsIGxldmVsLCB3aWR0aCwgaGVpZ2h0LCBpbnRlcm5hbGZvcm1hdCkp CisgICAgaWYgKCF2YWxpZGF0ZUNvbXByZXNzZWRUZXhEaW1lbnNpb25zKCJjb21wcmVzc2VkVGV4 SW1hZ2UyRCIsIHRhcmdldCwgbGV2ZWwsIHdpZHRoLCBoZWlnaHQsIGludGVybmFsZm9ybWF0KSkK ICAgICAgICAgcmV0dXJuOwogICAgIGlmICghdmFsaWRhdGVDb21wcmVzc2VkVGV4RnVuY0RhdGEo ImNvbXByZXNzZWRUZXhJbWFnZTJEIiwgd2lkdGgsIGhlaWdodCwgaW50ZXJuYWxmb3JtYXQsIGRh dGEpKQogICAgICAgICByZXR1cm47CkBAIC01Mzc5LDIwICs1Mzc5LDIyIEBAIGJvb2wgV2ViR0xS ZW5kZXJpbmdDb250ZXh0Ojp2YWxpZGF0ZUNvbXAKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9v bCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnZhbGlkYXRlQ29tcHJlc3NlZFRleERpbWVuc2lvbnMo Y29uc3QgY2hhciogZnVuY3Rpb25OYW1lLCBHQzNEaW50IGxldmVsLCBHQzNEc2l6ZWkgd2lkdGgs IEdDM0RzaXplaSBoZWlnaHQsIEdDM0RlbnVtIGZvcm1hdCkKK2Jvb2wgV2ViR0xSZW5kZXJpbmdD b250ZXh0Ojp2YWxpZGF0ZUNvbXByZXNzZWRUZXhEaW1lbnNpb25zKGNvbnN0IGNoYXIqIGZ1bmN0 aW9uTmFtZSwgR0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50IGxldmVsLCBHQzNEc2l6ZWkgd2lkdGgs IEdDM0RzaXplaSBoZWlnaHQsIEdDM0RlbnVtIGZvcm1hdCkKIHsKICAgICBzd2l0Y2ggKGZvcm1h dCkgewogICAgIGNhc2UgRXh0ZW5zaW9uczNEOjpDT01QUkVTU0VEX1JHQl9TM1RDX0RYVDFfRVhU OgogICAgIGNhc2UgRXh0ZW5zaW9uczNEOjpDT01QUkVTU0VEX1JHQkFfUzNUQ19EWFQxX0VYVDoK ICAgICBjYXNlIEV4dGVuc2lvbnMzRDo6Q09NUFJFU1NFRF9SR0JBX1MzVENfRFhUM19FWFQ6CiAg ICAgY2FzZSBFeHRlbnNpb25zM0Q6OkNPTVBSRVNTRURfUkdCQV9TM1RDX0RYVDVfRVhUOiB7Ci0g ICAgICAgIGNvbnN0IGludCBrQmxvY2tXaWR0aCA9IDQ7Ci0gICAgICAgIGNvbnN0IGludCBrQmxv Y2tIZWlnaHQgPSA0OwotICAgICAgICBib29sIHdpZHRoVmFsaWQgPSAobGV2ZWwgJiYgd2lkdGgg PT0gMSkgfHwgKGxldmVsICYmIHdpZHRoID09IDIpIHx8ICEod2lkdGggJSBrQmxvY2tXaWR0aCk7 Ci0gICAgICAgIGJvb2wgaGVpZ2h0VmFsaWQgPSAobGV2ZWwgJiYgaGVpZ2h0ID09IDEpIHx8IChs ZXZlbCAmJiBoZWlnaHQgPT0gMikgfHwgIShoZWlnaHQgJSBrQmxvY2tIZWlnaHQpOworICAgICAg ICBjb25zdCBHQzNEc2l6ZWkga0Jsb2NrV2lkdGggPSA0OworICAgICAgICBjb25zdCBHQzNEc2l6 ZWkga0Jsb2NrSGVpZ2h0ID0gNDsKKyAgICAgICAgY29uc3QgR0MzRGludCBtYXhUZXh0dXJlU2l6 ZSA9ICh0YXJnZXQpID8gbV9tYXhUZXh0dXJlU2l6ZSA6IG1fbWF4Q3ViZU1hcFRleHR1cmVTaXpl OworICAgICAgICBjb25zdCBHQzNEc2l6ZWkgbWF4Q29tcHJlc3NlZERpbWVuc2lvbiA9IG1heFRl eHR1cmVTaXplID4+IGxldmVsOworICAgICAgICBib29sIHdpZHRoVmFsaWQgPSAobGV2ZWwgJiYg d2lkdGggPT0gMSkgfHwgKGxldmVsICYmIHdpZHRoID09IDIpIHx8ICghKHdpZHRoICUga0Jsb2Nr V2lkdGgpICYmIHdpZHRoIDw9IG1heENvbXByZXNzZWREaW1lbnNpb24pOworICAgICAgICBib29s IGhlaWdodFZhbGlkID0gKGxldmVsICYmIGhlaWdodCA9PSAxKSB8fCAobGV2ZWwgJiYgaGVpZ2h0 ID09IDIpIHx8ICghKGhlaWdodCAlIGtCbG9ja0hlaWdodCkgJiYgaGVpZ2h0IDw9IG1heENvbXBy ZXNzZWREaW1lbnNpb24pOwogICAgICAgICBpZiAoIXdpZHRoVmFsaWQgfHwgIWhlaWdodFZhbGlk KSB7Ci0gICAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFM SURfT1BFUkFUSU9OLCBmdW5jdGlvbk5hbWUsICJ3aWR0aCBvciBoZWlnaHQgaW52YWxpZCBmb3Ig bGV2ZWwiKTsKLSAgICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgICAgICBzeW50aGVzaXpl R0xFcnJvcihHcmFwaGljc0NvbnRleHQzRDo6SU5WQUxJRF9WQUxVRSwgZnVuY3Rpb25OYW1lLCAi d2lkdGggb3IgaGVpZ2h0IGludmFsaWQgZm9yIGxldmVsIik7CisgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpAQCAtNTQyNSw3 ICs1NDI3LDcgQEAgYm9vbCBXZWJHTFJlbmRlcmluZ0NvbnRleHQ6OnZhbGlkYXRlQ29tcAogICAg ICAgICAgICAgc3ludGhlc2l6ZUdMRXJyb3IoR3JhcGhpY3NDb250ZXh0M0Q6OklOVkFMSURfT1BF UkFUSU9OLCBmdW5jdGlvbk5hbWUsICJkaW1lbnNpb25zIG91dCBvZiByYW5nZSIpOwogICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiB2YWxpZGF0ZUNv bXByZXNzZWRUZXhEaW1lbnNpb25zKGZ1bmN0aW9uTmFtZSwgbGV2ZWwsIHdpZHRoLCBoZWlnaHQs IGZvcm1hdCk7CisgICAgICAgIHJldHVybiB2YWxpZGF0ZUNvbXByZXNzZWRUZXhEaW1lbnNpb25z KGZ1bmN0aW9uTmFtZSwgdGFyZ2V0LCBsZXZlbCwgd2lkdGgsIGhlaWdodCwgZm9ybWF0KTsKICAg ICB9CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIGZhbHNlOwpJbmRleDogU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0LmgJKHJldmlz aW9uIDE2MjAwOSkKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5n Q29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC02NjQsNyArNjY0LDcgQEAgcHJpdmF0ZToKIAog ICAgIC8vIEhlbHBlciBmdW5jdGlvbiB0byB2YWxpZGF0ZSBjb21wcmVzc2VkIHRleHR1cmUgZGlt ZW5zaW9ucyBhcmUgdmFsaWQgZm9yCiAgICAgLy8gdGhlIGdpdmVuIGZvcm1hdC4KLSAgICBib29s IHZhbGlkYXRlQ29tcHJlc3NlZFRleERpbWVuc2lvbnMoY29uc3QgY2hhciogZnVuY3Rpb25OYW1l LCBHQzNEaW50IGxldmVsLCBHQzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXplaSBoZWlnaHQsIEdDM0Rl bnVtIGZvcm1hdCk7CisgICAgYm9vbCB2YWxpZGF0ZUNvbXByZXNzZWRUZXhEaW1lbnNpb25zKGNv bnN0IGNoYXIqIGZ1bmN0aW9uTmFtZSwgR0MzRGVudW0gdGFyZ2V0LCBHQzNEaW50IGxldmVsLCBH QzNEc2l6ZWkgd2lkdGgsIEdDM0RzaXplaSBoZWlnaHQsIEdDM0RlbnVtIGZvcm1hdCk7CiAKICAg ICAvLyBIZWxwZXIgZnVuY3Rpb24gdG8gdmFsaWRhdGUgY29tcHJlc3NlZCB0ZXh0dXJlIGRpbWVu c2lvbnMgYXJlIHZhbGlkIGZvcgogICAgIC8vIHRoZSBnaXZlbiBmb3JtYXQuCg==