From 62e0e6a0671e0f9f4225b1dde04013129b37db03 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Sat, 16 May 2015 13:52:16 +0200 Subject: [PATCH] gsdx: remove deprecated code Core was fixed to call GSFifo in the good thread --- plugins/GSdx/GSDevice.h | 4 ---- plugins/GSdx/GSDeviceOGL.cpp | 12 ------------ plugins/GSdx/GSDeviceOGL.h | 3 --- 3 files changed, 19 deletions(-) diff --git a/plugins/GSdx/GSDevice.h b/plugins/GSdx/GSDevice.h index 1895c25b81..04ddafb23d 100644 --- a/plugins/GSdx/GSDevice.h +++ b/plugins/GSdx/GSDevice.h @@ -152,10 +152,6 @@ public: virtual void PSSetShaderResource(int i, GSTexture* sRect) {} virtual void OMSetRenderTargets(GSTexture* rt, GSTexture* ds, const GSVector4i* scissor = NULL) {} - // Used for opengl multithread hack - virtual void AttachContext() {} - virtual void DetachContext() {} - GSTexture* GetCurrent(); void Merge(GSTexture* sTex[2], GSVector4* sRect, GSVector4* dRect, const GSVector2i& fs, bool slbg, bool mmod, const GSVector4& c); diff --git a/plugins/GSdx/GSDeviceOGL.cpp b/plugins/GSdx/GSDeviceOGL.cpp index e0f5e42206..7180a77612 100644 --- a/plugins/GSdx/GSDeviceOGL.cpp +++ b/plugins/GSdx/GSDeviceOGL.cpp @@ -384,18 +384,6 @@ void GSDeviceOGL::Flip() m_wnd->Flip(); } -void GSDeviceOGL::AttachContext() -{ - if (m_window) - m_window->AttachContext(); -} - -void GSDeviceOGL::DetachContext() -{ - if (m_window) - m_window->DetachContext(); -} - void GSDeviceOGL::BeforeDraw() { GL_PUSH("Before Draw Validation & Setup"); diff --git a/plugins/GSdx/GSDeviceOGL.h b/plugins/GSdx/GSDeviceOGL.h index 3c4db9cc70..fca2c941c0 100644 --- a/plugins/GSdx/GSDeviceOGL.h +++ b/plugins/GSdx/GSDeviceOGL.h @@ -562,9 +562,6 @@ class GSDeviceOGL : public GSDevice bool Reset(int w, int h); void Flip(); void SetVSync(bool enable); - // Used for opengl multithread hack - void AttachContext(); - void DetachContext(); void DrawPrimitive(); void DrawIndexedPrimitive();