mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-11 00:40:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stretch to Fit option works in separate render window now.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@946 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox 2008-10-24 02:29:05 +00:00
parent dc5eaad82c
commit 63f3e1ab8c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -167,7 +167,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight
float FactorH = 480.0f / (float)nBackbufferHeight; float FactorH = 480.0f / (float)nBackbufferHeight;
float Max = (FactorW < FactorH) ? FactorH : FactorW; float Max = (FactorW < FactorH) ? FactorH : FactorW;
if(g_Config.bStretchToFit && g_Config.renderToMainframe) if(g_Config.bStretchToFit)
{ {
MValueX = 1.0f / FactorW; MValueX = 1.0f / FactorW;
MValueY = 1.0f / FactorH; MValueY = 1.0f / FactorH;
@ -621,7 +621,7 @@ void OpenGL_Update()
float Max = (FactorW < FactorH) ? FactorH : FactorW; float Max = (FactorW < FactorH) ? FactorH : FactorW;
AR = (float)nBackbufferWidth / (float)nBackbufferHeight; AR = (float)nBackbufferWidth / (float)nBackbufferHeight;
if (g_Config.bStretchToFit && g_Config.renderToMainframe) if (g_Config.bStretchToFit)
{ {
MValueX = 1; MValueX = 1;
MValueY = 1; MValueY = 1;

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

@ -468,7 +468,7 @@ void Renderer::ReinitView(int nNewWidth, int nNewHeight)
} }
int Renderer::GetTargetWidth() int Renderer::GetTargetWidth()
{ {
if(g_Config.bStretchToFit && g_Config.renderToMainframe) if(g_Config.bStretchToFit)
return 640; return 640;
else else
return nBackbufferWidth; // return the actual window width return nBackbufferWidth; // return the actual window width
@ -476,7 +476,7 @@ int Renderer::GetTargetWidth()
int Renderer::GetTargetHeight() int Renderer::GetTargetHeight()
{ {
if(g_Config.bStretchToFit && g_Config.renderToMainframe) if(g_Config.bStretchToFit)
return 480; return 480;
else else
return nBackbufferHeight; // return the actual window height return nBackbufferHeight; // return the actual window height
@ -571,7 +571,7 @@ void Renderer::FlushZBufferAlphaToTarget()
for(int i = 1; i < 8; ++i) TextureMngr::DisableStage(i); for(int i = 1; i < 8; ++i) TextureMngr::DisableStage(i);
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
if(g_Config.bStretchToFit && g_Config.renderToMainframe) if(g_Config.bStretchToFit)
{ {
//TODO: Do Correctly in a bit //TODO: Do Correctly in a bit
float FactorW = (float)640 / (float)nBackbufferWidth; float FactorW = (float)640 / (float)nBackbufferWidth;

2
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
View File

@ -408,7 +408,7 @@ void VertexShaderMngr::SetConstants(VERTEXSHADER& vs)
hei = ceil(fabs(2 * rawViewport[1])); hei = ceil(fabs(2 * rawViewport[1]));
} }
if (g_Config.bStretchToFit && g_Config.renderToMainframe) if (g_Config.bStretchToFit)
{ {
glViewport( glViewport(
(int)(rawViewport[3]-rawViewport[0]-342-scissorXOff) + xoffs, (int)(rawViewport[3]-rawViewport[0]-342-scissorXOff) + xoffs,