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

Update BufferZeroInitTests for Tint current status 

Enables a number of tests that were disabled, due to lack of support
in Tint.
Updates the guards on others to be more accurate.

BUG=tint:398,tint:375

Change-Id: I29d56e53862b6274a2d8a19cbf8315c3a687e16a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/39063
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Auto-Submit: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
This commit is contained in:
Ryan Harrison 2021-01-27 19:19:54 +00:00 committed by Commit Bot service account
parent 30ea58a1d0
commit f3744fb4e7
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/tests/end2end/BufferZeroInitTests.cpp
View File

@ -977,9 +977,6 @@ TEST_P(BufferZeroInitTest, Copy2DArrayTextureToBuffer) {
// Test that the buffer will be lazy initialized correctly when its first use is to be bound as a // Test that the buffer will be lazy initialized correctly when its first use is to be bound as a
// uniform buffer. // uniform buffer.
TEST_P(BufferZeroInitTest, BoundAsUniformBuffer) { TEST_P(BufferZeroInitTest, BoundAsUniformBuffer) {
// TODO(crbug.com/tint/398): GLSL builtins don't work with SPIR-V reader.
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator"));
const char* computeShader = R"( const char* computeShader = R"(
#version 450 #version 450
layout(set = 0, binding = 0, std140) uniform UBO { layout(set = 0, binding = 0, std140) uniform UBO {
@ -1016,9 +1013,6 @@ TEST_P(BufferZeroInitTest, BoundAsUniformBuffer) {
// Test that the buffer will be lazy initialized correctly when its first use is to be bound as a // Test that the buffer will be lazy initialized correctly when its first use is to be bound as a
// read-only storage buffer. // read-only storage buffer.
TEST_P(BufferZeroInitTest, BoundAsReadonlyStorageBuffer) { TEST_P(BufferZeroInitTest, BoundAsReadonlyStorageBuffer) {
// TODO(crbug.com/tint/398): GLSL builtins don't work with SPIR-V reader.
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator"));
const char* computeShader = R"( const char* computeShader = R"(
#version 450 #version 450
layout(set = 0, binding = 0, std140) readonly buffer SSBO { layout(set = 0, binding = 0, std140) readonly buffer SSBO {
@ -1055,9 +1049,9 @@ TEST_P(BufferZeroInitTest, BoundAsReadonlyStorageBuffer) {
// Test that the buffer will be lazy initialized correctly when its first use is to be bound as a // Test that the buffer will be lazy initialized correctly when its first use is to be bound as a
// storage buffer. // storage buffer.
TEST_P(BufferZeroInitTest, BoundAsStorageBuffer) { TEST_P(BufferZeroInitTest, BoundAsStorageBuffer) {
// TODO(crbug.com/tint/375): Implement barriers in Tint. // TODO(crbug.com/tint/375): Enable once barriers are implemented
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator")); DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator") ||
HasToggleEnabled("use_tint_inspector"));
const char* computeShader = R"( const char* computeShader = R"(
#version 450 #version 450
layout(set = 0, binding = 0, std140) buffer SSBO { layout(set = 0, binding = 0, std140) buffer SSBO {
@ -1103,9 +1097,6 @@ TEST_P(BufferZeroInitTest, BoundAsStorageBuffer) {
// Test the buffer will be lazily initialized correctly when its first use is in SetVertexBuffer. // Test the buffer will be lazily initialized correctly when its first use is in SetVertexBuffer.
TEST_P(BufferZeroInitTest, SetVertexBuffer) { TEST_P(BufferZeroInitTest, SetVertexBuffer) {
// TODO(crbug.com/tint/398): GLSL builtins don't work with SPIR-V reader.
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator"));
// Bind the whole buffer as a vertex buffer. // Bind the whole buffer as a vertex buffer.
{ {
constexpr uint64_t kVertexBufferOffset = 0u; constexpr uint64_t kVertexBufferOffset = 0u;
@ -1121,9 +1112,6 @@ TEST_P(BufferZeroInitTest, SetVertexBuffer) {
// Test the buffer will be lazily initialized correctly when its first use is in SetIndexBuffer. // Test the buffer will be lazily initialized correctly when its first use is in SetIndexBuffer.
TEST_P(BufferZeroInitTest, SetIndexBuffer) { TEST_P(BufferZeroInitTest, SetIndexBuffer) {
// TODO(crbug.com/tint/398): GLSL builtins don't work with SPIR-V reader.
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator"));
// Bind the whole buffer as an index buffer. // Bind the whole buffer as an index buffer.
{ {
constexpr uint64_t kIndexBufferOffset = 0u; constexpr uint64_t kIndexBufferOffset = 0u;
@ -1140,9 +1128,6 @@ TEST_P(BufferZeroInitTest, SetIndexBuffer) {
// Test the buffer will be lazily initialized correctly when its first use is an indirect buffer for // Test the buffer will be lazily initialized correctly when its first use is an indirect buffer for
// DrawIndirect. // DrawIndirect.
TEST_P(BufferZeroInitTest, IndirectBufferForDrawIndirect) { TEST_P(BufferZeroInitTest, IndirectBufferForDrawIndirect) {
// TODO(crbug.com/tint/398): GLSL builtins don't work with SPIR-V reader.
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator"));
// Bind the whole buffer as an indirect buffer. // Bind the whole buffer as an indirect buffer.
{ {
constexpr uint64_t kOffset = 0u; constexpr uint64_t kOffset = 0u;
@ -1159,9 +1144,6 @@ TEST_P(BufferZeroInitTest, IndirectBufferForDrawIndirect) {
// Test the buffer will be lazily initialized correctly when its first use is an indirect buffer for // Test the buffer will be lazily initialized correctly when its first use is an indirect buffer for
// DrawIndexedIndirect. // DrawIndexedIndirect.
TEST_P(BufferZeroInitTest, IndirectBufferForDrawIndexedIndirect) { TEST_P(BufferZeroInitTest, IndirectBufferForDrawIndexedIndirect) {
// TODO(crbug.com/tint/398): GLSL builtins don't work with SPIR-V reader.
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator"));
// Bind the whole buffer as an indirect buffer. // Bind the whole buffer as an indirect buffer.
{ {
constexpr uint64_t kOffset = 0u; constexpr uint64_t kOffset = 0u;
@ -1178,9 +1160,6 @@ TEST_P(BufferZeroInitTest, IndirectBufferForDrawIndexedIndirect) {
// Test the buffer will be lazily initialized correctly when its first use is an indirect buffer for // Test the buffer will be lazily initialized correctly when its first use is an indirect buffer for
// DispatchIndirect. // DispatchIndirect.
TEST_P(BufferZeroInitTest, IndirectBufferForDispatchIndirect) { TEST_P(BufferZeroInitTest, IndirectBufferForDispatchIndirect) {
// TODO(crbug.com/tint/398): GLSL builtins don't work with SPIR-V reader.
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator"));
// Bind the whole buffer as an indirect buffer. // Bind the whole buffer as an indirect buffer.
{ {
constexpr uint64_t kOffset = 0u; constexpr uint64_t kOffset = 0u;
@ -1207,8 +1186,9 @@ TEST_P(BufferZeroInitTest, ResolveQuerySet) {
DAWN_SKIP_TEST_IF(!SupportsExtensions({"timestamp_query"})); DAWN_SKIP_TEST_IF(!SupportsExtensions({"timestamp_query"}));
// TODO(crbug.com/tint/255, crbug.com/tint/256, crbug.com/tint/400, crbug.com/tint/417): // TODO(crbug.com/tint/255, crbug.com/tint/256, crbug.com/tint/400, crbug.com/tint/417):
// Skip use_tint_generator due to runtime array not supported in WGSL // Skip due to runtime array not currently supported in WGSL
DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator")); DAWN_SKIP_TEST_IF(HasToggleEnabled("use_tint_generator") ||
HasToggleEnabled("use_tint_inspector"));
constexpr uint64_t kBufferSize = 16u; constexpr uint64_t kBufferSize = 16u;
constexpr wgpu::BufferUsage kBufferUsage = constexpr wgpu::BufferUsage kBufferUsage =