diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-10 16:22:12 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-10 16:22:12 -0700 |
| commit | 7c42711ca3a4e67b95473aa5129dce5ff19bea15 (patch) | |
| tree | 593c0bedf07bffc79ec4640b157839edf61260f5 /indra/llrender/llgl.h | |
| parent | e0e6e7fd747121442370fc811c84aa34ed612f64 (diff) | |
| parent | 9f6b8484dfb7dfa981d8a8ac3693d3f68e32bc12 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
Diffstat (limited to 'indra/llrender/llgl.h')
| -rw-r--r-- | indra/llrender/llgl.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index 254c983110..909dad2e85 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -119,9 +119,7 @@ public: std::string mDriverVersionVendorString; std::string mGLVersionString; - S32 mVRAM; // VRAM in MB - - void getPixelFormat(); // Get the best pixel format + U32 mVRAM; // VRAM in MB std::string getGLInfoString(); void printGLInfoString(); @@ -139,7 +137,6 @@ public: private: void initExtensions(); void initGLStates(); - void initGLImages(); }; extern LLGLManager gGLManager; @@ -161,11 +158,11 @@ void clear_glerror(); # define llglassertok() assert_glerror() // stop_glerror is still needed on OS X but has performance implications -// use macro below to conditionally add stop_glerror to non-release builds +// use macro below to conditionally add stop_glerror to non-release builds // on OS X #if LL_DARWIN && !LL_RELEASE_FOR_DOWNLOAD #define STOP_GLERROR stop_glerror() -#else +#else #define STOP_GLERROR #endif |