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

Fix compilation error after ComputePipelineBase becomes virtual 

This patch fixes a compilation error after the CL "Avoid redundant
creation of ComputePipelineBase in GetCachedComputePipeline" is
landed after "Adds destroy handling for BindGroupLayout without
new backend changes yet" is merged into upstream.

BUG=dawn:529

Change-Id: I5dcb2370093a96703ceb0618f3590364b4eff382
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/66283
Reviewed-by: Zhaoming Jiang <zhaoming.jiang@intel.com>
Reviewed-by: Shaobo Yan <shaobo.yan@intel.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Jiawei Shao 2021-10-13 04:19:26 +00:00 committed by Dawn LUCI CQ
parent 8fd1eb5443
commit e0390b8967
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dawn_native/Device.cpp
View File

@ -24,7 +24,6 @@
#include "dawn_native/CommandBuffer.h" #include "dawn_native/CommandBuffer.h"
#include "dawn_native/CommandEncoder.h" #include "dawn_native/CommandEncoder.h"
#include "dawn_native/CompilationMessages.h" #include "dawn_native/CompilationMessages.h"
#include "dawn_native/ComputePipeline.h"
#include "dawn_native/CreatePipelineAsyncTask.h" #include "dawn_native/CreatePipelineAsyncTask.h"
#include "dawn_native/DynamicUploader.h" #include "dawn_native/DynamicUploader.h"
#include "dawn_native/ErrorData.h" #include "dawn_native/ErrorData.h"
@ -35,13 +34,10 @@
#include "dawn_native/InternalPipelineStore.h" #include "dawn_native/InternalPipelineStore.h"
#include "dawn_native/ObjectType_autogen.h" #include "dawn_native/ObjectType_autogen.h"
#include "dawn_native/PersistentCache.h" #include "dawn_native/PersistentCache.h"
#include "dawn_native/PipelineLayout.h"
#include "dawn_native/QuerySet.h" #include "dawn_native/QuerySet.h"
#include "dawn_native/Queue.h" #include "dawn_native/Queue.h"
#include "dawn_native/RenderBundleEncoder.h" #include "dawn_native/RenderBundleEncoder.h"
#include "dawn_native/RenderPipeline.h"
#include "dawn_native/Sampler.h" #include "dawn_native/Sampler.h"
#include "dawn_native/ShaderModule.h"
#include "dawn_native/Surface.h" #include "dawn_native/Surface.h"
#include "dawn_native/SwapChain.h" #include "dawn_native/SwapChain.h"
#include "dawn_native/Texture.h" #include "dawn_native/Texture.h"

1
src/dawn_native/Device.h
View File

@ -16,6 +16,7 @@
#define DAWNNATIVE_DEVICE_H_ #define DAWNNATIVE_DEVICE_H_
#include "dawn_native/Commands.h" #include "dawn_native/Commands.h"
#include "dawn_native/ComputePipeline.h"
#include "dawn_native/Error.h" #include "dawn_native/Error.h"
#include "dawn_native/Features.h" #include "dawn_native/Features.h"
#include "dawn_native/Format.h" #include "dawn_native/Format.h"

4
src/tests/unittests/native/mocks/DeviceMock.h
View File

@ -63,8 +63,8 @@ namespace dawn_native {
CreateBufferImpl, CreateBufferImpl,
(const BufferDescriptor*), (const BufferDescriptor*),
(override)); (override));
MOCK_METHOD(ResultOrError<Ref<ComputePipelineBase>>, MOCK_METHOD(Ref<ComputePipelineBase>,
CreateComputePipelineImpl, CreateUninitializedComputePipelineImpl,
(const ComputePipelineDescriptor*), (const ComputePipelineDescriptor*),
(override)); (override));
MOCK_METHOD(ResultOrError<Ref<PipelineLayoutBase>>, MOCK_METHOD(ResultOrError<Ref<PipelineLayoutBase>>,