mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-05-16 20:31:20 +00:00
a594f8fdb4
Dawn used to return "nullptr" when an error happened while creating an object. To match WebGPU we want to return valid pointers but to "error" objects. This commit implements WebGPU error handling for all "descriptorized" objects and changes the nullptr error checks into "ValidateObject" checks. This method is used both to check that the object isn't an error, but also that all objects in a function call are from the same device. New validation is added to objects with methods (apart from Device) so they check they aren't error objects. A large number of ASSERTs were added to check that frontend objects aren't accessed when they are errors, so that missing validation would hit the asserts instead of crashing randomly. The bind group validation tests were modified to test the behavior with both nullptrs and error objects. Future commits will change the CommandBufferBuilder to not be a builder anymore but an "Encoder" instead with special-cased error handling. Then once all objects are descriptorized, the notion of builders will be removed from the code. BUG=dawn:8 Change-Id: I8647712d5de3deb0e99e3bc58f34496f67710edd Reviewed-on: https://dawn-review.googlesource.com/c/4360 Reviewed-by: Kai Ninomiya <kainino@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
63 lines
2.3 KiB
C++
63 lines
2.3 KiB
C++
// Copyright 2017 The Dawn 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 "dawn_native/ComputePipeline.h"
|
|
|
|
#include "dawn_native/Device.h"
|
|
|
|
namespace dawn_native {
|
|
|
|
MaybeError ValidateComputePipelineDescriptor(DeviceBase* device,
|
|
const ComputePipelineDescriptor* descriptor) {
|
|
if (descriptor->nextInChain != nullptr) {
|
|
return DAWN_VALIDATION_ERROR("nextInChain must be nullptr");
|
|
}
|
|
|
|
DAWN_TRY(device->ValidateObject(descriptor->module));
|
|
DAWN_TRY(device->ValidateObject(descriptor->layout));
|
|
|
|
if (descriptor->entryPoint != std::string("main")) {
|
|
return DAWN_VALIDATION_ERROR("Currently the entry point has to be main()");
|
|
}
|
|
|
|
if (descriptor->module->GetExecutionModel() != dawn::ShaderStage::Compute) {
|
|
return DAWN_VALIDATION_ERROR("Setting module with wrong execution model");
|
|
}
|
|
|
|
if (!descriptor->module->IsCompatibleWithPipelineLayout(descriptor->layout)) {
|
|
return DAWN_VALIDATION_ERROR("Stage not compatible with layout");
|
|
}
|
|
|
|
return {};
|
|
}
|
|
|
|
// ComputePipelineBase
|
|
|
|
ComputePipelineBase::ComputePipelineBase(DeviceBase* device,
|
|
const ComputePipelineDescriptor* descriptor)
|
|
: PipelineBase(device, descriptor->layout, dawn::ShaderStageBit::Compute) {
|
|
ExtractModuleData(dawn::ShaderStage::Compute, descriptor->module);
|
|
}
|
|
|
|
ComputePipelineBase::ComputePipelineBase(DeviceBase* device, ObjectBase::ErrorTag tag)
|
|
: PipelineBase(device, tag) {
|
|
}
|
|
|
|
// static
|
|
ComputePipelineBase* ComputePipelineBase::MakeError(DeviceBase* device) {
|
|
return new ComputePipelineBase(device, ObjectBase::kError);
|
|
}
|
|
|
|
} // namespace dawn_native
|