Skip to content

[Naga msl-out] Add padding to end of structs. And run some textureSample CTS tests that now pass #7804

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

Merged
merged 3 commits into from
Jun 17, 2025

Conversation

jamienicol
Copy link
Contributor

@jamienicol jamienicol commented Jun 13, 2025

Connections
Fixes #7803
Depends on #7807

The deno changes are copied from #7709. If this lands first I'll remove the changes from that PR.

Description
See #7803

Note I've only enabled the 1d tests to run. In higher dimensions we use more exotic texture formats, some of which fail. They also take a very long time to run, so there's probably a discussion to be had about whether that's desirable.

Testing
Added CTS test to run

Squash or Rebase?

Rebase

Checklist

  • Run cargo fmt.
  • Run taplo format.
  • Run cargo clippy --tests. If applicable, add:
    • --target wasm32-unknown-unknown
  • Run cargo xtask test to run tests.
  • If this contains user-facing changes, add a CHANGELOG.md entry.

@jamienicol jamienicol requested review from crowlKats and a team as code owners June 13, 2025 16:26
@jamienicol jamienicol force-pushed the msl-struct-pad-end branch from 8344c76 to 59f5a2e Compare June 13, 2025 16:34
@jamienicol jamienicol marked this pull request as draft June 13, 2025 16:49
@jamienicol
Copy link
Contributor Author

Marking as draft until I fix the test failures

@@ -238,8 +238,7 @@ fn create_struct_layout_tests(storage_type: InputStorageType) -> Vec<ShaderTest>
&input_values,
&[0, 1, 2, 3, 4, 8, 9, 10, 11, 12],
)
.header(header)
.failures(Backends::METAL),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cwfitzgerald This PR seems to fix these tests. Since you added them, thought you might have opinions on whether this fix is correct? It doesn't really seem the same as described in #5262

This doesn't do anything yet, but unblocks running some CTS tests.
Limit to the `sampled_1d_coords` subtests for now as otherwise the tests
take a very long time to execute, and there are also some failures with
certain texture formats that are used in higher dimensions.
@jamienicol jamienicol force-pushed the msl-struct-pad-end branch from 9901c01 to e01ba35 Compare June 17, 2025 18:17
@jamienicol jamienicol marked this pull request as ready for review June 17, 2025 18:35
@jamienicol
Copy link
Contributor Author

Ready for review now

@jamienicol
Copy link
Contributor Author

@crowlKats approved the exact same deno changes in #7709 , so I think we can go ahead and land this

@jamienicol jamienicol merged commit a5f3286 into gfx-rs:trunk Jun 17, 2025
40 checks passed
@jamienicol jamienicol deleted the msl-struct-pad-end branch June 17, 2025 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

textureSample CTS execution tests fail on Macos
2 participants