From 48279c18402c04923a683e4a0488f8ad419b9b9a Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 17 Sep 2015 17:48:25 +0200 Subject: GLInterface: Fix VideoSW on linux + OSX Our Video Software backend isn't OpenGL Core compatible, so we need a flag to alloc a compatible one. --- Source/Core/VideoBackends/Software/SWmain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index b49fa8fc4f..9f56bc7e3d 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -78,7 +78,7 @@ bool VideoSoftware::Initialize(void *window_handle) InitInterface(); GLInterface->SetMode(GLInterfaceMode::MODE_DETECT); - if (!GLInterface->Create(window_handle)) + if (!GLInterface->Create(window_handle, false)) { INFO_LOG(VIDEO, "GLInterface::Create failed."); return false; -- cgit v1.2.3 From e3e0399af2c7957fb1636689103cae03e2e26db4 Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 17 Sep 2015 18:12:20 +0200 Subject: VideoSW: Drop HwRasterizer I don't remember it being working, and nobody cares about performance of videosw. --- Source/Core/VideoBackends/Software/SWmain.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index b49fa8fc4f..93dd37f03f 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -17,12 +17,12 @@ #include "Core/HW/VideoInterface.h" #include "VideoBackends/OGL/GLInterfaceBase.h" +#include "VideoBackends/OGL/GLUtil.h" #include "VideoBackends/OGL/GLExtensions/GLExtensions.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/Clipper.h" #include "VideoBackends/Software/DebugUtil.h" #include "VideoBackends/Software/EfbInterface.h" -#include "VideoBackends/Software/HwRasterizer.h" #include "VideoBackends/Software/OpcodeDecoder.h" #include "VideoBackends/Software/Rasterizer.h" #include "VideoBackends/Software/SWCommandProcessor.h" @@ -91,7 +91,6 @@ bool VideoSoftware::Initialize(void *window_handle) OpcodeDecoder::Init(); Clipper::Init(); Rasterizer::Init(); - HwRasterizer::Init(); SWRenderer::Init(); DebugUtil::Init(); @@ -155,7 +154,6 @@ void VideoSoftware::EmuStateChange(EMUSTATE_CHANGE newState) void VideoSoftware::Shutdown() { // TODO: should be in Video_Cleanup - HwRasterizer::Shutdown(); SWRenderer::Shutdown(); DebugUtil::Shutdown(); @@ -190,7 +188,6 @@ void VideoSoftware::Video_Prepare() // Do our OSD callbacks OSD::DoCallbacks(OSD::OSD_INIT); - HwRasterizer::Prepare(); SWRenderer::Prepare(); INFO_LOG(VIDEO, "Video backend initialized."); @@ -221,14 +218,11 @@ void VideoSoftware::Video_EndField() Core::Callback_VideoCopiedToXFB(false); return; } - if (!g_SWVideoConfig.bHwRasterizer) + if (!g_SWVideoConfig.bBypassXFB) { - if (!g_SWVideoConfig.bBypassXFB) - { - EfbInterface::yuv422_packed *xfb = (EfbInterface::yuv422_packed *) Memory::GetPointer(s_beginFieldArgs.xfbAddr); + EfbInterface::yuv422_packed *xfb = (EfbInterface::yuv422_packed *) Memory::GetPointer(s_beginFieldArgs.xfbAddr); - SWRenderer::UpdateColorTexture(xfb, s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight); - } + SWRenderer::UpdateColorTexture(xfb, s_beginFieldArgs.fbWidth, s_beginFieldArgs.fbHeight); } // Ideally we would just move all the OpenGL context stuff to the CPU thread, -- cgit v1.2.3 From a7e9a154a58ce1cda9b2b721e57f4045f58c20eb Mon Sep 17 00:00:00 2001 From: Markus Wick Date: Fri, 18 Sep 2015 13:40:09 +0200 Subject: Revert "GLInterface: Fix VideoSW on linux + OSX" --- Source/Core/VideoBackends/Software/SWmain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 12713bcc4e..93dd37f03f 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -78,7 +78,7 @@ bool VideoSoftware::Initialize(void *window_handle) InitInterface(); GLInterface->SetMode(GLInterfaceMode::MODE_DETECT); - if (!GLInterface->Create(window_handle, false)) + if (!GLInterface->Create(window_handle)) { INFO_LOG(VIDEO, "GLInterface::Create failed."); return false; -- cgit v1.2.3 From c976e14277aa70eaeb4fe6115137645a2a77b507 Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 17 Sep 2015 17:48:25 +0200 Subject: GLInterface: Fix VideoSW on linux + OSX (v2) Our Video Software backend isn't OpenGL Core compatible, so we need a flag to alloc a compatible one. v2: Fix AGL profile selection. --- Source/Core/VideoBackends/Software/SWmain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 93dd37f03f..12713bcc4e 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -78,7 +78,7 @@ bool VideoSoftware::Initialize(void *window_handle) InitInterface(); GLInterface->SetMode(GLInterfaceMode::MODE_DETECT); - if (!GLInterface->Create(window_handle)) + if (!GLInterface->Create(window_handle, false)) { INFO_LOG(VIDEO, "GLInterface::Create failed."); return false; -- cgit v1.2.3 From 95f3c956a80d880f9988fed5c4a920e436808195 Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Sat, 19 Sep 2015 04:40:00 +1200 Subject: Move GL interface code out of the OpenGL video backend. --- Source/Core/VideoBackends/Software/SWmain.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp') diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 12713bcc4e..83b55d0370 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -8,6 +8,9 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/StringUtil.h" +#include "Common/GL/GLInterfaceBase.h" +#include "Common/GL/GLUtil.h" +#include "Common/GL/GLExtensions/GLExtensions.h" #include "Common/Logging/LogManager.h" #include "Core/ConfigManager.h" @@ -16,9 +19,6 @@ #include "Core/HW/Memmap.h" #include "Core/HW/VideoInterface.h" -#include "VideoBackends/OGL/GLInterfaceBase.h" -#include "VideoBackends/OGL/GLUtil.h" -#include "VideoBackends/OGL/GLExtensions/GLExtensions.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/Clipper.h" #include "VideoBackends/Software/DebugUtil.h" -- cgit v1.2.3