Title: [170682] trunk/Source/WebCore
Revision
170682
Author
commit-qu...@webkit.org
Date
2014-07-01 17:43:42 -0700 (Tue, 01 Jul 2014)

Log Message

[WebGL] Fix PVRTC extension.
https://bugs.webkit.org/show_bug.cgi?id=134525

Patch by Alex Christensen <achristen...@webkit.org> on 2014-07-01
Reviewed by Dean Jackson.

* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::validateCompressedTexDimensions):
Remove the return false which I mistakenly committed in r170128
and make the gl error match the S3TC error and the khronos test.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (170681 => 170682)


--- trunk/Source/WebCore/ChangeLog	2014-07-02 00:13:19 UTC (rev 170681)
+++ trunk/Source/WebCore/ChangeLog	2014-07-02 00:43:42 UTC (rev 170682)
@@ -1,3 +1,15 @@
+2014-07-01  Alex Christensen  <achristen...@webkit.org>
+
+        [WebGL] Fix PVRTC extension.
+        https://bugs.webkit.org/show_bug.cgi?id=134525
+
+        Reviewed by Dean Jackson.
+
+        * html/canvas/WebGLRenderingContext.cpp:
+        (WebCore::WebGLRenderingContext::validateCompressedTexDimensions):
+        Remove the return false which I mistakenly committed in r170128
+        and make the gl error match the S3TC error and the khronos test.
+
 2014-07-01  Chris Fleizach  <cfleiz...@apple.com>
 
         AX: iOS does not expose ARIA toggle buttons at all (not even as a regular button)

Modified: trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp (170681 => 170682)


--- trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp	2014-07-02 00:13:19 UTC (rev 170681)
+++ trunk/Source/WebCore/html/canvas/WebGLRenderingContext.cpp	2014-07-02 00:43:42 UTC (rev 170682)
@@ -5450,10 +5450,9 @@
     case Extensions3D::COMPRESSED_RGB_PVRTC_2BPPV1_IMG:
     case Extensions3D::COMPRESSED_RGBA_PVRTC_4BPPV1_IMG:
     case Extensions3D::COMPRESSED_RGBA_PVRTC_2BPPV1_IMG:
-            return false;
         // Height and width must be powers of 2.
         if ((width & (width - 1)) || (height & (height - 1))) {
-            synthesizeGLError(GraphicsContext3D::INVALID_VALUE, functionName, "width or height invalid for level");
+            synthesizeGLError(GraphicsContext3D::INVALID_OPERATION, functionName, "width or height invalid for level");
             return false;
         }
         return true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to