encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename TryConvertAspect to better reflect what it does. 

Bug: dawn:441
Change-Id: I51d28102926fb00a7c6225bc3b84324fe8f1f6fe
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/34902
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Corentin Wallez 2020-12-08 15:56:44 +00:00 committed by Commit Bot service account
parent 0664a30565
commit 2093157afe
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dawn_native/CommandValidation.cpp
View File

@ -577,7 +577,7 @@ namespace dawn_native {
return DAWN_VALIDATION_ERROR("mipLevel out of range"); return DAWN_VALIDATION_ERROR("mipLevel out of range");
} }
if (TryConvertAspect(texture->GetFormat(), textureCopy.aspect) == Aspect::None) { if (SelectFormatAspects(texture->GetFormat(), textureCopy.aspect) == Aspect::None) {
return DAWN_VALIDATION_ERROR("Texture does not have selected aspect for texture copy."); return DAWN_VALIDATION_ERROR("Texture does not have selected aspect for texture copy.");
} }

4
src/dawn_native/Subresource.cpp
View File

@ -26,12 +26,12 @@ namespace dawn_native {
} }
Aspect ConvertAspect(const Format& format, wgpu::TextureAspect aspect) { Aspect ConvertAspect(const Format& format, wgpu::TextureAspect aspect) {
Aspect aspectMask = TryConvertAspect(format, aspect); Aspect aspectMask = SelectFormatAspects(format, aspect);
ASSERT(aspectMask != Aspect::None); ASSERT(aspectMask != Aspect::None);
return aspectMask; return aspectMask;
} }
Aspect TryConvertAspect(const Format& format, wgpu::TextureAspect aspect) { Aspect SelectFormatAspects(const Format& format, wgpu::TextureAspect aspect) {
switch (aspect) { switch (aspect) {
case wgpu::TextureAspect::All: case wgpu::TextureAspect::All:
return format.aspects; return format.aspects;

7
src/dawn_native/Subresource.h
View File

@ -44,9 +44,10 @@ namespace dawn_native {
// does not exist in the format. // does not exist in the format.
Aspect ConvertAspect(const Format& format, wgpu::TextureAspect aspect); Aspect ConvertAspect(const Format& format, wgpu::TextureAspect aspect);
// Try to convert the TextureAspect to an Aspect mask for the format. May return // Returns the Aspects of the Format that are selected by the wgpu::TextureAspect.
// Aspect::None. // Note that this can return Aspect::None if the Format doesn't have any of the
Aspect TryConvertAspect(const Format& format, wgpu::TextureAspect aspect); // selected aspects.
Aspect SelectFormatAspects(const Format& format, wgpu::TextureAspect aspect);
// Helper struct to make it clear that what the parameters of a range mean. // Helper struct to make it clear that what the parameters of a range mean.
template <typename T> template <typename T>

2
src/dawn_native/Texture.cpp
View File

@ -266,7 +266,7 @@ namespace dawn_native {
DAWN_TRY(ValidateTextureFormat(descriptor->format)); DAWN_TRY(ValidateTextureFormat(descriptor->format));
DAWN_TRY(ValidateTextureAspect(descriptor->aspect)); DAWN_TRY(ValidateTextureAspect(descriptor->aspect));
if (TryConvertAspect(texture->GetFormat(), descriptor->aspect) == Aspect::None) { if (SelectFormatAspects(texture->GetFormat(), descriptor->aspect) == Aspect::None) {
return DAWN_VALIDATION_ERROR("Texture does not have selected aspect for texture view."); return DAWN_VALIDATION_ERROR("Texture does not have selected aspect for texture view.");
} }