Commit 0126b875 authored by François Beaufort's avatar François Beaufort Committed by Commit Bot

[WebGPU] Clean vertex formats

This CL removes vertex formats that are not supported in WebGPU.

Change-Id: I1ad76cb89ae2dac075a2307f6cc364da4da2772b
Bug: 877147
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1844789
Commit-Queue: François Beaufort <beaufort.francois@gmail.com>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: default avatarCorentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703298}
parent 646aad5e
...@@ -426,154 +426,57 @@ DawnInputStepMode AsDawnEnum<DawnInputStepMode>( ...@@ -426,154 +426,57 @@ DawnInputStepMode AsDawnEnum<DawnInputStepMode>(
template <> template <>
DawnVertexFormat AsDawnEnum<DawnVertexFormat>(const WTF::String& webgpu_enum) { DawnVertexFormat AsDawnEnum<DawnVertexFormat>(const WTF::String& webgpu_enum) {
if (webgpu_enum == "uchar") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "uchar2") { if (webgpu_enum == "uchar2") {
return DAWN_VERTEX_FORMAT_UCHAR2; return DAWN_VERTEX_FORMAT_UCHAR2;
} }
if (webgpu_enum == "uchar3") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "uchar4") { if (webgpu_enum == "uchar4") {
return DAWN_VERTEX_FORMAT_UCHAR4; return DAWN_VERTEX_FORMAT_UCHAR4;
} }
if (webgpu_enum == "char") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "char2") { if (webgpu_enum == "char2") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats return DAWN_VERTEX_FORMAT_CHAR2;
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "char3") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
} }
if (webgpu_enum == "char4") { if (webgpu_enum == "char4") {
return DAWN_VERTEX_FORMAT_CHAR4; return DAWN_VERTEX_FORMAT_CHAR4;
} }
if (webgpu_enum == "ucharnorm") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "uchar2norm") { if (webgpu_enum == "uchar2norm") {
return DAWN_VERTEX_FORMAT_UCHAR2_NORM; return DAWN_VERTEX_FORMAT_UCHAR2_NORM;
} }
if (webgpu_enum == "uchar3norm") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "uchar4norm") { if (webgpu_enum == "uchar4norm") {
return DAWN_VERTEX_FORMAT_UCHAR4_NORM; return DAWN_VERTEX_FORMAT_UCHAR4_NORM;
} }
if (webgpu_enum == "uchar4norm-bgra") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "charnorm") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "char2norm") { if (webgpu_enum == "char2norm") {
return DAWN_VERTEX_FORMAT_CHAR2_NORM; return DAWN_VERTEX_FORMAT_CHAR2_NORM;
} }
if (webgpu_enum == "char3norm") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "char4norm") { if (webgpu_enum == "char4norm") {
return DAWN_VERTEX_FORMAT_CHAR4_NORM; return DAWN_VERTEX_FORMAT_CHAR4_NORM;
} }
if (webgpu_enum == "ushort") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "ushort2") { if (webgpu_enum == "ushort2") {
return DAWN_VERTEX_FORMAT_USHORT2; return DAWN_VERTEX_FORMAT_USHORT2;
} }
if (webgpu_enum == "ushort3") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "ushort4") { if (webgpu_enum == "ushort4") {
return DAWN_VERTEX_FORMAT_USHORT4; return DAWN_VERTEX_FORMAT_USHORT4;
} }
if (webgpu_enum == "short") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "short2") { if (webgpu_enum == "short2") {
return DAWN_VERTEX_FORMAT_SHORT2; return DAWN_VERTEX_FORMAT_SHORT2;
} }
if (webgpu_enum == "short3") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "short4") { if (webgpu_enum == "short4") {
return DAWN_VERTEX_FORMAT_SHORT4; return DAWN_VERTEX_FORMAT_SHORT4;
} }
if (webgpu_enum == "ushortnorm") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "ushort2norm") { if (webgpu_enum == "ushort2norm") {
return DAWN_VERTEX_FORMAT_USHORT2_NORM; return DAWN_VERTEX_FORMAT_USHORT2_NORM;
} }
if (webgpu_enum == "ushort3norm") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "ushort4norm") { if (webgpu_enum == "ushort4norm") {
return DAWN_VERTEX_FORMAT_USHORT4_NORM; return DAWN_VERTEX_FORMAT_USHORT4_NORM;
} }
if (webgpu_enum == "shortnorm") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "short2norm") { if (webgpu_enum == "short2norm") {
return DAWN_VERTEX_FORMAT_SHORT2_NORM; return DAWN_VERTEX_FORMAT_SHORT2_NORM;
} }
if (webgpu_enum == "short3norm") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "short4norm") { if (webgpu_enum == "short4norm") {
return DAWN_VERTEX_FORMAT_SHORT4_NORM; return DAWN_VERTEX_FORMAT_SHORT4_NORM;
} }
if (webgpu_enum == "half") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "half2") { if (webgpu_enum == "half2") {
return DAWN_VERTEX_FORMAT_HALF2; return DAWN_VERTEX_FORMAT_HALF2;
} }
if (webgpu_enum == "half3") {
// TODO(crbug.com/dawn/41): Implement remaining vertex formats
NOTREACHED();
return DAWN_VERTEX_FORMAT_FORCE32;
}
if (webgpu_enum == "half4") { if (webgpu_enum == "half4") {
return DAWN_VERTEX_FORMAT_HALF4; return DAWN_VERTEX_FORMAT_HALF4;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment