Consistently return HassleError and remove unneeded check macros
#30
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarijnS95
commented
Jan 25, 2022
src/wrapper.rs
Outdated
Comment on lines
293
to
298
| let mut compile_error = 0u32; | ||
| unsafe { | ||
| result.get_status(&mut compile_error); | ||
| } | ||
| let status_hr = unsafe { result.get_status(&mut compile_error) }; | ||
|
|
||
| if result_hr == 0 && compile_error == 0 { | ||
| if !result_hr.is_err() && !status_hr.is_err() && compile_error == 0 { | ||
| Ok(DxcOperationResult::new(result)) | ||
| } else { | ||
| Err((DxcOperationResult::new(result), result_hr)) |
There was a problem hiding this comment.
The functions with a DxcOperationResult are up for a rework next: they're tricky to get right and even https://asawicki.info/news_1719_two_shader_compilers_of_direct3d_12 from my notes doesn't explain very clearly what to do, but #29 and #30 are going to make it easier to implement said refactor at least.
MarijnS95
force-pushed
the
consistent-result-api
branch
2 times, most recently
from
29ae848
to
ab1c125
Compare
Jasper-Bekkers
approved these changes
Jan 25, 2022
Our public API becomes a lot cleaner when returning `HassleError` everywhere, helped by the fact that `HRESULT`s from the low-level COM API is a newtype with support for functions to convert to `Result<>` easily. These can be short-circuit-returned in a more Rust'y way through the questionmark operator instead of wrapping everything in large macro calls. This change is based on a similar approach in the Ash crate: https://github.com/MaikKlein/ash/pull/339/files
MarijnS95
force-pushed
the
consistent-result-api
branch
from
ab1c125
to
bfc7f90
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on #29
Our public API becomes a lot cleaner when returning
HassleErroreverywhere, helped by the fact thatHRESULTs from the low-level COM API is a newtype with support for functions to convert toResult<>easily. These can be short-circuit-returned in a more Rust'y way through the questionmark operator instead of wrapping everything in large macro calls. This change is based on a similar approach in the Ash crate: https://github.com/MaikKlein/ash/pull/339/files