Bug 825995; fix scissor rect logic in GLContext. r=jgilbert
authorNicholas Cameron <ncameron@mozilla.com>
Thu, 03 Jan 2013 15:11:54 +1300
changeset 126508 c3c620f1d1369a5bcb6fb8af6a8e3d1e5c2553ca
parent 126507 bfeb3bc3da4e62acdf2754fe8467554bbdfc062f
child 126509 649dfcc03f382d682de5375a1630a15b9566237c
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert
bugs825995
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 825995; fix scissor rect logic in GLContext. r=jgilbert
gfx/gl/GLContext.h
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -1778,30 +1778,30 @@ public:
 
     void PushScissorRect() {
         nsIntRect copy(ScissorRect());
         mScissorStack.AppendElement(copy);
     }
 
     void PushScissorRect(const nsIntRect& aRect) {
         mScissorStack.AppendElement(aRect);
-        raw_fScissor(aRect.x, aRect.y, aRect.width, aRect.height);
+        fScissor(aRect.x, aRect.y, aRect.width, aRect.height);
     }
 
     void PopScissorRect() {
         if (mScissorStack.Length() < 2) {
             NS_WARNING("PopScissorRect with Length < 2!");
             return;
         }
 
         nsIntRect thisRect = ScissorRect();
         mScissorStack.TruncateLength(mScissorStack.Length() - 1);
         if (!thisRect.IsEqualInterior(ScissorRect())) {
-            raw_fScissor(ScissorRect().x, ScissorRect().y,
-                              ScissorRect().width, ScissorRect().height);
+            fScissor(ScissorRect().x, ScissorRect().y,
+                     ScissorRect().width, ScissorRect().height);
         }
     }
 
     /*** Viewport functions ***/
 
 private:
     // only does the glViewport call, no ViewportRect business
     void raw_fViewport(GLint x, GLint y, GLsizei width, GLsizei height) {