mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-06-27 17:03:43 +00:00
2c32fa6476
The VertexState tests were failing on MSVC debug x64 because the ComboVertexStateDescriptor was copied but internal pointer to itself weren't updated. This commit makes the structure non-movable and non-copyable so the problem doesn't happen in the future and fixes compilation errors. Bug: dawn:602 Change-Id: Idd3a68933920eb47939217362e9e137dd7581014 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/38400 Auto-Submit: Corentin Wallez <cwallez@chromium.org> Reviewed-by: Austin Eng <enga@chromium.org> Reviewed-by: Stephen White <senorblanco@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
59 lines
2.3 KiB
C++
59 lines
2.3 KiB
C++
// Copyright 2018 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.
|
|
|
|
#ifndef UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
|
|
#define UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
|
|
|
|
#include <dawn/webgpu_cpp.h>
|
|
|
|
#include "common/Constants.h"
|
|
|
|
#include <array>
|
|
|
|
namespace utils {
|
|
|
|
class ComboVertexStateDescriptor : public wgpu::VertexStateDescriptor {
|
|
public:
|
|
ComboVertexStateDescriptor();
|
|
|
|
ComboVertexStateDescriptor(const ComboVertexStateDescriptor&) = delete;
|
|
ComboVertexStateDescriptor& operator=(const ComboVertexStateDescriptor&) = delete;
|
|
ComboVertexStateDescriptor(ComboVertexStateDescriptor&&) = delete;
|
|
ComboVertexStateDescriptor& operator=(ComboVertexStateDescriptor&&) = delete;
|
|
|
|
std::array<wgpu::VertexBufferLayoutDescriptor, kMaxVertexBuffers> cVertexBuffers;
|
|
std::array<wgpu::VertexAttributeDescriptor, kMaxVertexAttributes> cAttributes;
|
|
};
|
|
|
|
class ComboRenderPipelineDescriptor : public wgpu::RenderPipelineDescriptor {
|
|
public:
|
|
ComboRenderPipelineDescriptor(const wgpu::Device& device);
|
|
|
|
ComboRenderPipelineDescriptor(const ComboRenderPipelineDescriptor&) = delete;
|
|
ComboRenderPipelineDescriptor& operator=(const ComboRenderPipelineDescriptor&) = delete;
|
|
ComboRenderPipelineDescriptor(ComboRenderPipelineDescriptor&&) = delete;
|
|
ComboRenderPipelineDescriptor& operator=(ComboRenderPipelineDescriptor&&) = delete;
|
|
|
|
wgpu::ProgrammableStageDescriptor cFragmentStage;
|
|
|
|
ComboVertexStateDescriptor cVertexState;
|
|
wgpu::RasterizationStateDescriptor cRasterizationState;
|
|
std::array<wgpu::ColorStateDescriptor, kMaxColorAttachments> cColorStates;
|
|
wgpu::DepthStencilStateDescriptor cDepthStencilState;
|
|
};
|
|
|
|
} // namespace utils
|
|
|
|
#endif // UTILS_COMBORENDERPIPELINEDESCRIPTOR_H_
|