Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Issue 10441002: Merge 117918 - Must set/reset pixel unpack alignment to 1 during texSubImage2D (Closed)

Created:
8 years, 7 months ago by Ken Russell (switch to Gerrit)
Modified:
8 years, 7 months ago
CC:
chromium-reviews
Base URL:
http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Visibility:
Public.

Description

Merge 117918 - Must set/reset pixel unpack alignment to 1 during texSubImage2D https://bugs.webkit.org/show_bug.cgi?id=86877 Reviewed by James Robinson. Source/WebCore: Set pixel unpack alignment to 1 during upload, resetting afterward. Tests: fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html * html/canvas/WebGLRenderingContext.cpp: (WebCore::WebGLRenderingContext::texSubImage2DImpl): (WebCore::WebGLRenderingContext::texSubImage2D): Set pixel unpack alignment to 1 during upload; reset afterward. LayoutTests: Incorporated several tests from WebGL conformance suite at Khronos as layout tests, verifying upload to all packed pixel formats. There were difficulties incorporating the video-related variants of these tests; Bug 87042 has been filed to track their addition. * fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-canvas.js: Added. (generateTest.init): (generateTest.runOneIteration): (generateTest.runTest): (generateTest): * fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-image-data.js: Added. (generateTest.init): (generateTest.runOneIteration): (generateTest.runTest): (generateTest): * fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-image.js: Added. (generateTest.init): (generateTest.runOneIteration): (generateTest.runTestOnImage): (generateTest.runTest.newImage.onload): (generateTest.runTest): (generateTest.runTest2.newImage.onload): (generateTest.runTest2): (generateTest.runTest3): (generateTest): * fast/canvas/webgl/resources/webgl-test-utils.js: (WebGLTestUtils): * fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-expected.txt: Copied from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-expected.txt. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565-expected.txt: Copied from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-expected.txt. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444-expected.txt: Copied from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-expected.txt. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551-expected.txt: Copied from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-expected.txt. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-expected.txt: * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565-expected.txt: Copied from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-expected.txt. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444-expected.txt: Copied from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-expected.txt. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551-expected.txt: Copied from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-expected.txt. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html: * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-expected.txt: * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565-expected.txt: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444-expected.txt: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551-expected.txt: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html: Added. * fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html: TBR=kbr@google.com Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=118259

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+54 lines, -197 lines) Patch
A + LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-canvas.js View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-image.js View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-image-data.js View 0 chunks +-1 lines, --1 lines 0 comments Download
M LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.js View 1 chunk +11 lines, -6 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html View 1 chunk +7 lines, -91 lines 0 comments Download
M LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html View 1 chunk +7 lines, -121 lines 0 comments Download
M LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-expected.txt View 2 chunks +2 lines, -1 line 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-expected.txt View 2 chunks +42 lines, -1 line 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html View 0 chunks +-1 lines, --1 lines 0 comments Download
A + LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551-expected.txt View 0 chunks +-1 lines, --1 lines 0 comments Download
M Source/WebCore/html/canvas/WebGLRenderingContext.cpp View 2 chunks +8 lines, -0 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
Ken Russell (switch to Gerrit)
8 years, 7 months ago (2012-05-23 22:55:03 UTC) #1

          

Powered by Google App Engine
This is Rietveld 408576698