diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2018-03-13 16:37:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-13 16:37:58 +0100 |
| commit | f7ff634e4fa8353b968c310a94958741e8bb61cd (patch) | |
| tree | 05cc7e2810a474d78209787442cb6810c331f086 /Source/Core | |
| parent | 8a2cc146561c8305dff63d66a3a53be78cfddf91 (diff) | |
| parent | a5c0739fabefed9478b37aae8ae3e1a00a7f772a (diff) | |
Merge pull request #6432 from degasus/OGL-OSD-update
OGL: Scale OSD text on big screens.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/RasterFont.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 25 |
2 files changed, 22 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/OGL/RasterFont.cpp b/Source/Core/VideoBackends/OGL/RasterFont.cpp index a90f3c3721..f21ac22900 100644 --- a/Source/Core/VideoBackends/OGL/RasterFont.cpp +++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp @@ -157,6 +157,7 @@ RasterFont::RasterFont() } } glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHARACTER_WIDTH * CHARACTER_COUNT, CHARACTER_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data()); diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 8f2ca8a05c..a0c3bb6c8d 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -730,6 +730,16 @@ Renderer::Renderer() g_ogl_config.gl_renderer, g_ogl_config.gl_version), 5000); + if (!g_ogl_config.bSupportsGLBufferStorage && !g_ogl_config.bSupportsGLPinnedMemory) + { + OSD::AddMessage( + StringFromFormat("Your OpenGL driver does not support %s_buffer_storage.", + GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3 ? "EXT" : "ARB"), + 60000); + OSD::AddMessage("This device's performance will be terrible.", 60000); + OSD::AddMessage("Please ask your device vendor for an updated OpenGL driver.", 60000); + } + WARN_LOG(VIDEO, "Missing OGL Extensions: %s%s%s%s%s%s%s%s%s%s%s%s%s%s", g_ActiveConfig.backend_info.bSupportsDualSourceBlend ? "" : "DualSourceBlend ", g_ActiveConfig.backend_info.bSupportsPrimitiveRestart ? "" : "PrimitiveRestart ", @@ -841,10 +851,17 @@ Renderer::CreateFramebuffer(const AbstractTexture* color_attachment, void Renderer::RenderText(const std::string& text, int left, int top, u32 color) { - s_raster_font->printMultilineText(text, - left * 2.0f / static_cast<float>(m_backbuffer_width) - 1.0f, - 1.0f - top * 2.0f / static_cast<float>(m_backbuffer_height), 0, - m_backbuffer_width, m_backbuffer_height, color); + int screen_width = m_backbuffer_width; + int screen_height = m_backbuffer_height; + if (screen_width >= 2000) + { + screen_width /= 2; + screen_height /= 2; + } + + s_raster_font->printMultilineText(text, left * 2.0f / static_cast<float>(screen_width) - 1.0f, + 1.0f - top * 2.0f / static_cast<float>(screen_height), 0, + screen_width, screen_height, color); } std::unique_ptr<AbstractShader> Renderer::CreateShaderFromSource(ShaderStage stage, |