diff options
| author | Runitai Linden <davep@lindenlab.com> | 2022-01-21 10:33:37 -0600 |
|---|---|---|
| committer | Runitai Linden <davep@lindenlab.com> | 2022-01-21 10:33:37 -0600 |
| commit | 5b04123aec281de30fb8b6473600f6b1e9d16909 (patch) | |
| tree | 1ffac17fe885182483ed44fa93db723554761024 /indra/llrender/llgl.h | |
| parent | e7caafba5c4eec21f02a642e37865bc04cd6536e (diff) | |
| parent | 016b002b0f2faae0d62ce2d07b8e9856a3a1814d (diff) | |
Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-539
# Conflicts:
# indra/llcommon/lltracerecording.h
# indra/newview/llfloaterpreference.cpp
Diffstat (limited to 'indra/llrender/llgl.h')
| -rw-r--r-- | indra/llrender/llgl.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index a07e2d9bb0..ec97eb0faa 100644 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -94,9 +94,6 @@ public: BOOL mHasMapBufferRange; BOOL mHasFlushBufferRange; BOOL mHasPBuffer; - BOOL mHasShaderObjects; - BOOL mHasVertexShader; - BOOL mHasFragmentShader; S32 mNumTextureImageUnits; BOOL mHasOcclusionQuery; BOOL mHasTimerQuery; @@ -122,14 +119,9 @@ public: BOOL mHasTexturesRGBDecode; // Vendor-specific extensions - BOOL mIsATI; + BOOL mIsAMD; BOOL mIsNVIDIA; BOOL mIsIntel; - BOOL mIsGF2or4MX; - BOOL mIsGF3; - BOOL mIsGFFX; - BOOL mATIOffsetVerticalLines; - BOOL mATIOldDriver; #if LL_DARWIN // Needed to distinguish problem cards on older Macs that break with Materials @@ -269,7 +261,6 @@ public: static void dumpStates(); static void checkStates(const std::string& msg = ""); static void checkTextureChannels(const std::string& msg = ""); - static void checkClientArrays(const std::string& msg = "", U32 data_mask = 0); protected: static boost::unordered_map<LLGLenum, LLGLboolean> sStateMap; @@ -488,6 +479,7 @@ void parse_gl_version( S32* major, S32* minor, S32* release, std::string* vendor extern BOOL gClothRipple; extern BOOL gHeadlessClient; +extern BOOL gNonInteractive; extern BOOL gGLActive; // Deal with changing glext.h definitions for newer SDK versions, specifically |