From 8c813311f03149750ba1b8c8d782a03b3bf8c56c Mon Sep 17 00:00:00 2001 From: Stephen White Date: Fri, 4 Dec 2020 19:24:00 +0000 Subject: [PATCH] Fix base vertex toggle. Use the correct toggle when checking for support. Also disable a test which tests it unconditionally. Change-Id: I5f98004865df5e1f4dd6cf6eaa4769444b90e9c2 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/34980 Reviewed-by: Corentin Wallez Reviewed-by: Austin Eng Commit-Queue: Stephen White --- src/dawn_native/RenderEncoderBase.cpp | 2 +- src/tests/end2end/DrawIndexedTests.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dawn_native/RenderEncoderBase.cpp b/src/dawn_native/RenderEncoderBase.cpp index aa7d9e9061..2bc3c8d374 100644 --- a/src/dawn_native/RenderEncoderBase.cpp +++ b/src/dawn_native/RenderEncoderBase.cpp @@ -69,7 +69,7 @@ namespace dawn_native { if (mDisableBaseInstance && firstInstance != 0) { return DAWN_VALIDATION_ERROR("Non-zero first instance not supported"); } - if (mDisableBaseInstance && baseVertex != 0) { + if (mDisableBaseVertex && baseVertex != 0) { return DAWN_VALIDATION_ERROR("Non-zero base vertex not supported"); } diff --git a/src/tests/end2end/DrawIndexedTests.cpp b/src/tests/end2end/DrawIndexedTests.cpp index 760b1d1239..c894624299 100644 --- a/src/tests/end2end/DrawIndexedTests.cpp +++ b/src/tests/end2end/DrawIndexedTests.cpp @@ -116,6 +116,7 @@ TEST_P(DrawIndexedTest, Uint32) { // Test the parameter 'baseVertex' of DrawIndexed() works. TEST_P(DrawIndexedTest, BaseVertex) { + DAWN_SKIP_TEST_IF(HasToggleEnabled("disable_base_vertex")); RGBA8 filled(0, 255, 0, 255); RGBA8 notFilled(0, 0, 0, 0);