OPENGL: Prevent access to a few more members in the SDL OpenGL code.

scummvm · Feb 15, 2012 · 5b3ebdf · 5b3ebdf
1 parent 05af37c
commit 5b3ebdf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
@@ -594,10 +594,8 @@ void OpenGLGraphicsManager::warpMouse(int x, int y) {
 		scaledY += _displayY;
 	}
 
+	setMousePosition(scaledX, scaledY);
 	setInternalMousePosition(scaledX, scaledY);
-
-	_cursorState.x = scaledX;
-	_cursorState.y = scaledY;
 }
 
 void OpenGLGraphicsManager::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {

diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
@@ -217,6 +217,7 @@ class OpenGLGraphicsManager : public GraphicsManager {
 
 	uint getAspectRatio() const;
 
+	void setFormatIsBGR(bool isBGR) { _formatBGR = isBGR; }
 	bool _formatBGR;
 
 	//
@@ -285,6 +286,14 @@ class OpenGLGraphicsManager : public GraphicsManager {
 	int _cursorTargetScale;
 	bool _cursorNeedsRedraw;
 
+	/**
+	 * Set up the mouse position for graphics output.
+	 *
+	 * @param x X coordinate in native coordinates.
+	 * @param y Y coordinate in native coordinates.
+	 */
+	void setMousePosition(int x, int y) { _cursorState.x = x; _cursorState.y = y; }
+
 	virtual void refreshCursor();
 	virtual void refreshCursorScale();
 
@@ -311,11 +320,6 @@ class OpenGLGraphicsManager : public GraphicsManager {
 	virtual bool saveScreenshot(const char *filename);
 
 #ifdef USE_OSD
-	/**
-	 * The OSD contents.
-	 */
-	Common::Array<Common::String> _osdLines;
-
 	/**
 	 * Returns the font used for on screen display
 	 */
@@ -326,6 +330,11 @@ class OpenGLGraphicsManager : public GraphicsManager {
 	 */
 	void updateOSD();
 
+	/**
+	 * The OSD contents.
+	 */
+	Common::Array<Common::String> _osdLines;
+
 	GLTexture *_osdTexture;
 	Graphics::Surface _osdSurface;
 	uint8 _osdAlpha;

diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -376,7 +376,7 @@ bool OpenGLSdlGraphicsManager::loadGFXMode() {
 	}
 
 	// Check if the screen is BGR format
-	_formatBGR = _hwscreen->format->Rshift != 0;
+	setFormatIsBGR(_hwscreen->format->Rshift != 0);
 
 	if (isFullscreen) {
 		_lastFullscreenModeWidth = _videoMode.hardwareWidth;
@@ -671,8 +671,7 @@ void OpenGLSdlGraphicsManager::transformMouseCoordinates(Common::Point &point) {
 }
 
 void OpenGLSdlGraphicsManager::notifyMousePos(Common::Point mouse) {
-	_cursorState.x = mouse.x;
-	_cursorState.y = mouse.y;
+	setMousePosition(mouse.x, mouse.y);
 }
 
 #endif