From 98cc2365034a93c69704daa69efb389799cc9627 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Tue, 24 Aug 2010 18:44:39 +0100 Subject: Backed out changeset a62bf7c0af21 Backing out this merge that I pushed (prematurely) to the wrong place. --- indra/llui/lllocalcliprect.h | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'indra/llui/lllocalcliprect.h') diff --git a/indra/llui/lllocalcliprect.h b/indra/llui/lllocalcliprect.h index eeeaf2adb6..0097958916 100644 --- a/indra/llui/lllocalcliprect.h +++ b/indra/llui/lllocalcliprect.h @@ -25,9 +25,7 @@ #ifndef LLLOCALCLIPRECT_H #define LLLOCALCLIPRECT_H -#include "llgl.h" #include "llrect.h" // can't forward declare, it's templated -#include // Clip rendering to a specific rectangle using GL scissor // Just create one of these on the stack: @@ -35,29 +33,15 @@ // LLLocalClipRect(rect); // draw(); // } -class LLScreenClipRect -{ -public: - LLScreenClipRect(const LLRect& rect, BOOL enabled = TRUE); - virtual ~LLScreenClipRect(); - -private: - static void pushClipRect(const LLRect& rect); - static void popClipRect(); - static void updateScissorRegion(); - -private: - LLGLState mScissorState; - BOOL mEnabled; - - static std::stack sClipRectStack; -}; - -class LLLocalClipRect : public LLScreenClipRect +class LLLocalClipRect { public: LLLocalClipRect(const LLRect& rect, BOOL enabled = TRUE); ~LLLocalClipRect(); + +private: + // implementation class + class LLScreenClipRect* mScreenClipRect; }; #endif -- cgit v1.2.3