mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-19 09:55:26 +00:00
Remove deprecated vertex formats
Bug: dawn:22 Change-Id: Iae2c742e6c7e44f7d99fa9eb9c92bcd4ed516b3f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/51763 Commit-Queue: Brandon Jones <bajones@chromium.org> Commit-Queue: Kai Ninomiya <kainino@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org> Reviewed-by: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Brandon Jones
committed by
Dawn LUCI CQ
Dawn LUCI CQ
parent
a548578f67
commit
4139fa5ca6
@@ -18,33 +18,7 @@
|
||||
|
||||
namespace dawn {
|
||||
|
||||
namespace {
|
||||
|
||||
static constexpr wgpu::VertexFormat kFirstDeprecatedVertexFormat =
|
||||
wgpu::VertexFormat::UChar2;
|
||||
static constexpr uint32_t kFirstDeprecatedVertexFormatValue =
|
||||
static_cast<uint32_t>(kFirstDeprecatedVertexFormat);
|
||||
|
||||
} // namespace
|
||||
|
||||
bool IsDeprecatedVertexFormat(wgpu::VertexFormat format) {
|
||||
return format >= kFirstDeprecatedVertexFormat;
|
||||
}
|
||||
|
||||
wgpu::VertexFormat NormalizeVertexFormat(wgpu::VertexFormat format) {
|
||||
// If the specified format is from the deprecated range return the corresponding
|
||||
// non-deprecated format.
|
||||
if (format >= kFirstDeprecatedVertexFormat) {
|
||||
uint32_t formatValue = static_cast<uint32_t>(format);
|
||||
// Need to add one to account for the "undefined" enum with value 0
|
||||
return static_cast<wgpu::VertexFormat>(
|
||||
(formatValue - kFirstDeprecatedVertexFormatValue) + 1);
|
||||
}
|
||||
return format;
|
||||
}
|
||||
|
||||
uint32_t VertexFormatNumComponents(wgpu::VertexFormat format) {
|
||||
format = NormalizeVertexFormat(format);
|
||||
switch (format) {
|
||||
case wgpu::VertexFormat::Uint8x4:
|
||||
case wgpu::VertexFormat::Sint8x4:
|
||||
@@ -83,45 +57,11 @@ namespace dawn {
|
||||
|
||||
case wgpu::VertexFormat::Undefined:
|
||||
break;
|
||||
|
||||
// Deprecated formats (should be unreachable after NormalizeVertexFormat call)
|
||||
case wgpu::VertexFormat::UChar2:
|
||||
case wgpu::VertexFormat::UChar4:
|
||||
case wgpu::VertexFormat::Char2:
|
||||
case wgpu::VertexFormat::Char4:
|
||||
case wgpu::VertexFormat::UChar2Norm:
|
||||
case wgpu::VertexFormat::UChar4Norm:
|
||||
case wgpu::VertexFormat::Char2Norm:
|
||||
case wgpu::VertexFormat::Char4Norm:
|
||||
case wgpu::VertexFormat::UShort2:
|
||||
case wgpu::VertexFormat::UShort4:
|
||||
case wgpu::VertexFormat::UShort2Norm:
|
||||
case wgpu::VertexFormat::UShort4Norm:
|
||||
case wgpu::VertexFormat::Short2:
|
||||
case wgpu::VertexFormat::Short4:
|
||||
case wgpu::VertexFormat::Short2Norm:
|
||||
case wgpu::VertexFormat::Short4Norm:
|
||||
case wgpu::VertexFormat::Half2:
|
||||
case wgpu::VertexFormat::Half4:
|
||||
case wgpu::VertexFormat::Float:
|
||||
case wgpu::VertexFormat::Float2:
|
||||
case wgpu::VertexFormat::Float3:
|
||||
case wgpu::VertexFormat::Float4:
|
||||
case wgpu::VertexFormat::UInt:
|
||||
case wgpu::VertexFormat::UInt2:
|
||||
case wgpu::VertexFormat::UInt3:
|
||||
case wgpu::VertexFormat::UInt4:
|
||||
case wgpu::VertexFormat::Int:
|
||||
case wgpu::VertexFormat::Int2:
|
||||
case wgpu::VertexFormat::Int3:
|
||||
case wgpu::VertexFormat::Int4:
|
||||
break;
|
||||
}
|
||||
UNREACHABLE();
|
||||
}
|
||||
|
||||
size_t VertexFormatComponentSize(wgpu::VertexFormat format) {
|
||||
format = NormalizeVertexFormat(format);
|
||||
switch (format) {
|
||||
case wgpu::VertexFormat::Uint8x2:
|
||||
case wgpu::VertexFormat::Uint8x4:
|
||||
@@ -160,39 +100,6 @@ namespace dawn {
|
||||
|
||||
case wgpu::VertexFormat::Undefined:
|
||||
break;
|
||||
|
||||
// Deprecated formats (should be unreachable after NormalizeVertexFormat call)
|
||||
case wgpu::VertexFormat::UChar2:
|
||||
case wgpu::VertexFormat::UChar4:
|
||||
case wgpu::VertexFormat::Char2:
|
||||
case wgpu::VertexFormat::Char4:
|
||||
case wgpu::VertexFormat::UChar2Norm:
|
||||
case wgpu::VertexFormat::UChar4Norm:
|
||||
case wgpu::VertexFormat::Char2Norm:
|
||||
case wgpu::VertexFormat::Char4Norm:
|
||||
case wgpu::VertexFormat::UShort2:
|
||||
case wgpu::VertexFormat::UShort4:
|
||||
case wgpu::VertexFormat::UShort2Norm:
|
||||
case wgpu::VertexFormat::UShort4Norm:
|
||||
case wgpu::VertexFormat::Short2:
|
||||
case wgpu::VertexFormat::Short4:
|
||||
case wgpu::VertexFormat::Short2Norm:
|
||||
case wgpu::VertexFormat::Short4Norm:
|
||||
case wgpu::VertexFormat::Half2:
|
||||
case wgpu::VertexFormat::Half4:
|
||||
case wgpu::VertexFormat::Float:
|
||||
case wgpu::VertexFormat::Float2:
|
||||
case wgpu::VertexFormat::Float3:
|
||||
case wgpu::VertexFormat::Float4:
|
||||
case wgpu::VertexFormat::UInt:
|
||||
case wgpu::VertexFormat::UInt2:
|
||||
case wgpu::VertexFormat::UInt3:
|
||||
case wgpu::VertexFormat::UInt4:
|
||||
case wgpu::VertexFormat::Int:
|
||||
case wgpu::VertexFormat::Int2:
|
||||
case wgpu::VertexFormat::Int3:
|
||||
case wgpu::VertexFormat::Int4:
|
||||
break;
|
||||
}
|
||||
UNREACHABLE();
|
||||
}
|
||||
@@ -202,7 +109,6 @@ namespace dawn {
|
||||
}
|
||||
|
||||
const char* GetWGSLVertexFormatType(wgpu::VertexFormat format) {
|
||||
format = NormalizeVertexFormat(format);
|
||||
switch (format) {
|
||||
case wgpu::VertexFormat::Float32:
|
||||
return "f32";
|
||||
@@ -249,39 +155,6 @@ namespace dawn {
|
||||
|
||||
case wgpu::VertexFormat::Undefined:
|
||||
break;
|
||||
|
||||
// Deprecated formats (should be unreachable after NormalizeVertexFormat call)
|
||||
case wgpu::VertexFormat::UChar2:
|
||||
case wgpu::VertexFormat::UChar4:
|
||||
case wgpu::VertexFormat::Char2:
|
||||
case wgpu::VertexFormat::Char4:
|
||||
case wgpu::VertexFormat::UChar2Norm:
|
||||
case wgpu::VertexFormat::UChar4Norm:
|
||||
case wgpu::VertexFormat::Char2Norm:
|
||||
case wgpu::VertexFormat::Char4Norm:
|
||||
case wgpu::VertexFormat::UShort2:
|
||||
case wgpu::VertexFormat::UShort4:
|
||||
case wgpu::VertexFormat::UShort2Norm:
|
||||
case wgpu::VertexFormat::UShort4Norm:
|
||||
case wgpu::VertexFormat::Short2:
|
||||
case wgpu::VertexFormat::Short4:
|
||||
case wgpu::VertexFormat::Short2Norm:
|
||||
case wgpu::VertexFormat::Short4Norm:
|
||||
case wgpu::VertexFormat::Half2:
|
||||
case wgpu::VertexFormat::Half4:
|
||||
case wgpu::VertexFormat::Float:
|
||||
case wgpu::VertexFormat::Float2:
|
||||
case wgpu::VertexFormat::Float3:
|
||||
case wgpu::VertexFormat::Float4:
|
||||
case wgpu::VertexFormat::UInt:
|
||||
case wgpu::VertexFormat::UInt2:
|
||||
case wgpu::VertexFormat::UInt3:
|
||||
case wgpu::VertexFormat::UInt4:
|
||||
case wgpu::VertexFormat::Int:
|
||||
case wgpu::VertexFormat::Int2:
|
||||
case wgpu::VertexFormat::Int3:
|
||||
case wgpu::VertexFormat::Int4:
|
||||
break;
|
||||
}
|
||||
UNREACHABLE();
|
||||
}
|
||||
|
||||
@@ -37,26 +37,6 @@ namespace dawn {
|
||||
wgpu::VertexFormat::Sint32x2, wgpu::VertexFormat::Sint32x3, wgpu::VertexFormat::Sint32x4,
|
||||
};
|
||||
|
||||
static constexpr std::array<wgpu::VertexFormat, 30> kAllDeprecatedVertexFormats = {
|
||||
wgpu::VertexFormat::UChar2, wgpu::VertexFormat::UChar4,
|
||||
wgpu::VertexFormat::Char2, wgpu::VertexFormat::Char4,
|
||||
wgpu::VertexFormat::UChar2Norm, wgpu::VertexFormat::UChar4Norm,
|
||||
wgpu::VertexFormat::Char2Norm, wgpu::VertexFormat::Char4Norm,
|
||||
wgpu::VertexFormat::UShort2, wgpu::VertexFormat::UShort4,
|
||||
wgpu::VertexFormat::UShort2Norm, wgpu::VertexFormat::UShort4Norm,
|
||||
wgpu::VertexFormat::Short2, wgpu::VertexFormat::Short4,
|
||||
wgpu::VertexFormat::Short2Norm, wgpu::VertexFormat::Short4Norm,
|
||||
wgpu::VertexFormat::Half2, wgpu::VertexFormat::Half4,
|
||||
wgpu::VertexFormat::Float, wgpu::VertexFormat::Float2,
|
||||
wgpu::VertexFormat::Float3, wgpu::VertexFormat::Float4,
|
||||
wgpu::VertexFormat::UInt, wgpu::VertexFormat::UInt2,
|
||||
wgpu::VertexFormat::UInt3, wgpu::VertexFormat::UInt4,
|
||||
wgpu::VertexFormat::Int, wgpu::VertexFormat::Int2,
|
||||
wgpu::VertexFormat::Int3, wgpu::VertexFormat::Int4,
|
||||
};
|
||||
|
||||
bool IsDeprecatedVertexFormat(wgpu::VertexFormat format);
|
||||
wgpu::VertexFormat NormalizeVertexFormat(wgpu::VertexFormat format);
|
||||
uint32_t VertexFormatNumComponents(wgpu::VertexFormat format);
|
||||
size_t VertexFormatComponentSize(wgpu::VertexFormat format);
|
||||
size_t VertexFormatSize(wgpu::VertexFormat format);
|
||||
|
||||
Reference in New Issue
Block a user