diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2020-04-27 22:05:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 22:05:14 +0200 |
| commit | 1517cba8ca24005e8ea521a539b0e2a1142dfbbd (patch) | |
| tree | 6d8258b73d93499762d170202377baeb4f7e9512 /src/video_core/renderer_vulkan/fixed_pipeline_state.h | |
| parent | Merge pull request #3756 from ReinUsesLisp/integrated-devices (diff) | |
| parent | vk_rasterizer: Pack texceptions and color formats on invalid formats (diff) | |
| download | yuzu-1517cba8ca24005e8ea521a539b0e2a1142dfbbd.tar yuzu-1517cba8ca24005e8ea521a539b0e2a1142dfbbd.tar.gz yuzu-1517cba8ca24005e8ea521a539b0e2a1142dfbbd.tar.bz2 yuzu-1517cba8ca24005e8ea521a539b0e2a1142dfbbd.tar.lz yuzu-1517cba8ca24005e8ea521a539b0e2a1142dfbbd.tar.xz yuzu-1517cba8ca24005e8ea521a539b0e2a1142dfbbd.tar.zst yuzu-1517cba8ca24005e8ea521a539b0e2a1142dfbbd.zip | |
Diffstat (limited to 'src/video_core/renderer_vulkan/fixed_pipeline_state.h')
| -rw-r--r-- | src/video_core/renderer_vulkan/fixed_pipeline_state.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.h b/src/video_core/renderer_vulkan/fixed_pipeline_state.h index 9a950f4de..77188b862 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.h +++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.h @@ -17,7 +17,7 @@ namespace Vulkan { using Maxwell = Tegra::Engines::Maxwell3D::Regs; -struct alignas(32) FixedPipelineState { +struct FixedPipelineState { static u32 PackComparisonOp(Maxwell::ComparisonOp op) noexcept; static Maxwell::ComparisonOp UnpackComparisonOp(u32 packed) noexcept; @@ -237,7 +237,8 @@ struct alignas(32) FixedPipelineState { Rasterizer rasterizer; DepthStencil depth_stencil; ColorBlending color_blending; - std::array<u8, 20> padding; + + void Fill(const Maxwell& regs); std::size_t Hash() const noexcept; @@ -250,9 +251,6 @@ struct alignas(32) FixedPipelineState { static_assert(std::has_unique_object_representations_v<FixedPipelineState>); static_assert(std::is_trivially_copyable_v<FixedPipelineState>); static_assert(std::is_trivially_constructible_v<FixedPipelineState>); -static_assert(sizeof(FixedPipelineState) % 32 == 0, "Size is not aligned"); - -FixedPipelineState GetFixedPipelineState(const Maxwell& regs); } // namespace Vulkan |