From 8530997fff7b5b9d558f7dd6a0d07c236e4de16f Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 25 Jan 2015 01:34:57 +0100
Subject: SDL: Add experimental support for SDL2.

This is based upon skristiansson's change set to make ScummVM work with SDL2.
---
 backends/graphics/openglsdl/openglsdl-graphics.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'backends/graphics/openglsdl/openglsdl-graphics.h')

diff --git a/backends/graphics/openglsdl/openglsdl-graphics.h b/backends/graphics/openglsdl/openglsdl-graphics.h
index 9934ca79e2..1e927df766 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.h
+++ b/backends/graphics/openglsdl/openglsdl-graphics.h
@@ -68,8 +68,14 @@ protected:
 private:
 	bool setupMode(uint width, uint height);
 
+#if SDL_VERSION_ATLEAST(2, 0, 0)
+	SDL_GLContext _glContext;
+#else
 	uint32 _lastVideoModeLoad;
 	SDL_Surface *_hwScreen;
+#endif
+
+	void getWindowDimensions(int *width, int *height);
 
 	uint _lastRequestedWidth;
 	uint _lastRequestedHeight;
-- 
cgit v1.2.3


From 627d766325e1d435816648f85dbf9c007269b3f2 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 16 Feb 2015 00:49:42 +0100
Subject: SDL: Add basic abstraction class for the SDL window.

---
 backends/graphics/openglsdl/openglsdl-graphics.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/graphics/openglsdl/openglsdl-graphics.h')

diff --git a/backends/graphics/openglsdl/openglsdl-graphics.h b/backends/graphics/openglsdl/openglsdl-graphics.h
index 1e927df766..845880eb14 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.h
+++ b/backends/graphics/openglsdl/openglsdl-graphics.h
@@ -32,7 +32,7 @@
 
 class OpenGLSdlGraphicsManager : public OpenGL::OpenGLGraphicsManager, public SdlGraphicsManager, public Common::EventObserver {
 public:
-	OpenGLSdlGraphicsManager(uint desktopWidth, uint desktopHeight, SdlEventSource *eventSource);
+	OpenGLSdlGraphicsManager(uint desktopWidth, uint desktopHeight, SdlEventSource *eventSource, SdlWindow *window);
 	virtual ~OpenGLSdlGraphicsManager();
 
 	// GraphicsManager API
-- 
cgit v1.2.3