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

Don't check for vertex buffers in dispatch aspects 

Recently started causing a crash because we stopped creating an empty
InputState for compute pipelines
This commit is contained in:
Corentin Wallez 2017-06-05 15:43:41 -04:00 committed by Corentin Wallez
parent 181e22b482
commit 4efaf32d1b
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/common/CommandBuffer.cpp
View File

@ -436,8 +436,7 @@ namespace backend {
constexpr ValidationAspects requiredDispatchAspects =
1 << VALIDATION_ASPECT_COMPUTE_PIPELINE |
1 << VALIDATION_ASPECT_BINDGROUPS |
1 << VALIDATION_ASPECT_VERTEX_BUFFERS;
1 << VALIDATION_ASPECT_BINDGROUPS;
if ((requiredDispatchAspects & ~aspects).any()) {
// Compute the lazily computed aspects
@ -445,11 +444,6 @@ namespace backend {
aspects.set(VALIDATION_ASPECT_BINDGROUPS);
}
auto requiredInputs = lastPipeline->GetInputState()->GetInputsSetMask();
if ((inputsSet & ~requiredInputs).none()) {
aspects.set(VALIDATION_ASPECT_VERTEX_BUFFERS);
}
// Check again if anything is missing
if ((requiredDispatchAspects & ~aspects).any()) {
HandleError("Some dispatch state is missing");

1
src/tests/CMakeLists.txt
View File

@ -26,6 +26,7 @@ add_executable(nxt_unittests
${UNITTESTS_DIR}/ToBackendTests.cpp
${UNITTESTS_DIR}/WireTests.cpp
${VALIDATION_TESTS_DIR}/BufferValidationTests.cpp
${VALIDATION_TESTS_DIR}/ComputeValidationTests.cpp
${VALIDATION_TESTS_DIR}/DepthStencilStateValidationTests.cpp
${VALIDATION_TESTS_DIR}/ValidationTest.cpp
${VALIDATION_TESTS_DIR}/ValidationTest.h

20
src/tests/unittests/validation/ComputeValidationTests.cpp Normal file
View File

@ -0,0 +1,20 @@
// Copyright 2017 The NXT 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 "ValidationTest.h"
class ComputeValidationTest : public ValidationTest {
};
//TODO(cwallez@chromium.org): Add a regression test for Disptach validation trying to acces the input state.