Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 54 insertions, 55 deletions

diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index aff9334cb6..b7bb426654 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -63,21 +63,21 @@ public:
     virtual void show() = 0;
     virtual void hide() = 0;
     virtual void close() = 0;
-    virtual BOOL getVisible() = 0;
-    virtual BOOL getMinimized() = 0;
-    virtual BOOL getMaximized() = 0;
-    virtual BOOL maximize() = 0;
+    virtual bool getVisible() = 0;
+    virtual bool getMinimized() = 0;
+    virtual bool getMaximized() = 0;
+    virtual bool maximize() = 0;
     virtual void minimize() = 0;
     virtual void restore() = 0;
-    BOOL getFullscreen()    { return mFullscreen; };
-    virtual BOOL getPosition(LLCoordScreen *position) = 0;
-    virtual BOOL getSize(LLCoordScreen *size) = 0;
-    virtual BOOL getSize(LLCoordWindow *size) = 0;
-    virtual BOOL setPosition(LLCoordScreen position) = 0;
-    BOOL setSize(LLCoordScreen size);
-    BOOL setSize(LLCoordWindow size);
+    bool getFullscreen()    { return mFullscreen; };
+    virtual bool getPosition(LLCoordScreen *position) = 0;
+    virtual bool getSize(LLCoordScreen *size) = 0;
+    virtual bool getSize(LLCoordWindow *size) = 0;
+    virtual bool setPosition(LLCoordScreen position) = 0;
+    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 enable_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
@@ -90,14 +90,14 @@ public:
 
     virtual void toggleVSync(bool enable_vsync) = 0;
 
-    virtual BOOL setCursorPosition(LLCoordWindow position) = 0;
-    virtual BOOL getCursorPosition(LLCoordWindow *position) = 0;
+    virtual bool setCursorPosition(LLCoordWindow position) = 0;
+    virtual bool getCursorPosition(LLCoordWindow *position) = 0;
 #if LL_WINDOWS
-    virtual BOOL getCursorDelta(LLCoordCommon* delta) = 0;
+    virtual bool getCursorDelta(LLCoordCommon* delta) = 0;
 #endif
     virtual void showCursor() = 0;
     virtual void hideCursor() = 0;
-    virtual BOOL isCursorHidden() = 0;
+    virtual bool isCursorHidden() = 0;
     virtual void showCursorFromMouseMove() = 0;
     virtual void hideCursorUntilMouseMove() = 0;
 
@@ -124,22 +124,22 @@ public:
 
     virtual void captureMouse() = 0;
     virtual void releaseMouse() = 0;
-    virtual void setMouseClipping( BOOL b ) = 0;
+    virtual void setMouseClipping( bool b ) = 0;
 
-    virtual BOOL isClipboardTextAvailable() = 0;
-    virtual BOOL pasteTextFromClipboard(LLWString &dst) = 0;
-    virtual BOOL copyTextToClipboard(const LLWString &src) = 0;
+    virtual bool isClipboardTextAvailable() = 0;
+    virtual bool pasteTextFromClipboard(LLWString &dst) = 0;
+    virtual bool copyTextToClipboard(const LLWString &src) = 0;
 
-    virtual BOOL isPrimaryTextAvailable();
-    virtual BOOL pasteTextFromPrimary(LLWString &dst);
-    virtual BOOL copyTextToPrimary(const LLWString &src);
+    virtual bool isPrimaryTextAvailable();
+    virtual bool pasteTextFromPrimary(LLWString &dst);
+    virtual bool copyTextToPrimary(const LLWString &src);
 
     virtual void flashIcon(F32 seconds) = 0;
     virtual F32 getGamma() = 0;
-    virtual BOOL setGamma(const F32 gamma) = 0; // Set the gamma
+    virtual bool setGamma(const F32 gamma) = 0; // Set the gamma
     virtual void setFSAASamples(const U32 fsaa_samples) = 0; //set number of FSAA samples
     virtual U32  getFSAASamples() = 0;
-    virtual BOOL restoreGamma() = 0;            // Restore original gamma table (before updating gamma)
+    virtual bool restoreGamma() = 0;            // Restore original gamma table (before updating gamma)
     virtual ESwapMethod getSwapMethod() { return mSwapMethod; }
     virtual void processMiscNativeEvents();
     virtual void gatherInput() = 0;
@@ -151,12 +151,12 @@ public:
     // handy coordinate space conversion routines
     // NB: screen to window and vice verse won't work on width/height coordinate pairs,
     // as the conversion must take into account left AND right border widths, etc.
-    virtual BOOL convertCoords( LLCoordScreen from, LLCoordWindow *to) = 0;
-    virtual BOOL convertCoords( LLCoordWindow from, LLCoordScreen *to) = 0;
-    virtual BOOL convertCoords( LLCoordWindow from, LLCoordGL *to) = 0;
-    virtual BOOL convertCoords( LLCoordGL from, LLCoordWindow *to) = 0;
-    virtual BOOL convertCoords( LLCoordScreen from, LLCoordGL *to) = 0;
-    virtual BOOL convertCoords( LLCoordGL from, LLCoordScreen *to) = 0;
+    virtual bool convertCoords( LLCoordScreen from, LLCoordWindow *to) = 0;
+    virtual bool convertCoords( LLCoordWindow from, LLCoordScreen *to) = 0;
+    virtual bool convertCoords( LLCoordWindow from, LLCoordGL *to) = 0;
+    virtual bool convertCoords( LLCoordGL from, LLCoordWindow *to) = 0;
+    virtual bool convertCoords( LLCoordScreen from, LLCoordGL *to) = 0;
+    virtual bool convertCoords( LLCoordGL from, LLCoordScreen *to) = 0;
 
     // query supported resolutions
     virtual LLWindowResolution* getSupportedResolutions(S32 &num_resolutions) = 0;
