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:
parent
181e22b482
commit
4efaf32d1b
|
@ -436,8 +436,7 @@ namespace backend {
|
||||||
|
|
||||||
constexpr ValidationAspects requiredDispatchAspects =
|
constexpr ValidationAspects requiredDispatchAspects =
|
||||||
1 << VALIDATION_ASPECT_COMPUTE_PIPELINE |
|
1 << VALIDATION_ASPECT_COMPUTE_PIPELINE |
|
||||||
1 << VALIDATION_ASPECT_BINDGROUPS |
|
1 << VALIDATION_ASPECT_BINDGROUPS;
|
||||||
1 << VALIDATION_ASPECT_VERTEX_BUFFERS;
|
|
||||||
|
|
||||||
if ((requiredDispatchAspects & ~aspects).any()) {
|
if ((requiredDispatchAspects & ~aspects).any()) {
|
||||||
// Compute the lazily computed aspects
|
// Compute the lazily computed aspects
|
||||||
|
@ -445,11 +444,6 @@ namespace backend {
|
||||||
aspects.set(VALIDATION_ASPECT_BINDGROUPS);
|
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
|
// Check again if anything is missing
|
||||||
if ((requiredDispatchAspects & ~aspects).any()) {
|
if ((requiredDispatchAspects & ~aspects).any()) {
|
||||||
HandleError("Some dispatch state is missing");
|
HandleError("Some dispatch state is missing");
|
||||||
|
|
|
@ -26,6 +26,7 @@ add_executable(nxt_unittests
|
||||||
${UNITTESTS_DIR}/ToBackendTests.cpp
|
${UNITTESTS_DIR}/ToBackendTests.cpp
|
||||||
${UNITTESTS_DIR}/WireTests.cpp
|
${UNITTESTS_DIR}/WireTests.cpp
|
||||||
${VALIDATION_TESTS_DIR}/BufferValidationTests.cpp
|
${VALIDATION_TESTS_DIR}/BufferValidationTests.cpp
|
||||||
|
${VALIDATION_TESTS_DIR}/ComputeValidationTests.cpp
|
||||||
${VALIDATION_TESTS_DIR}/DepthStencilStateValidationTests.cpp
|
${VALIDATION_TESTS_DIR}/DepthStencilStateValidationTests.cpp
|
||||||
${VALIDATION_TESTS_DIR}/ValidationTest.cpp
|
${VALIDATION_TESTS_DIR}/ValidationTest.cpp
|
||||||
${VALIDATION_TESTS_DIR}/ValidationTest.h
|
${VALIDATION_TESTS_DIR}/ValidationTest.h
|
||||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue