ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ogl: don't call SetViewportChanged from backend as it's not needed any more

This commit is contained in:
degasus 2013-10-14 15:28:47 +02:00
parent 3151d8709c
commit acc0b3b21c
4 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/VideoBackends/OGL/Src/GLUtil.cpp
View File

@ -10,7 +10,6 @@
#include "ConfigManager.h" #include "ConfigManager.h"
#include "Render.h" #include "Render.h"
#include "VertexShaderManager.h"
#include "GLUtil.h" #include "GLUtil.h"

2
Source/Core/VideoBackends/OGL/Src/Render.cpp
View File

@ -1661,7 +1661,7 @@ void Renderer::RestoreAPIState()
SetDepthMode(); SetDepthMode();
SetBlendMode(true); SetBlendMode(true);
SetLogicOpMode(); SetLogicOpMode();
VertexShaderManager::SetViewportChanged(); UpdateViewport();
#ifndef USE_GLES3 #ifndef USE_GLES3
glPolygonMode(GL_FRONT_AND_BACK, g_ActiveConfig.bWireFrame ? GL_LINE : GL_FILL); glPolygonMode(GL_FRONT_AND_BACK, g_ActiveConfig.bWireFrame ? GL_LINE : GL_FILL);

2
Source/Core/VideoBackends/OGL/Src/TextureCache.cpp
View File

@ -37,7 +37,6 @@
#include "TextureCache.h" #include "TextureCache.h"
#include "TextureConverter.h" #include "TextureConverter.h"
#include "TextureDecoder.h" #include "TextureDecoder.h"
#include "VertexShaderManager.h"
#include "VideoConfig.h" #include "VideoConfig.h"
namespace OGL namespace OGL
@ -391,7 +390,6 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo
} }
FramebufferManager::SetFramebuffer(0); FramebufferManager::SetFramebuffer(0);
VertexShaderManager::SetViewportChanged();
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();

4
Source/Core/VideoBackends/OGL/Src/TextureConverter.cpp
View File

@ -9,7 +9,6 @@
#include "TextureConversionShader.h" #include "TextureConversionShader.h"
#include "TextureCache.h" #include "TextureCache.h"
#include "ProgramShaderCache.h" #include "ProgramShaderCache.h"
#include "VertexShaderManager.h"
#include "FramebufferManager.h" #include "FramebufferManager.h"
#include "Globals.h" #include "Globals.h"
#include "VideoConfig.h" #include "VideoConfig.h"
@ -350,7 +349,6 @@ void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, u8* des
EncodeToRamUsingShader(srcTexture, sourceRc, destAddr, dstWidth / 2, dstHeight, 0, false, false); EncodeToRamUsingShader(srcTexture, sourceRc, destAddr, dstWidth / 2, dstHeight, 0, false, false);
FramebufferManager::SetFramebuffer(0); FramebufferManager::SetFramebuffer(0);
VertexShaderManager::SetViewportChanged();
TextureCache::DisableStage(0); TextureCache::DisableStage(0);
g_renderer->RestoreAPIState(); g_renderer->RestoreAPIState();
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
@ -426,8 +424,6 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
VertexShaderManager::SetViewportChanged();
FramebufferManager::SetFramebuffer(0); FramebufferManager::SetFramebuffer(0);
g_renderer->RestoreAPIState(); g_renderer->RestoreAPIState();