From a0b2deb4192bddad4d061f5d5df86411a437f01f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 28 Jan 2014 00:30:51 +0300
Subject: add support for screen scale in OpenGL modes.

---
 src/render/safeopenglgraphics.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'src/render/safeopenglgraphics.cpp')

diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index c6e8c1f30..bf9334655 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -53,11 +53,15 @@ SafeOpenGLGraphics::~SafeOpenGLGraphics()
 {
 }
 
-bool SafeOpenGLGraphics::setVideoMode(const int w, const int h, const int bpp,
-                                      const bool fs, const bool hwaccel,
-                                      const bool resize, const bool noFrame)
+bool SafeOpenGLGraphics::setVideoMode(const int w, const int h,
+                                      const int scale,
+                                      const int bpp,
+                                      const bool fs,
+                                      const bool hwaccel,
+                                      const bool resize,
+                                      const bool noFrame)
 {
-    setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame);
+    setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame);
 
     return setOpenGLMode();
 }
@@ -436,7 +440,8 @@ void SafeOpenGLGraphics::_beginDraw()
     glLoadIdentity();
 
     glOrtho(0.0, static_cast<double>(mRect.w),
-        static_cast<double>(mRect.h), 0.0, -1.0, 1.0);
+        static_cast<double>(mRect.h),
+        0.0, -1.0, 1.0);
 
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
@@ -537,9 +542,10 @@ bool SafeOpenGLGraphics::pushClipArea(gcn::Rectangle area)
     glPushMatrix();
     glTranslatef(static_cast<GLfloat>(transX + clipArea.xOffset),
                  static_cast<GLfloat>(transY + clipArea.yOffset), 0);
-    glScissor(clipArea.x, mRect.h - clipArea.y - clipArea.height,
-        clipArea.width, clipArea.height);
-
+    glScissor(clipArea.x * mScale,
+        (mRect.h - clipArea.y - clipArea.height) * mScale,
+        clipArea.width * mScale,
+        clipArea.height * mScale);
     return result;
 }
 
@@ -552,8 +558,10 @@ void SafeOpenGLGraphics::popClipArea()
 
     glPopMatrix();
     const gcn::ClipRectangle &clipArea = mClipStack.top();
-    glScissor(clipArea.x, mRect.h - clipArea.y - clipArea.height,
-        clipArea.width, clipArea.height);
+    glScissor(clipArea.x * mScale,
+        (mRect.h - clipArea.y - clipArea.height) * mScale,
+        clipArea.width * mScale,
+        clipArea.height * mScale);
 }
 
 void SafeOpenGLGraphics::drawPoint(int x, int y)
-- 
cgit v1.2.3-70-g09d2