diff options
| author | 2022-10-13 20:12:31 -0400 | |
|---|---|---|
| committer | 2022-10-13 20:12:31 -0400 | |
| commit | 553be194f6b1c9d134561b73301b35e220ea89ac (patch) | |
| tree | 40936d2c70684c248e31a7a5ebe19822bb4cb9e1 | |
| parent | Merge pull request #9039 from Kelebek1/auto_backend (diff) | |
| parent | renderer_(opengl/vulkan): Fix tessellation clockwise parameter (diff) | |
| download | yuzu-553be194f6b1c9d134561b73301b35e220ea89ac.tar.gz yuzu-553be194f6b1c9d134561b73301b35e220ea89ac.tar.xz yuzu-553be194f6b1c9d134561b73301b35e220ea89ac.zip | |
Merge pull request #9067 from Morph1984/tess-cw
renderer_(opengl/vulkan): Fix tessellation clockwise parameter
| -rw-r--r-- | src/video_core/engines/maxwell_3d.h | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/fixed_pipeline_state.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index 12dbd9cc4..75e3b868d 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h | |||
| @@ -390,7 +390,7 @@ public: | |||
| 390 | FractionalEven = 2, | 390 | FractionalEven = 2, |
| 391 | }; | 391 | }; |
| 392 | 392 | ||
| 393 | enum class OutputPrimitves : u32 { | 393 | enum class OutputPrimitives : u32 { |
| 394 | Points = 0, | 394 | Points = 0, |
| 395 | Lines = 1, | 395 | Lines = 1, |
| 396 | Triangles_CW = 2, | 396 | Triangles_CW = 2, |
| @@ -401,7 +401,7 @@ public: | |||
| 401 | union { | 401 | union { |
| 402 | BitField<0, 2, DomainType> domain_type; | 402 | BitField<0, 2, DomainType> domain_type; |
| 403 | BitField<4, 2, Spacing> spacing; | 403 | BitField<4, 2, Spacing> spacing; |
| 404 | BitField<8, 2, OutputPrimitves> output_primitives; | 404 | BitField<8, 2, OutputPrimitives> output_primitives; |
| 405 | }; | 405 | }; |
| 406 | } params; | 406 | } params; |
| 407 | 407 | ||
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index 6bdb0b645..609f0a772 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp | |||
| @@ -317,8 +317,8 @@ GraphicsPipeline* ShaderCache::CurrentGraphicsPipeline() { | |||
| 317 | graphics_key.tessellation_primitive.Assign(regs.tessellation.params.domain_type.Value()); | 317 | graphics_key.tessellation_primitive.Assign(regs.tessellation.params.domain_type.Value()); |
| 318 | graphics_key.tessellation_spacing.Assign(regs.tessellation.params.spacing.Value()); | 318 | graphics_key.tessellation_spacing.Assign(regs.tessellation.params.spacing.Value()); |
| 319 | graphics_key.tessellation_clockwise.Assign( | 319 | graphics_key.tessellation_clockwise.Assign( |
| 320 | regs.tessellation.params.output_primitives.Value() != | 320 | regs.tessellation.params.output_primitives.Value() == |
| 321 | Maxwell::Tessellation::OutputPrimitves::Triangles_CCW); | 321 | Maxwell::Tessellation::OutputPrimitives::Triangles_CW); |
| 322 | graphics_key.xfb_enabled.Assign(regs.transform_feedback_enabled != 0 ? 1 : 0); | 322 | graphics_key.xfb_enabled.Assign(regs.transform_feedback_enabled != 0 ? 1 : 0); |
| 323 | if (graphics_key.xfb_enabled) { | 323 | if (graphics_key.xfb_enabled) { |
| 324 | SetXfbState(graphics_key.xfb_state, regs); | 324 | SetXfbState(graphics_key.xfb_state, regs); |
diff --git a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp index eab1b8f93..f85ed8e5b 100644 --- a/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp +++ b/src/video_core/renderer_vulkan/fixed_pipeline_state.cpp | |||
| @@ -73,8 +73,8 @@ void FixedPipelineState::Refresh(Tegra::Engines::Maxwell3D& maxwell3d, | |||
| 73 | patch_control_points_minus_one.Assign(regs.patch_vertices - 1); | 73 | patch_control_points_minus_one.Assign(regs.patch_vertices - 1); |
| 74 | tessellation_primitive.Assign(static_cast<u32>(regs.tessellation.params.domain_type.Value())); | 74 | tessellation_primitive.Assign(static_cast<u32>(regs.tessellation.params.domain_type.Value())); |
| 75 | tessellation_spacing.Assign(static_cast<u32>(regs.tessellation.params.spacing.Value())); | 75 | tessellation_spacing.Assign(static_cast<u32>(regs.tessellation.params.spacing.Value())); |
| 76 | tessellation_clockwise.Assign(regs.tessellation.params.output_primitives.Value() != | 76 | tessellation_clockwise.Assign(regs.tessellation.params.output_primitives.Value() == |
| 77 | Maxwell::Tessellation::OutputPrimitves::Triangles_CCW); | 77 | Maxwell::Tessellation::OutputPrimitives::Triangles_CW); |
| 78 | logic_op_enable.Assign(regs.logic_op.enable != 0 ? 1 : 0); | 78 | logic_op_enable.Assign(regs.logic_op.enable != 0 ? 1 : 0); |
| 79 | logic_op.Assign(PackLogicOp(regs.logic_op.op)); | 79 | logic_op.Assign(PackLogicOp(regs.logic_op.op)); |
| 80 | topology.Assign(regs.draw.topology); | 80 | topology.Assign(regs.draw.topology); |