Created
July 16, 2016 09:15
-
-
Save anonymous/e0b6035374e58ca1d854b9f59a372b05 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/xbmc/windowing/egl/EGLNativeTypeVuplus.cpp b/xbmc/windowing/egl/EGLNativeTypeVuplus.cpp | |
index cbc2a4f..fec753a 100644 | |
--- a/xbmc/windowing/egl/EGLNativeTypeVuplus.cpp | |
+++ b/xbmc/windowing/egl/EGLNativeTypeVuplus.cpp | |
@@ -103,6 +103,7 @@ bool CEGLNativeTypeVuplus::ProbeResolutions(std::vector<RESOLUTION_INFO> &resolu | |
{ | |
resolutions.clear(); | |
+#ifndef TARGET_VUPLUS_ARM | |
m_desktopResAll[0].iScreen = 0; | |
m_desktopResAll[0].bFullScreen = true; | |
m_desktopResAll[0].iWidth = 1280; | |
@@ -112,7 +113,7 @@ bool CEGLNativeTypeVuplus::ProbeResolutions(std::vector<RESOLUTION_INFO> &resolu | |
m_desktopResAll[0].dwFlags = D3DPRESENTFLAG_PROGRESSIVE; | |
m_desktopResAll[0].fRefreshRate = 50; | |
m_desktopResAll[0].strMode = StringUtils::Format("%dx%d", 1280, 720); | |
- m_desktopResAll[0].strMode = StringUtils::Format("%s @ %.2f%s - Full Screen", m_desktopRes.strMode.c_str(), (float)50,m_desktopRes.dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : ""); | |
+ m_desktopResAll[0].strMode = StringUtils::Format("%s @ %.2f%s - Full Screen", m_desktopResAll[0].strMode.c_str(), (float)50,m_desktopResAll[0].dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : ""); | |
m_desktopResAll[0].iSubtitles = (int)(0.965 * m_desktopResAll[0].iHeight); | |
@@ -157,6 +158,62 @@ bool CEGLNativeTypeVuplus::ProbeResolutions(std::vector<RESOLUTION_INFO> &resolu | |
CLog::Log(LOGDEBUG, "EGL initial desktop resolution %s\n", m_desktopResAll[2].strMode.c_str()); | |
resolutions.push_back(m_desktopResAll[2]); | |
+#else | |
+ m_desktopResAll[0].iScreen = 0; | |
+ m_desktopResAll[0].bFullScreen = true; | |
+ m_desktopResAll[0].iWidth = 1920; | |
+ m_desktopResAll[0].iHeight = 1080; | |
+ m_desktopResAll[0].iScreenWidth = 1920; | |
+ m_desktopResAll[0].iScreenHeight= 1080; | |
+ m_desktopResAll[0].dwFlags = D3DPRESENTFLAG_PROGRESSIVE; | |
+ m_desktopResAll[0].fRefreshRate = 50; | |
+ m_desktopResAll[0].strMode = StringUtils::Format("%dx%d", 1920, 1080); | |
+ m_desktopResAll[0].strMode = StringUtils::Format("%s @ %.2f%s - Full Screen", m_desktopResAll[0].strMode.c_str(), (float)50,m_desktopResAll[3].dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : ""); | |
+ | |
+ m_desktopResAll[0].iSubtitles = (int)(0.965 * m_desktopResAll[0].iHeight); | |
+ | |
+ CLog::Log(LOGDEBUG, "EGL initial desktop resolution %s\n", m_desktopResAll[0].strMode.c_str()); | |
+ | |
+ resolutions.push_back(m_desktopResAll[3]); | |
+ | |
+ m_desktopResAll[1].iScreen = 0; | |
+ m_desktopResAll[1].bFullScreen = true; | |
+ m_desktopResAll[1].iWidth = 1920; | |
+ m_desktopResAll[1].iHeight = 1080; | |
+ m_desktopResAll[1].iScreenWidth = 1920; | |
+ m_desktopResAll[1].iScreenHeight= 1080; | |
+ m_desktopResAll[1].dwFlags = D3DPRESENTFLAG_PROGRESSIVE; | |
+ | |
+ m_desktopResAll[1].dwFlags |= D3DPRESENTFLAG_MODE3DSBS; | |
+ m_desktopResAll[1].fRefreshRate = 50; | |
+ m_desktopResAll[1].strMode = StringUtils::Format("%dx%d", 1920, 1080); | |
+ m_desktopResAll[1].strMode = StringUtils::Format("%s @ %.2f%s - Full Screen 3DSBS", m_desktopResAll[1].strMode.c_str(), (float)50,m_desktopResAll[1].dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : ""); | |
+ | |
+ m_desktopResAll[1].iSubtitles = (int)(0.965 * m_desktopResAll[1].iHeight); | |
+ | |
+ CLog::Log(LOGDEBUG, "EGL initial desktop resolution %s\n", m_desktopResAll[1].strMode.c_str()); | |
+ | |
+ resolutions.push_back(m_desktopResAll[4]); | |
+ | |
+ m_desktopResAll[2].iScreen = 0; | |
+ m_desktopResAll[2].bFullScreen = true; | |
+ m_desktopResAll[2].iWidth = 1920; | |
+ m_desktopResAll[2].iHeight = 1080; | |
+ m_desktopResAll[2].iScreenWidth = 1920; | |
+ m_desktopResAll[2].iScreenHeight= 1080; | |
+ m_desktopResAll[2].dwFlags = D3DPRESENTFLAG_PROGRESSIVE; | |
+ | |
+ m_desktopResAll[2].dwFlags |= D3DPRESENTFLAG_MODE3DTB; | |
+ m_desktopResAll[2].fRefreshRate = 50; | |
+ m_desktopResAll[2].strMode = StringUtils::Format("%dx%d", 1920, 1080); | |
+ m_desktopResAll[2].strMode = StringUtils::Format("%s @ %.2f%s - Full Screen 3DTB", m_desktopResAll[2].strMode.c_str(), (float)50,m_desktopResAll[2].dwFlags & D3DPRESENTFLAG_INTERLACED ? "i" : ""); | |
+ | |
+ m_desktopResAll[2].iSubtitles = (int)(0.965 * m_desktopResAll[2].iHeight); | |
+ | |
+ CLog::Log(LOGDEBUG, "EGL initial desktop resolution %s\n", m_desktopResAll[2].strMode.c_str()); | |
+ | |
+ resolutions.push_back(m_desktopResAll[2]); | |
+#endif | |
m_desktopRes = m_desktopResAll[0]; | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment