Commit 4cbb84f7 authored by Kai Ninomiya's avatar Kai Ninomiya Committed by Commit Bot

Pass through unimplemented texture dimension enums

Prevents crashes on CTS

Bug: 1069302
Change-Id: I227ac25237e2eac51d9c6131e81552f1cbb48a38
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324168
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: default avatarAustin Eng <enga@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792476}
parent fda93fab
...@@ -281,10 +281,15 @@ WGPUTextureFormat AsDawnEnum<WGPUTextureFormat>( ...@@ -281,10 +281,15 @@ WGPUTextureFormat AsDawnEnum<WGPUTextureFormat>(
template <> template <>
WGPUTextureDimension AsDawnEnum<WGPUTextureDimension>( WGPUTextureDimension AsDawnEnum<WGPUTextureDimension>(
const WTF::String& webgpu_enum) { const WTF::String& webgpu_enum) {
if (webgpu_enum == "1d") {
return WGPUTextureDimension_1D;
}
if (webgpu_enum == "2d") { if (webgpu_enum == "2d") {
return WGPUTextureDimension_2D; return WGPUTextureDimension_2D;
} }
// TODO(crbug.com/dawn/129): Implement "1d" and "3d". if (webgpu_enum == "3d") {
return WGPUTextureDimension_3D;
}
NOTREACHED(); NOTREACHED();
return WGPUTextureDimension_Force32; return WGPUTextureDimension_Force32;
} }
...@@ -295,6 +300,9 @@ WGPUTextureViewDimension AsDawnEnum<WGPUTextureViewDimension>( ...@@ -295,6 +300,9 @@ WGPUTextureViewDimension AsDawnEnum<WGPUTextureViewDimension>(
if (webgpu_enum.IsNull()) { if (webgpu_enum.IsNull()) {
return WGPUTextureViewDimension_Undefined; return WGPUTextureViewDimension_Undefined;
} }
if (webgpu_enum == "1d") {
return WGPUTextureViewDimension_1D;
}
if (webgpu_enum == "2d") { if (webgpu_enum == "2d") {
return WGPUTextureViewDimension_2D; return WGPUTextureViewDimension_2D;
} }
...@@ -307,7 +315,9 @@ WGPUTextureViewDimension AsDawnEnum<WGPUTextureViewDimension>( ...@@ -307,7 +315,9 @@ WGPUTextureViewDimension AsDawnEnum<WGPUTextureViewDimension>(
if (webgpu_enum == "cube-array") { if (webgpu_enum == "cube-array") {
return WGPUTextureViewDimension_CubeArray; return WGPUTextureViewDimension_CubeArray;
} }
// TODO(crbug.com/dawn/129): Implement "1d" and "3d". if (webgpu_enum == "3d") {
return WGPUTextureViewDimension_3D;
}
NOTREACHED(); NOTREACHED();
return WGPUTextureViewDimension_Force32; return WGPUTextureViewDimension_Force32;
} }
......
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