diff options
| author | Vir Linden <vir@lindenlab.com> | 2021-11-09 21:39:47 +0000 |
|---|---|---|
| committer | Vir Linden <vir@lindenlab.com> | 2021-11-09 21:39:47 +0000 |
| commit | 4d0010d1fcb22ce0672d2667d73f5a612c600e14 (patch) | |
| tree | 66e2029a1eb2d82c2c21a39e9772c42319f7a155 /indra/llwindow/llwindow.h | |
| parent | ca0b9a3753fa3b42d4ac8183adcf30d957f55016 (diff) | |
| parent | 768b7a4d33b64dc3e9d7f7c0c384bb2aa37b458b (diff) | |
Merged DRTVWR-546 into SL-16329
Diffstat (limited to 'indra/llwindow/llwindow.h')
| -rw-r--r-- | indra/llwindow/llwindow.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h index b76d313011..43d81e4d59 100644 --- a/indra/llwindow/llwindow.h +++ b/indra/llwindow/llwindow.h @@ -77,7 +77,7 @@ public: BOOL setSize(LLCoordScreen size); BOOL setSize(LLCoordWindow size); virtual void setMinSize(U32 min_width, U32 min_height, bool enforce_immediately = true); - virtual BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp = NULL) = 0; + virtual BOOL switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL enable_vsync, const LLCoordScreen * const posp = NULL) = 0; //create a new GL context that shares a namespace with this Window's main GL context and make it current on the current thread // returns a pointer to be handed back to destroySharedConext/makeContextCurrent @@ -92,6 +92,7 @@ public: virtual BOOL setCursorPosition(LLCoordWindow position) = 0; virtual BOOL getCursorPosition(LLCoordWindow *position) = 0; #if LL_WINDOWS + virtual void toggleVSync(bool enable_vsync) = 0; virtual BOOL getCursorDelta(LLCoordCommon* delta) = 0; #endif virtual void showCursor() = 0; @@ -295,7 +296,7 @@ public: U32 flags = 0, BOOL fullscreen = FALSE, BOOL clearBg = FALSE, - BOOL disable_vsync = TRUE, + BOOL enable_vsync = FALSE, BOOL use_gl = TRUE, BOOL ignore_pixel_depth = FALSE, U32 fsaa_samples = 0); |