diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-06-20 16:40:43 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-06-20 16:40:43 -0700 |
| commit | 988eae369882f57eeb4bca893dcc2c46eb773ec7 (patch) | |
| tree | 8518e405fceeff8a0593329c1a0d335a30b79031 /indra/llrender/llgl.h | |
| parent | 50bb863be1c0e3528fd850aac812fc6196a7c4fc (diff) | |
| parent | 7da4c651911743707c0cc7cd4bebdcefb52eb379 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llgl.h')
| -rwxr-xr-x | indra/llrender/llgl.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h index d70e764769..60597fd090 100755 --- a/indra/llrender/llgl.h +++ b/indra/llrender/llgl.h @@ -98,6 +98,7 @@ public: BOOL mHasFragmentShader; S32 mNumTextureImageUnits; BOOL mHasOcclusionQuery; + BOOL mHasTimerQuery; BOOL mHasOcclusionQuery2; BOOL mHasPointParameters; BOOL mHasDrawBuffers; @@ -115,6 +116,8 @@ public: BOOL mHasARBEnvCombine; BOOL mHasCubeMap; BOOL mHasDebugOutput; + BOOL mHassRGBTexture; + BOOL mHassRGBFramebuffer; // Vendor-specific extensions BOOL mIsATI; @@ -126,6 +129,11 @@ public: BOOL mATIOffsetVerticalLines; BOOL mATIOldDriver; +#if LL_DARWIN + // Needed to distinguish problem cards on older Macs that break with Materials + BOOL mIsMobileGF; +#endif + // Whether this version of GL is good enough for SL to use BOOL mHasRequirements; |