diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 5ee624c67..88a36ed66 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -143,7 +143,8 @@ void Config::ReadValues() { std::string default_shader = "none (builtin)"; if (Settings::values.render_3d == Settings::StereoRenderOption::Anaglyph) default_shader = "dubois (builtin)"; - else if (Settings::values.render_3d == Settings::StereoRenderOption::Interlaced) + else if (Settings::values.render_3d == Settings::StereoRenderOption::Interlaced || + Settings::values.render_3d == Settings::StereoRenderOption::ReverseInterlaced) default_shader = "horizontal (builtin)"; Settings::values.pp_shader_name = sdl2_config->GetString("Renderer", "pp_shader_name", default_shader); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 537ecf99b..4646d5fd3 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -159,7 +159,7 @@ bg_blue = bg_green = # Whether and how Stereoscopic 3D should be rendered -# 0 (default): Off, 1: Side by Side, 2: Anaglyph, 3: Interlaced +# 0 (default): Off, 1: Side by Side, 2: Anaglyph, 3: Interlaced, 4: Reverse Interlaced render_3d = # Change 3D Intensity diff --git a/src/citra_qt/configuration/configure_enhancements.cpp b/src/citra_qt/configuration/configure_enhancements.cpp index 59c089afb..d93155847 100644 --- a/src/citra_qt/configuration/configure_enhancements.cpp +++ b/src/citra_qt/configuration/configure_enhancements.cpp @@ -81,7 +81,8 @@ void ConfigureEnhancements::updateShaders(Settings::StereoRenderOption stereo_op if (stereo_option == Settings::StereoRenderOption::Anaglyph) ui->shader_combobox->addItem(QStringLiteral("dubois (builtin)")); - else if (stereo_option == Settings::StereoRenderOption::Interlaced) + else if (stereo_option == Settings::StereoRenderOption::Interlaced || + stereo_option == Settings::StereoRenderOption::ReverseInterlaced) ui->shader_combobox->addItem(QStringLiteral("horizontal (builtin)")); else ui->shader_combobox->addItem(QStringLiteral("none (builtin)")); diff --git a/src/citra_qt/configuration/configure_enhancements.ui b/src/citra_qt/configuration/configure_enhancements.ui index b56b59004..99a2fdb7e 100644 --- a/src/citra_qt/configuration/configure_enhancements.ui +++ b/src/citra_qt/configuration/configure_enhancements.ui @@ -171,6 +171,11 @@ Interlaced + + + Reverse Interlaced + + diff --git a/src/core/settings.h b/src/core/settings.h index 324e2c1bd..0876d312f 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -32,7 +32,7 @@ enum class MicInputType { Static, }; -enum class StereoRenderOption { Off, SideBySide, Anaglyph, Interlaced }; +enum class StereoRenderOption { Off, SideBySide, Anaglyph, Interlaced, ReverseInterlaced }; namespace NativeButton { enum Values { diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 754ce43b6..10affce71 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -302,9 +302,11 @@ uniform vec4 o_resolution; uniform sampler2D color_texture; uniform sampler2D color_texture_r; +uniform int reverse_interlaced; + void main() { float screen_row = o_resolution.x * frag_tex_coord.x; - if (int(screen_row) % 2 == 0) + if (int(screen_row) % 2 == reverse_interlaced) color = texture(color_texture, frag_tex_coord); else color = texture(color_texture_r, frag_tex_coord); @@ -692,7 +694,8 @@ void RendererOpenGL::ReloadShader() { shader_data += shader_text; } } - } else if (Settings::values.render_3d == Settings::StereoRenderOption::Interlaced) { + } else if (Settings::values.render_3d == Settings::StereoRenderOption::Interlaced || + Settings::values.render_3d == Settings::StereoRenderOption::ReverseInterlaced) { if (Settings::values.pp_shader_name == "horizontal (builtin)") { shader_data += fragment_shader_interlaced; } else { @@ -725,9 +728,19 @@ void RendererOpenGL::ReloadShader() { uniform_modelview_matrix = glGetUniformLocation(shader.handle, "modelview_matrix"); uniform_color_texture = glGetUniformLocation(shader.handle, "color_texture"); if (Settings::values.render_3d == Settings::StereoRenderOption::Anaglyph || - Settings::values.render_3d == Settings::StereoRenderOption::Interlaced) { + Settings::values.render_3d == Settings::StereoRenderOption::Interlaced || + Settings::values.render_3d == Settings::StereoRenderOption::ReverseInterlaced) { uniform_color_texture_r = glGetUniformLocation(shader.handle, "color_texture_r"); } + if (Settings::values.render_3d == Settings::StereoRenderOption::Interlaced || + Settings::values.render_3d == Settings::StereoRenderOption::ReverseInterlaced) { + GLuint uniform_reverse_interlaced = + glGetUniformLocation(shader.handle, "reverse_interlaced"); + if (Settings::values.render_3d == Settings::StereoRenderOption::ReverseInterlaced) + glUniform1i(uniform_reverse_interlaced, 1); + else + glUniform1i(uniform_reverse_interlaced, 0); + } uniform_i_resolution = glGetUniformLocation(shader.handle, "i_resolution"); uniform_o_resolution = glGetUniformLocation(shader.handle, "o_resolution"); uniform_layer = glGetUniformLocation(shader.handle, "layer"); @@ -973,7 +986,8 @@ void RendererOpenGL::DrawScreens(const Layout::FramebufferLayout& layout, bool f const bool stereo_single_screen = Settings::values.render_3d == Settings::StereoRenderOption::Anaglyph || - Settings::values.render_3d == Settings::StereoRenderOption::Interlaced; + Settings::values.render_3d == Settings::StereoRenderOption::Interlaced || + Settings::values.render_3d == Settings::StereoRenderOption::ReverseInterlaced; // Bind a second texture for the right eye if in Anaglyph mode if (stereo_single_screen) {