diff options
| author | omegadox <omegadox@gmail.com> | 2008-10-24 02:29:05 +0000 |
|---|---|---|
| committer | omegadox <omegadox@gmail.com> | 2008-10-24 02:29:05 +0000 |
| commit | 63f3e1ab8cd32df483fa4ef9f94c16fcad77c261 (patch) | |
| tree | e006cfcaf6669346c74e8d24d66e08f78674e1be /Source | |
| parent | dc5eaad82ced8eb9a3164168ddca1851abfb6c26 (diff) | |
Stretch to Fit option works in separate render window now.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@946 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 4 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 6 | ||||
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp index 5454ad2d5d..068d3325f2 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp @@ -167,7 +167,7 @@ bool OpenGL_Create(SVideoInitialize &_VideoInitialize, int _iwidth, int _iheight float FactorH = 480.0f / (float)nBackbufferHeight;
float Max = (FactorW < FactorH) ? FactorH : FactorW;
- if(g_Config.bStretchToFit && g_Config.renderToMainframe)
+ if(g_Config.bStretchToFit)
{
MValueX = 1.0f / FactorW;
MValueY = 1.0f / FactorH;
@@ -621,7 +621,7 @@ void OpenGL_Update() float Max = (FactorW < FactorH) ? FactorH : FactorW;
AR = (float)nBackbufferWidth / (float)nBackbufferHeight;
- if (g_Config.bStretchToFit && g_Config.renderToMainframe)
+ if (g_Config.bStretchToFit)
{
MValueX = 1;
MValueY = 1;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index f386b67e15..b5b51f3496 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -468,7 +468,7 @@ void Renderer::ReinitView(int nNewWidth, int nNewHeight) }
int Renderer::GetTargetWidth()
{
- if(g_Config.bStretchToFit && g_Config.renderToMainframe)
+ if(g_Config.bStretchToFit)
return 640;
else
return nBackbufferWidth; // return the actual window width
@@ -476,7 +476,7 @@ int Renderer::GetTargetWidth() int Renderer::GetTargetHeight()
{
- if(g_Config.bStretchToFit && g_Config.renderToMainframe)
+ if(g_Config.bStretchToFit)
return 480;
else
return nBackbufferHeight; // return the actual window height
@@ -571,7 +571,7 @@ void Renderer::FlushZBufferAlphaToTarget() for(int i = 1; i < 8; ++i) TextureMngr::DisableStage(i);
GL_REPORT_ERRORD();
- if(g_Config.bStretchToFit && g_Config.renderToMainframe)
+ if(g_Config.bStretchToFit)
{
//TODO: Do Correctly in a bit
float FactorW = (float)640 / (float)nBackbufferWidth;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp index d13c0d1365..c5538afadd 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp @@ -408,7 +408,7 @@ void VertexShaderMngr::SetConstants(VERTEXSHADER& vs) hei = ceil(fabs(2 * rawViewport[1]));
}
- if (g_Config.bStretchToFit && g_Config.renderToMainframe)
+ if (g_Config.bStretchToFit)
{
glViewport(
(int)(rawViewport[3]-rawViewport[0]-342-scissorXOff) + xoffs,
|