Merge pull request #5305 from iwubcode/abstract_texture

Abstract Texture
This commit is contained in:
shuffle2
2017-06-18 12:57:05 -07:00
committed by GitHub
54 changed files with 1847 additions and 1423 deletions

View File

@ -27,6 +27,7 @@
#include "VideoBackends/OGL/BoundingBox.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/OGLTexture.h"
#include "VideoBackends/OGL/PostProcessing.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/RasterFont.h"
@ -1691,7 +1692,7 @@ void Renderer::PrepareFrameDumpRenderTexture(u32 width, u32 height)
m_frame_dump_render_texture_width = width;
m_frame_dump_render_texture_height = height;
TextureCache::SetStage();
OGLTexture::SetStage();
}
void Renderer::DestroyFrameDumpResources()
@ -1744,7 +1745,7 @@ void Renderer::RestoreAPIState()
if (vm->m_last_vao)
glBindVertexArray(vm->m_last_vao);
TextureCache::SetStage();
OGLTexture::SetStage();
}
void Renderer::SetGenerationMode()