mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-20 02:15:43 +00:00
Replace VertexFormatUtils with a dawn_native table of formats
This replaces multiple switches with a single indexing into a data table, and also adds information about the VertexFormatBaseType for later validation. Bug: dawn:1008 Change-Id: Ic3f564b0dc571cc0008a54785613f962ce223452 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/59030 Reviewed-by: Jiawei Shao <jiawei.shao@intel.com> Commit-Queue: Jiawei Shao <jiawei.shao@intel.com> Auto-Submit: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez
committed by
Dawn LUCI CQ
Dawn LUCI CQ
parent
c607e81de2
commit
1384e8b163
@@ -202,8 +202,6 @@ if (is_win || is_linux || is_chromeos || is_mac || is_fuchsia || is_android) {
|
||||
"TypeTraits.h",
|
||||
"TypedInteger.h",
|
||||
"UnderlyingType.h",
|
||||
"VertexFormatUtils.cpp",
|
||||
"VertexFormatUtils.h",
|
||||
"ityp_array.h",
|
||||
"ityp_bitset.h",
|
||||
"ityp_span.h",
|
||||
|
||||
@@ -54,8 +54,6 @@ target_sources(dawn_common PRIVATE
|
||||
"TypeTraits.h"
|
||||
"TypedInteger.h"
|
||||
"UnderlyingType.h"
|
||||
"VertexFormatUtils.cpp"
|
||||
"VertexFormatUtils.h"
|
||||
"ityp_array.h"
|
||||
"ityp_bitset.h"
|
||||
"ityp_span.h"
|
||||
|
||||
@@ -1,162 +0,0 @@
|
||||
// Copyright 2021 The Dawn Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#include "VertexFormatUtils.h"
|
||||
|
||||
#include "Assert.h"
|
||||
|
||||
namespace dawn {
|
||||
|
||||
uint32_t VertexFormatNumComponents(wgpu::VertexFormat format) {
|
||||
switch (format) {
|
||||
case wgpu::VertexFormat::Uint8x4:
|
||||
case wgpu::VertexFormat::Sint8x4:
|
||||
case wgpu::VertexFormat::Unorm8x4:
|
||||
case wgpu::VertexFormat::Snorm8x4:
|
||||
case wgpu::VertexFormat::Uint16x4:
|
||||
case wgpu::VertexFormat::Sint16x4:
|
||||
case wgpu::VertexFormat::Unorm16x4:
|
||||
case wgpu::VertexFormat::Snorm16x4:
|
||||
case wgpu::VertexFormat::Float16x4:
|
||||
case wgpu::VertexFormat::Float32x4:
|
||||
case wgpu::VertexFormat::Uint32x4:
|
||||
case wgpu::VertexFormat::Sint32x4:
|
||||
return 4;
|
||||
case wgpu::VertexFormat::Float32x3:
|
||||
case wgpu::VertexFormat::Uint32x3:
|
||||
case wgpu::VertexFormat::Sint32x3:
|
||||
return 3;
|
||||
case wgpu::VertexFormat::Uint8x2:
|
||||
case wgpu::VertexFormat::Sint8x2:
|
||||
case wgpu::VertexFormat::Unorm8x2:
|
||||
case wgpu::VertexFormat::Snorm8x2:
|
||||
case wgpu::VertexFormat::Uint16x2:
|
||||
case wgpu::VertexFormat::Sint16x2:
|
||||
case wgpu::VertexFormat::Unorm16x2:
|
||||
case wgpu::VertexFormat::Snorm16x2:
|
||||
case wgpu::VertexFormat::Float16x2:
|
||||
case wgpu::VertexFormat::Float32x2:
|
||||
case wgpu::VertexFormat::Uint32x2:
|
||||
case wgpu::VertexFormat::Sint32x2:
|
||||
return 2;
|
||||
case wgpu::VertexFormat::Float32:
|
||||
case wgpu::VertexFormat::Uint32:
|
||||
case wgpu::VertexFormat::Sint32:
|
||||
return 1;
|
||||
|
||||
case wgpu::VertexFormat::Undefined:
|
||||
break;
|
||||
}
|
||||
UNREACHABLE();
|
||||
}
|
||||
|
||||
size_t VertexFormatComponentSize(wgpu::VertexFormat format) {
|
||||
switch (format) {
|
||||
case wgpu::VertexFormat::Uint8x2:
|
||||
case wgpu::VertexFormat::Uint8x4:
|
||||
case wgpu::VertexFormat::Sint8x2:
|
||||
case wgpu::VertexFormat::Sint8x4:
|
||||
case wgpu::VertexFormat::Unorm8x2:
|
||||
case wgpu::VertexFormat::Unorm8x4:
|
||||
case wgpu::VertexFormat::Snorm8x2:
|
||||
case wgpu::VertexFormat::Snorm8x4:
|
||||
return sizeof(char);
|
||||
case wgpu::VertexFormat::Uint16x2:
|
||||
case wgpu::VertexFormat::Uint16x4:
|
||||
case wgpu::VertexFormat::Unorm16x2:
|
||||
case wgpu::VertexFormat::Unorm16x4:
|
||||
case wgpu::VertexFormat::Sint16x2:
|
||||
case wgpu::VertexFormat::Sint16x4:
|
||||
case wgpu::VertexFormat::Snorm16x2:
|
||||
case wgpu::VertexFormat::Snorm16x4:
|
||||
case wgpu::VertexFormat::Float16x2:
|
||||
case wgpu::VertexFormat::Float16x4:
|
||||
return sizeof(uint16_t);
|
||||
case wgpu::VertexFormat::Float32:
|
||||
case wgpu::VertexFormat::Float32x2:
|
||||
case wgpu::VertexFormat::Float32x3:
|
||||
case wgpu::VertexFormat::Float32x4:
|
||||
return sizeof(float);
|
||||
case wgpu::VertexFormat::Uint32:
|
||||
case wgpu::VertexFormat::Uint32x2:
|
||||
case wgpu::VertexFormat::Uint32x3:
|
||||
case wgpu::VertexFormat::Uint32x4:
|
||||
case wgpu::VertexFormat::Sint32:
|
||||
case wgpu::VertexFormat::Sint32x2:
|
||||
case wgpu::VertexFormat::Sint32x3:
|
||||
case wgpu::VertexFormat::Sint32x4:
|
||||
return sizeof(int32_t);
|
||||
|
||||
case wgpu::VertexFormat::Undefined:
|
||||
break;
|
||||
}
|
||||
UNREACHABLE();
|
||||
}
|
||||
|
||||
size_t VertexFormatSize(wgpu::VertexFormat format) {
|
||||
return VertexFormatNumComponents(format) * VertexFormatComponentSize(format);
|
||||
}
|
||||
|
||||
const char* GetWGSLVertexFormatType(wgpu::VertexFormat format) {
|
||||
switch (format) {
|
||||
case wgpu::VertexFormat::Float32:
|
||||
return "f32";
|
||||
case wgpu::VertexFormat::Unorm8x2:
|
||||
case wgpu::VertexFormat::Snorm8x2:
|
||||
case wgpu::VertexFormat::Unorm16x2:
|
||||
case wgpu::VertexFormat::Snorm16x2:
|
||||
case wgpu::VertexFormat::Float16x2:
|
||||
case wgpu::VertexFormat::Float32x2:
|
||||
return "vec2<f32>";
|
||||
case wgpu::VertexFormat::Float32x3:
|
||||
return "vec3<f32>";
|
||||
case wgpu::VertexFormat::Unorm8x4:
|
||||
case wgpu::VertexFormat::Snorm8x4:
|
||||
case wgpu::VertexFormat::Unorm16x4:
|
||||
case wgpu::VertexFormat::Snorm16x4:
|
||||
case wgpu::VertexFormat::Float16x4:
|
||||
case wgpu::VertexFormat::Float32x4:
|
||||
return "vec4<f32>";
|
||||
case wgpu::VertexFormat::Uint32:
|
||||
return "u32";
|
||||
case wgpu::VertexFormat::Uint8x2:
|
||||
case wgpu::VertexFormat::Uint16x2:
|
||||
case wgpu::VertexFormat::Uint32x2:
|
||||
return "vec2<u32>";
|
||||
case wgpu::VertexFormat::Uint32x3:
|
||||
return "vec3<u32>";
|
||||
case wgpu::VertexFormat::Uint8x4:
|
||||
case wgpu::VertexFormat::Uint16x4:
|
||||
case wgpu::VertexFormat::Uint32x4:
|
||||
return "vec4<u32>";
|
||||
case wgpu::VertexFormat::Sint32:
|
||||
return "i32";
|
||||
case wgpu::VertexFormat::Sint8x2:
|
||||
case wgpu::VertexFormat::Sint16x2:
|
||||
case wgpu::VertexFormat::Sint32x2:
|
||||
return "vec2<i32>";
|
||||
case wgpu::VertexFormat::Sint32x3:
|
||||
return "vec3<i32>";
|
||||
case wgpu::VertexFormat::Sint8x4:
|
||||
case wgpu::VertexFormat::Sint16x4:
|
||||
case wgpu::VertexFormat::Sint32x4:
|
||||
return "vec4<i32>";
|
||||
|
||||
case wgpu::VertexFormat::Undefined:
|
||||
break;
|
||||
}
|
||||
UNREACHABLE();
|
||||
}
|
||||
|
||||
} // namespace dawn
|
||||
@@ -1,48 +0,0 @@
|
||||
// Copyright 2021 The Dawn Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#ifndef DAWNNATIVE_VERTEX_FORMAT_UTILS_H_
|
||||
#define DAWNNATIVE_VERTEX_FORMAT_UTILS_H_
|
||||
|
||||
#include <array>
|
||||
|
||||
#include <dawn/webgpu_cpp.h>
|
||||
|
||||
// TODO(dawn:695): Remove the dawncpp_headers CMake dependency when VertexFormatUtils is deleted,
|
||||
// assuming no other dependencies have been added in other project files.
|
||||
|
||||
namespace dawn {
|
||||
|
||||
static constexpr std::array<wgpu::VertexFormat, 30> kAllVertexFormats = {
|
||||
wgpu::VertexFormat::Uint8x2, wgpu::VertexFormat::Uint8x4, wgpu::VertexFormat::Sint8x2,
|
||||
wgpu::VertexFormat::Sint8x4, wgpu::VertexFormat::Unorm8x2, wgpu::VertexFormat::Unorm8x4,
|
||||
wgpu::VertexFormat::Snorm8x2, wgpu::VertexFormat::Snorm8x4, wgpu::VertexFormat::Uint16x2,
|
||||
wgpu::VertexFormat::Uint16x4, wgpu::VertexFormat::Unorm16x2, wgpu::VertexFormat::Unorm16x4,
|
||||
wgpu::VertexFormat::Sint16x2, wgpu::VertexFormat::Sint16x4, wgpu::VertexFormat::Snorm16x2,
|
||||
wgpu::VertexFormat::Snorm16x4, wgpu::VertexFormat::Float16x2, wgpu::VertexFormat::Float16x4,
|
||||
wgpu::VertexFormat::Float32, wgpu::VertexFormat::Float32x2, wgpu::VertexFormat::Float32x3,
|
||||
wgpu::VertexFormat::Float32x4, wgpu::VertexFormat::Uint32, wgpu::VertexFormat::Uint32x2,
|
||||
wgpu::VertexFormat::Uint32x3, wgpu::VertexFormat::Uint32x4, wgpu::VertexFormat::Sint32,
|
||||
wgpu::VertexFormat::Sint32x2, wgpu::VertexFormat::Sint32x3, wgpu::VertexFormat::Sint32x4,
|
||||
};
|
||||
|
||||
uint32_t VertexFormatNumComponents(wgpu::VertexFormat format);
|
||||
size_t VertexFormatComponentSize(wgpu::VertexFormat format);
|
||||
size_t VertexFormatSize(wgpu::VertexFormat format);
|
||||
|
||||
const char* GetWGSLVertexFormatType(wgpu::VertexFormat textureFormat);
|
||||
|
||||
} // namespace dawn
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user