summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2020-01-18 18:50:45 -0300
committerGravatar ReinUsesLisp2020-01-18 18:50:47 -0300
commit94915d4ea1be93a9a2eb6da599762a79a153618f (patch)
treec84fc3916c59215a312fb4b334118390a15d9aab
parentMerge pull request #3311 from ReinUsesLisp/z32fx24s8 (diff)
downloadyuzu-94915d4ea1be93a9a2eb6da599762a79a153618f.tar.gz
yuzu-94915d4ea1be93a9a2eb6da599762a79a153618f.tar.xz
yuzu-94915d4ea1be93a9a2eb6da599762a79a153618f.zip
vk_graphics_pipeline: Set front facing properly
Front face was being forced to a certain value when cull face is disabled. Set a default value on initialization and drop the forcefully set front facing value with culling disabled.
Diffstat (limited to '')
-rw-r--r--src/video_core/engines/maxwell_3d.cpp1
-rw-r--r--src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index 1d1f780e7..58dfa8033 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -91,6 +91,7 @@ void Maxwell3D::InitializeRegisterDefaults() {
91 regs.rasterize_enable = 1; 91 regs.rasterize_enable = 1;
92 regs.rt_separate_frag_data = 1; 92 regs.rt_separate_frag_data = 1;
93 regs.framebuffer_srgb = 1; 93 regs.framebuffer_srgb = 1;
94 regs.cull.front_face = Maxwell3D::Regs::Cull::FrontFace::ClockWise;
94 95
95 mme_inline[MAXWELL3D_REG_INDEX(draw.vertex_end_gl)] = true; 96 mme_inline[MAXWELL3D_REG_INDEX(draw.vertex_end_gl)] = true;
96 mme_inline[MAXWELL3D_REG_INDEX(draw.vertex_begin_gl)] = true; 97 mme_inline[MAXWELL3D_REG_INDEX(draw.vertex_begin_gl)] = true;
diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
index 2e0536bf6..b155dfb49 100644
--- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
+++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
@@ -191,8 +191,7 @@ UniquePipeline VKGraphicsPipeline::CreatePipeline(const RenderPassParams& render
191 const vk::PipelineRasterizationStateCreateInfo rasterizer_ci( 191 const vk::PipelineRasterizationStateCreateInfo rasterizer_ci(
192 {}, rs.depth_clamp_enable, false, vk::PolygonMode::eFill, 192 {}, rs.depth_clamp_enable, false, vk::PolygonMode::eFill,
193 rs.cull_enable ? MaxwellToVK::CullFace(rs.cull_face) : vk::CullModeFlagBits::eNone, 193 rs.cull_enable ? MaxwellToVK::CullFace(rs.cull_face) : vk::CullModeFlagBits::eNone,
194 rs.cull_enable ? MaxwellToVK::FrontFace(rs.front_face) : vk::FrontFace::eCounterClockwise, 194 MaxwellToVK::FrontFace(rs.front_face), rs.depth_bias_enable, 0.0f, 0.0f, 0.0f, 1.0f);
195 rs.depth_bias_enable, 0.0f, 0.0f, 0.0f, 1.0f);
196 195
197 const vk::PipelineMultisampleStateCreateInfo multisampling_ci( 196 const vk::PipelineMultisampleStateCreateInfo multisampling_ci(
198 {}, vk::SampleCountFlagBits::e1, false, 0.0f, nullptr, false, false); 197 {}, vk::SampleCountFlagBits::e1, false, 0.0f, nullptr, false, false);