From bda3cbe86f4194089c7309993dacb7617951707d Mon Sep 17 00:00:00 2001 From: "gregory.hainaut" Date: Mon, 2 Apr 2012 16:46:54 +0000 Subject: [PATCH] gsdx-ogl: fix build failure due to a leftover of a patch conflict git-svn-id: http://pcsx2.googlecode.com/svn/branches/gsdx-ogl@5140 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/GSdx/GSDeviceOGL.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/GSdx/GSDeviceOGL.h b/plugins/GSdx/GSDeviceOGL.h index 0ab52b8853..fcbfd399ec 100644 --- a/plugins/GSdx/GSDeviceOGL.h +++ b/plugins/GSdx/GSDeviceOGL.h @@ -805,7 +805,7 @@ class GSDeviceOGL : public GSDevice GSTextureOGL* rtv; GSTextureOGL* dsv; GLuint fbo; -+ GLenum draw; + GLenum draw; } m_state; bool m_srv_changed;