@@ -164,15 +164,14 @@ public:
     virtual F32 getPixelAspectRatio() = 0;
     virtual void setNativeAspectRatio(F32 aspect) = 0;
 
-    // query VRAM usage
-    virtual U32 getAvailableVRAMMegabytes() = 0;
+    virtual void setMaxVRAMMegabytes(U32 max_vram) = 0;
 
     virtual void beforeDialog() {}; // prepare to put up an OS dialog (if special measures are required, such as in fullscreen mode)
     virtual void afterDialog() {};  // undo whatever was done in beforeDialog()
 
     // opens system default color picker, modally
-    // Returns TRUE if valid color selected
-    virtual BOOL dialogColorPicker(F32 *r, F32 *g, F32 *b);
+    // Returns true if valid color selected
+    virtual bool dialogColorPicker(F32 *r, F32 *g, F32 *b);
 
 // return a platform-specific window reference (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
     virtual void *getPlatformWindow() = 0;
@@ -181,7 +180,7 @@ public:
     virtual void *getMediaWindow();
 
     // control platform's Language Text Input mechanisms.
-    virtual void allowLanguageTextInput(LLPreeditor *preeditor, BOOL b) {}
+    virtual void allowLanguageTextInput(LLPreeditor *preeditor, bool b) {}
     virtual void setLanguageTextInput( const LLCoordGL & pos ) {};
     virtual void updateLanguageTextInputArea() {}
     virtual void interruptLanguageTextInput() {}
@@ -209,21 +208,21 @@ public:
 
     virtual S32 getRefreshRate() { return mRefreshRate; }
 protected:
-    LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags);
+    LLWindow(LLWindowCallbacks* callbacks, bool fullscreen, U32 flags);
     virtual ~LLWindow();
     // Defaults to true
-    virtual BOOL isValid();
+    virtual bool isValid();
     // Defaults to true
-    virtual BOOL canDelete();
+    virtual bool canDelete();
 
-    virtual BOOL setSizeImpl(LLCoordScreen size) = 0;
-    virtual BOOL setSizeImpl(LLCoordWindow size) = 0;
+    virtual bool setSizeImpl(LLCoordScreen size) = 0;
+    virtual bool setSizeImpl(LLCoordWindow size) = 0;
 
 protected:
     LLWindowCallbacks*  mCallbacks;
 
-    BOOL        mPostQuit;      // should this window post a quit message when destroyed?
-    BOOL        mFullscreen;
+    bool        mPostQuit;      // should this window post a quit message when destroyed?
+    bool        mFullscreen;
     S32         mFullscreenWidth;
     S32         mFullscreenHeight;
     S32         mFullscreenBits;
@@ -232,11 +231,11 @@ protected:
     S32         mNumSupportedResolutions;
     ECursorType mCurrentCursor;
     ECursorType mNextCursor;
-    BOOL        mCursorHidden;
+    bool        mCursorHidden;
     S32         mBusyCount; // how deep is the "cursor busy" stack?
-    BOOL        mIsMouseClipping;  // Is this window currently clipping the mouse
+    bool        mIsMouseClipping;  // Is this window currently clipping the mouse
     ESwapMethod mSwapMethod;
-    BOOL        mHideCursorPermanent;
+    bool        mHideCursorPermanent;
     U32         mFlags;
     U16         mHighSurrogate;
     S32         mMinWindowWidth;
@@ -281,7 +280,7 @@ protected:
     virtual void updateImpl(const std::string& string) = 0;
     virtual void hideImpl() = 0;
 
-    static BOOL sVisible;
+    static bool sVisible;
 
 };
 
@@ -307,23 +306,23 @@ public:
         LLWindowCallbacks* callbacks,
         const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
         U32 flags = 0,
-        BOOL fullscreen = FALSE,
-        BOOL clearBg = FALSE,
-        BOOL enable_vsync = FALSE,
-        BOOL use_gl = TRUE,
-        BOOL ignore_pixel_depth = FALSE,
+        bool fullscreen = false,
+        bool clearBg = false,
+        bool enable_vsync = false,
+        bool use_gl = true,
+        bool ignore_pixel_depth = false,
         U32 fsaa_samples = 0,
         U32 max_cores = 0,
         U32 max_vram = 0,
         F32 max_gl_version = 4.6f);
-    static BOOL destroyWindow(LLWindow* window);
-    static BOOL isWindowValid(LLWindow *window);
+    static bool destroyWindow(LLWindow* window);
+    static bool isWindowValid(LLWindow *window);
 };
 
 //
 // helper funcs
 //
-extern BOOL gDebugWindowProc;
+extern bool gDebugWindowProc;
 
 // Protocols, like "http" and "https" we support in URLs
 extern const S32 gURLProtocolWhitelistCount;