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

OGL: Move copy_image variable into backend.

This commit is contained in:
degasus 2015-07-25 12:10:52 +02:00
parent 767ed88f3d
commit e2f42f8fd0
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/VideoBackends/D3D/main.cpp
View File

@ -84,7 +84,6 @@ void InitBackendInfo()
g_Config.backend_info.bSupportsPostProcessing = false;
g_Config.backend_info.bSupportsPaletteConversion = true;
g_Config.backend_info.bSupportsClipControl = true;
g_Config.backend_info.bSupportsCopySubImage = true;
IDXGIFactory* factory;
IDXGIAdapter* ad;

10
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -469,10 +469,10 @@ Renderer::Renderer()
g_Config.backend_info.bSupportsGeometryShaders = GLExtensions::Version() >= 320;
g_Config.backend_info.bSupportsPaletteConversion = GLExtensions::Supports("GL_ARB_texture_buffer_object");
g_Config.backend_info.bSupportsClipControl = GLExtensions::Supports("GL_ARB_clip_control");
g_Config.backend_info.bSupportsCopySubImage = GLExtensions::Supports("GL_ARB_copy_image") ||
GLExtensions::Supports("GL_NV_copy_image") ||
GLExtensions::Supports("GL_EXT_copy_image") ||
GLExtensions::Supports("GL_OES_copy_image");
g_ogl_config.bSupportsCopySubImage = GLExtensions::Supports("GL_ARB_copy_image") ||
GLExtensions::Supports("GL_NV_copy_image") ||
GLExtensions::Supports("GL_EXT_copy_image") ||
GLExtensions::Supports("GL_OES_copy_image");
// Desktop OpenGL supports the binding layout if it supports 420pack
// OpenGL ES 3.1 supports it implicitly without an extension
@ -603,7 +603,7 @@ Renderer::Renderer()
g_ogl_config.bSupportSampleShading ? "" : "SSAA ",
g_ActiveConfig.backend_info.bSupportsGSInstancing ? "" : "GSInstancing ",
g_ActiveConfig.backend_info.bSupportsClipControl ? "" : "ClipControl ",
g_ActiveConfig.backend_info.bSupportsCopySubImage ? "" : "CopyImageSubData "
g_ogl_config.bSupportsCopySubImage ? "" : "CopyImageSubData "
);
s_last_multisample_mode = g_ActiveConfig.iMultisampleMode;

1
Source/Core/VideoBackends/OGL/Render.h
View File

@ -36,6 +36,7 @@ struct VideoConfig
bool bSupportViewportFloat;
bool bSupportsAEP;
bool bSupportsDebug;
bool bSupportsCopySubImage;
const char* gl_vendor;
const char* gl_renderer;

8
Source/Core/VideoBackends/OGL/TextureCache.cpp
View File

@ -147,7 +147,7 @@ void TextureCache::TCacheEntry::CopyRectangleFromTexture(
TCacheEntry* srcentry = (TCacheEntry*)source;
if (srcrect.GetWidth() == dstrect.GetWidth()
&& srcrect.GetHeight() == dstrect.GetHeight()
&& g_ActiveConfig.backend_info.bSupportsCopySubImage)
&& g_ogl_config.bSupportsCopySubImage)
{
glCopyImageSubData(
srcentry->texture,
@ -167,9 +167,11 @@ void TextureCache::TCacheEntry::CopyRectangleFromTexture(
1);
return;
}
else if (!config.rendertarget)
else if (!framebuffer)
{
return;
glGenFramebuffers(1, &framebuffer);
FramebufferManager::SetFramebuffer(framebuffer);
FramebufferManager::FramebufferTexture(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_ARRAY, texture, 0);
}
g_renderer->ResetAPIState();
FramebufferManager::SetFramebuffer(framebuffer);

1
Source/Core/VideoCommon/VideoConfig.h
View File

@ -160,7 +160,6 @@ struct VideoConfig final
bool bSupportsPostProcessing;
bool bSupportsPaletteConversion;
bool bSupportsClipControl; // Needed by VertexShaderGen, so must stay in VideoCommon
bool bSupportsCopySubImage; // Needed for partial texture updates
} backend_info;
// Utility