ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Frontend: Add display linear filtering option

This commit is contained in:
Connor McLaughlin 2019-10-27 00:02:01 +10:00
parent f9e964e34d
commit 0d71ebccc8
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/settings.h
View File

@ -15,6 +15,7 @@ struct Settings
u32 gpu_resolution_scale = 1; u32 gpu_resolution_scale = 1;
u32 max_gpu_resolution_scale = 1; u32 max_gpu_resolution_scale = 1;
bool gpu_vsync = true; bool gpu_vsync = true;
bool display_linear_filtering = true;
struct DebugSettings struct DebugSettings
{ {

17
src/duckstation/sdl_interface.cpp
View File

@ -187,6 +187,14 @@ void main()
m_app_icon_texture = m_app_icon_texture =
std::make_unique<GL::Texture>(APP_ICON_WIDTH, APP_ICON_HEIGHT, GL_RGBA, GL_UNSIGNED_BYTE, APP_ICON_DATA, true); std::make_unique<GL::Texture>(APP_ICON_WIDTH, APP_ICON_HEIGHT, GL_RGBA, GL_UNSIGNED_BYTE, APP_ICON_DATA, true);
// samplers
glGenSamplers(1, &m_display_nearest_sampler);
glSamplerParameteri(m_display_nearest_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glSamplerParameteri(m_display_nearest_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glGenSamplers(1, &m_display_linear_sampler);
glSamplerParameteri(m_display_linear_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glSamplerParameteri(m_display_linear_sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
return true; return true;
} }
@ -684,6 +692,7 @@ void SDLInterface::RenderDisplay()
// - 20 for main menu padding // - 20 for main menu padding
const auto [vp_left, vp_top, vp_width, vp_height] = const auto [vp_left, vp_top, vp_width, vp_height] =
CalculateDrawRect(m_window_width, std::max(m_window_height - 20, 1), m_display_aspect_ratio); CalculateDrawRect(m_window_width, std::max(m_window_height - 20, 1), m_display_aspect_ratio);
const bool linear_filter = m_system ? m_system->GetSettings().display_linear_filtering : false;
glViewport(vp_left, m_window_height - (20 + vp_top) - vp_height, vp_width, vp_height); glViewport(vp_left, m_window_height - (20 + vp_top) - vp_height, vp_width, vp_height);
glDisable(GL_BLEND); glDisable(GL_BLEND);
@ -698,8 +707,10 @@ void SDLInterface::RenderDisplay()
static_cast<float>(m_display_texture_width) / static_cast<float>(m_display_texture->GetWidth()), static_cast<float>(m_display_texture_width) / static_cast<float>(m_display_texture->GetWidth()),
static_cast<float>(m_display_texture_height) / static_cast<float>(m_display_texture->GetHeight())); static_cast<float>(m_display_texture_height) / static_cast<float>(m_display_texture->GetHeight()));
m_display_texture->Bind(); m_display_texture->Bind();
glBindSampler(0, linear_filter ? m_display_linear_sampler : m_display_nearest_sampler);
glBindVertexArray(m_display_vao); glBindVertexArray(m_display_vao);
glDrawArrays(GL_TRIANGLES, 0, 3); glDrawArrays(GL_TRIANGLES, 0, 3);
glBindSampler(0, 0);
} }
void SDLInterface::DrawImGui() void SDLInterface::DrawImGui()
@ -820,6 +831,12 @@ void SDLInterface::DrawMainMenuBar()
if (ImGui::MenuItem("VSync", nullptr, &m_system->GetSettings().gpu_vsync)) if (ImGui::MenuItem("VSync", nullptr, &m_system->GetSettings().gpu_vsync))
UpdateAudioVisualSync(); UpdateAudioVisualSync();
if (ImGui::MenuItem("Display Linear Filtering", nullptr, &m_system->GetSettings().display_linear_filtering))
{
// this has to update the display texture for now..
m_system->GetGPU()->UpdateResolutionScale();
}
ImGui::EndMenu(); ImGui::EndMenu();
} }

2
src/duckstation/sdl_interface.h
View File

@ -101,6 +101,8 @@ private:
u32 m_display_texture_height = 0; u32 m_display_texture_height = 0;
float m_display_aspect_ratio = 1.0f; float m_display_aspect_ratio = 1.0f;
bool m_display_texture_changed = false; bool m_display_texture_changed = false;
GLuint m_display_nearest_sampler = false;
GLuint m_display_linear_sampler = false;
std::deque<OSDMessage> m_osd_messages; std::deque<OSDMessage> m_osd_messages;
std::mutex m_osd_messages_lock; std::mutex m_osd_messages_lock;