commit 8c813311f03149750ba1b8c8d782a03b3bf8c56c
author Stephen White <senorblanco@chromium.org> Fri Dec 04 19:24:00 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri Dec 04 19:24:00 2020 +0000
tree 2878243eba41648c7943d887ca132029543b5267
parent f31b78e90e1ea17bf012edd22d2f35e9d89adb15

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 <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Stephen White <senorblanco@chromium.org>

src/dawn_native/RenderEncoderBase.cpp

diff --git a/src/dawn_native/RenderEncoderBase.cpp b/src/dawn_native/RenderEncoderBase.cpp
index aa7d9e9..2bc3c8d 100644
--- a/src/dawn_native/RenderEncoderBase.cpp
+++ b/src/dawn_native/RenderEncoderBase.cpp
@@ -69,7 +69,7 @@
             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");
             }
 

src/tests/end2end/DrawIndexedTests.cpp

diff --git a/src/tests/end2end/DrawIndexedTests.cpp b/src/tests/end2end/DrawIndexedTests.cpp
index 760b1d1..c894624 100644
--- a/src/tests/end2end/DrawIndexedTests.cpp
+++ b/src/tests/end2end/DrawIndexedTests.cpp
@@ -116,6 +116,7 @@
 
 // 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);