55534 2011-03-01 17:18:39 -0800 Clean up macros in Extensions3DOpenGL.cpp 2011-03-02 06:55:35 -0800 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer aroben cmarrin dino kbr mdelaney7 oldest_to_newest 360419 0 84332 ddkilzer 2011-03-01 17:18:39 -0800 Created attachment 84332 Patch Reviewed by NOBODY (OOPS!). Change "#if GL_APPLE_vertex_array_object" macros to check that GL_APPLE_vertex_array_object is both defined and non-zero. * platform/graphics/opengl/Extensions3DOpenGL.cpp: (WebCore::Extensions3DOpenGL::createVertexArrayOES): (WebCore::Extensions3DOpenGL::deleteVertexArrayOES): Remove empty #else clause. (WebCore::Extensions3DOpenGL::isVertexArrayOES): (WebCore::Extensions3DOpenGL::bindVertexArrayOES): Add early return check. Remove #else clause that would never have compiled (since array is not a WTF::String). --- 2 files changed, 25 insertions(+), 7 deletions(-) 360433 1 84332 darin 2011-03-01 17:31:30 -0800 Comment on attachment 84332 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=84332&action=review > Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp:137 > -#if GL_APPLE_vertex_array_object > +#if defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object I think this only works properly in MSVC if you leave off the parentheses. #if defined GL_APPLE_vertex_array_object && GL_APPLE_vertex_array_object I think it would be best to use the syntax that works in MSVC even if that’s not a real issue here. 360767 2 ddkilzer 2011-03-02 06:46:37 -0800 (In reply to comment #1) > I think it would be best to use the syntax that works in MSVC even if that’s not a real issue here. Done. 360769 3 ddkilzer 2011-03-02 06:48:47 -0800 Committed r80124: <http://trac.webkit.org/changeset/80124> 360771 4 aroben 2011-03-02 06:55:35 -0800 (In reply to comment #1) > (From update of attachment 84332 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=84332&action=review > > > Source/WebCore/platform/graphics/opengl/Extensions3DOpenGL.cpp:137 > > -#if GL_APPLE_vertex_array_object > > +#if defined(GL_APPLE_vertex_array_object) && GL_APPLE_vertex_array_object > > I think this only works properly in MSVC if you leave off the parentheses. > > #if defined GL_APPLE_vertex_array_object && GL_APPLE_vertex_array_object > > I think it would be best to use the syntax that works in MSVC even if that’s not a real issue here. I believe MSVC can handle the parentheses in this case just fine. For some reason it doesn't like them if you add them to the definition of the PLATFORM() macro, though; maybe it's something about the ## operator? 84332 2011-03-01 17:18:39 -0800 2011-03-01 17:31:30 -0800 Patch 20110301171838.patch text/plain 2988 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogODAwMjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzMjc4YmE2MTJkZTNhNDdk YWUxYmQxYTU4ZTIyYzg0ODhmMjdhMTFkLi4xM2M3ZTNlYTU0ZjI3NDRlY2E3YmRhOThkYmUwYjMw ZDc2YjMxMDY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDMtMDEgIERhdmlk IEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCBtYWNyb3Mg aW4gRXh0ZW5zaW9uczNET3BlbkdMLmNwcAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENoYW5nZSAiI2lmIEdMX0FQUExFX3ZlcnRleF9hcnJheV9vYmpl Y3QiIG1hY3JvcyB0byBjaGVjayB0aGF0CisgICAgICAgIEdMX0FQUExFX3ZlcnRleF9hcnJheV9v YmplY3QgaXMgYm90aCBkZWZpbmVkIGFuZCBub24temVyby4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0wuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RXh0ZW5zaW9uczNET3BlbkdMOjpjcmVhdGVWZXJ0ZXhBcnJheU9FUyk6CisgICAgICAgIChX ZWJDb3JlOjpFeHRlbnNpb25zM0RPcGVuR0w6OmRlbGV0ZVZlcnRleEFycmF5T0VTKTogUmVtb3Zl CisgICAgICAgIGVtcHR5ICNlbHNlIGNsYXVzZS4KKyAgICAgICAgKFdlYkNvcmU6OkV4dGVuc2lv bnMzRE9wZW5HTDo6aXNWZXJ0ZXhBcnJheU9FUyk6CisgICAgICAgIChXZWJDb3JlOjpFeHRlbnNp b25zM0RPcGVuR0w6OmJpbmRWZXJ0ZXhBcnJheU9FUyk6IEFkZCBlYXJseQorICAgICAgICByZXR1 cm4gY2hlY2suICBSZW1vdmUgI2Vsc2UgY2xhdXNlIHRoYXQgd291bGQgbmV2ZXIgaGF2ZQorICAg ICAgICBjb21waWxlZCAoc2luY2UgYXJyYXkgaXMgbm90IGEgV1RGOjpTdHJpbmcpLgorCiAyMDEx LTAzLTAxICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9vcGVuZ2wvRXh0ZW5zaW9uczNET3BlbkdMLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0wuY3BwCmluZGV4IGQ3NjFl YjlhOTM4OGIwNzAyOTBkOTE5MTY4ZDQ4MjY3Y2YyYWExMjAuLmE3NzczNThkY2M1YzZlODAzOWMy Y2E3MWUyM2YyZDQ5NmEwYzI5YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0wuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL29wZW5nbC9FeHRlbnNpb25zM0RPcGVuR0wuY3BwCkBAIC0x MzQsNyArMTM0LDcgQEAgdm9pZCBFeHRlbnNpb25zM0RPcGVuR0w6OnJlbmRlcmJ1ZmZlclN0b3Jh Z2VNdWx0aXNhbXBsZSh1bnNpZ25lZCBsb25nIHRhcmdldCwgdW4KIFBsYXRmb3JtM0RPYmplY3Qg RXh0ZW5zaW9uczNET3BlbkdMOjpjcmVhdGVWZXJ0ZXhBcnJheU9FUygpCiB7CiAgICAgbV9jb250 ZXh0LT5tYWtlQ29udGV4dEN1cnJlbnQoKTsKLSNpZiBHTF9BUFBMRV92ZXJ0ZXhfYXJyYXlfb2Jq ZWN0CisjaWYgZGVmaW5lZChHTF9BUFBMRV92ZXJ0ZXhfYXJyYXlfb2JqZWN0KSAmJiBHTF9BUFBM RV92ZXJ0ZXhfYXJyYXlfb2JqZWN0CiAgICAgR0x1aW50IGFycmF5ID0gMDsKICAgICBnbEdlblZl cnRleEFycmF5c0FQUExFKDEsICZhcnJheSk7CiAgICAgcmV0dXJuIGFycmF5OwpAQCAtMTQ5LDkg KzE0OSw4IEBAIHZvaWQgRXh0ZW5zaW9uczNET3BlbkdMOjpkZWxldGVWZXJ0ZXhBcnJheU9FUyhQ bGF0Zm9ybTNET2JqZWN0IGFycmF5KQogICAgICAgICByZXR1cm47CiAgICAgCiAgICAgbV9jb250 ZXh0LT5tYWtlQ29udGV4dEN1cnJlbnQoKTsKLSNpZiBHTF9BUFBMRV92ZXJ0ZXhfYXJyYXlfb2Jq ZWN0CisjaWYgZGVmaW5lZChHTF9BUFBMRV92ZXJ0ZXhfYXJyYXlfb2JqZWN0KSAmJiBHTF9BUFBM RV92ZXJ0ZXhfYXJyYXlfb2JqZWN0CiAgICAgZ2xEZWxldGVWZXJ0ZXhBcnJheXNBUFBMRSgxLCAm YXJyYXkpOwotI2Vsc2UKICNlbmRpZgogfQogCkBAIC0xNjEsNyArMTYwLDcgQEAgR0MzRGJvb2xl YW4gRXh0ZW5zaW9uczNET3BlbkdMOjppc1ZlcnRleEFycmF5T0VTKFBsYXRmb3JtM0RPYmplY3Qg YXJyYXkpCiAgICAgICAgIHJldHVybiBHTF9GQUxTRTsKICAgICAKICAgICBtX2NvbnRleHQtPm1h a2VDb250ZXh0Q3VycmVudCgpOwotI2lmIEdMX0FQUExFX3ZlcnRleF9hcnJheV9vYmplY3QKKyNp ZiBkZWZpbmVkKEdMX0FQUExFX3ZlcnRleF9hcnJheV9vYmplY3QpICYmIEdMX0FQUExFX3ZlcnRl eF9hcnJheV9vYmplY3QKICAgICByZXR1cm4gZ2xJc1ZlcnRleEFycmF5QVBQTEUoYXJyYXkpOwog I2Vsc2UKICAgICByZXR1cm4gR0xfRkFMU0U7CkBAIC0xNzAsMTEgKzE2OSwxMiBAQCBHQzNEYm9v bGVhbiBFeHRlbnNpb25zM0RPcGVuR0w6OmlzVmVydGV4QXJyYXlPRVMoUGxhdGZvcm0zRE9iamVj dCBhcnJheSkKIAogdm9pZCBFeHRlbnNpb25zM0RPcGVuR0w6OmJpbmRWZXJ0ZXhBcnJheU9FUyhQ bGF0Zm9ybTNET2JqZWN0IGFycmF5KQogeworICAgIGlmICghYXJyYXkpCisgICAgICAgIHJldHVy bjsKKwogICAgIG1fY29udGV4dC0+bWFrZUNvbnRleHRDdXJyZW50KCk7Ci0jaWYgR0xfQVBQTEVf dmVydGV4X2FycmF5X29iamVjdAorI2lmIGRlZmluZWQoR0xfQVBQTEVfdmVydGV4X2FycmF5X29i amVjdCkgJiYgR0xfQVBQTEVfdmVydGV4X2FycmF5X29iamVjdAogICAgIGdsQmluZFZlcnRleEFy cmF5QVBQTEUoYXJyYXkpOwotI2Vsc2UKLSAgICBBU1NFUlRfVU5VU0VEKGFycmF5LCBzdXBwb3J0 cyhhcnJheSkpOwogI2VuZGlmCiB9CiAK