piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

OpenGL:

Browse Source 
1. Removed the custom screen size functions again (the ones I added in revision 2310). All games I tried are now full screen so it's probably not needed any more.

2. Disabled my XFB supplements when the real XFB is on, since they are supposed to supplement each other.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2318 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-02-20 13:35:43 +00:00
parent e0593b1041
commit cfcfef9b51
6 changed files with 16 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -697,7 +697,7 @@ bool Renderer::SetScissorRect()
{
/* I don't know how this works with other options so I'm limiting it to this to test it, if you want to add support for other modes
or make this solution more general please do */
if(g_Config.bStretchToFit && !g_Config.bKeepAR)
if(g_Config.bStretchToFit && !g_Config.bKeepAR && !g_Config.bUseXFB)
{
int WidthDifference = 640 - (int)(rc_right - rc_left);
int HeightDifference = 480 - (int)(rc_bottom - rc_top);
@ -1274,29 +1274,8 @@ void UpdateViewport()
}
// -------------------------------------
// -----------------------------------------------------------------------
// Adjust the screen size. If someone figures out how to correctly adjust the screen size as the GC or Wii does, this may not be needed.
// ------------------
if (g_Config.bScreenSize)
{
// Calculate width and height as a fraction of the current
float Width = (float)GLWidth * ((float)g_Config.iScreenWidth / 100.0);
float Height = (float)GLHeight * ((float)g_Config.iScreenHeight / 100.0);
// Adjust X and Y
GLx = GLx + g_Config.iScreenLeft;
GLy = GLy - g_Config.iScreenTop;
GLWidth = (int)Width;
GLHeight = (int)Height;
//Console::Print("W:%i H:%i W:%f H:%f Wid:%i Hei:%i x:%i y:%i\n", g_Config.iScreenWidth, g_Config.iScreenHeight, Width, Height, GLWidth, GLHeight, GLx, GLy);
}
// -------------------------------------
// I'm limiting it to this modes to test it
if(g_Config.bStretchToFit && !g_Config.bKeepAR)
// I'm limiting it to these modes to test it
if(g_Config.bStretchToFit && !g_Config.bKeepAR && !g_Config.bUseXFB)
{
GLWidth = GLWidth + (GLScissorW - 640);
GLHeight = GLHeight + (GLScissorH - 480);