Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WebGPU] copy compressed textures fails when texture width is not divisible by the block size #20588

Conversation

mwyrzykowski
Copy link
Contributor

@mwyrzykowski mwyrzykowski commented Nov 16, 2023

edb411c

[WebGPU] copy compressed textures fails when texture width is not divisible by the block size
https://bugs.webkit.org/show_bug.cgi?id=264923
radar://118491364

Reviewed by Tadeu Zagallo.

To correctly write to compressed textures, the width of the data must be divisible
by the compressed texture's block size and we were not previously ensuring that.

Also clean up newBytesPerRow and levelInfoBytesPerRow duplication which were being
assigned the same value and never modified.

* LayoutTests/http/tests/webgpu/webgpu/api/operation/command_buffer/copyTextureToTexture-expected.txt:
Add test expectation as this passes locally.

* Source/WebGPU/WebGPU/Queue.mm:
(WebGPU::Queue::writeTexture):

Canonical link: https://commits.webkit.org/270881@main

57bc0b7

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe βœ… πŸ›  wincairo
βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug βœ… πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac βœ… πŸ§ͺ api-wpe
βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ›  gtk
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2 βœ… πŸ§ͺ api-gtk
βœ… πŸ›  tv-sim
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch
βœ… πŸ›  watch-sim

@mwyrzykowski mwyrzykowski self-assigned this Nov 16, 2023
@mwyrzykowski mwyrzykowski added the WebGPU For bugs in WebGPU label Nov 16, 2023
@mwyrzykowski mwyrzykowski added the merge-queue Applied to send a pull request to merge-queue label Nov 17, 2023
…isible by the block size

https://bugs.webkit.org/show_bug.cgi?id=264923
radar://118491364

Reviewed by Tadeu Zagallo.

To correctly write to compressed textures, the width of the data must be divisible
by the compressed texture's block size and we were not previously ensuring that.

Also clean up newBytesPerRow and levelInfoBytesPerRow duplication which were being
assigned the same value and never modified.

* LayoutTests/http/tests/webgpu/webgpu/api/operation/command_buffer/copyTextureToTexture-expected.txt:
Add test expectation as this passes locally.

* Source/WebGPU/WebGPU/Queue.mm:
(WebGPU::Queue::writeTexture):

Canonical link: https://commits.webkit.org/270881@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WebGPU-copy-compressed-textures-fails-when-texture-width-is-not-divisible-by-the-block-size branch from 57bc0b7 to edb411c Compare November 17, 2023 12:26
@webkit-commit-queue
Copy link
Collaborator

Committed 270881@main (edb411c): https://commits.webkit.org/270881@main

Reviewed commits have been landed. Closing PR #20588 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit edb411c into WebKit:main Nov 17, 2023
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebGPU For bugs in WebGPU
Projects
None yet
4 participants