diff options
author | Dave Parks <davep@lindenlab.com> | 2014-03-19 17:57:00 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2014-03-19 17:57:00 -0500 |
commit | 24f8745914f7cec320d707f36895ac393575b861 (patch) | |
tree | 463c9838c4415feb0f0d5311df75aaff7d847a9e /indra/llrender/llglslshader.h | |
parent | cb2bd577099f87881d467249cac679200bb367f0 (diff) |
MAINT-3131 Use benchmark to determine GPU class instead of GPU table.
Diffstat (limited to 'indra/llrender/llglslshader.h')
-rwxr-xr-x | indra/llrender/llglslshader.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h index 7b2f5f04c2..5abddf274b 100755 --- a/indra/llrender/llglslshader.h +++ b/indra/llrender/llglslshader.h @@ -51,6 +51,7 @@ public: S32 mIndexedTextureChannels; bool disableTextureIndex; bool hasAlphaMask; + bool attachNothing; // char numLights; @@ -80,7 +81,7 @@ public: static bool sNoFixedFunction; static void initProfile(); - static void finishProfile(); + static void finishProfile(bool emit_report = true); static void startProfile(); static void stopProfile(U32 count, U32 mode); @@ -184,6 +185,7 @@ public: //statistcis for profiling shader performance U32 mTimerQuery; + U32 mSamplesQuery; U64 mTimeElapsed; static U64 sTotalTimeElapsed; U32 mTrianglesDrawn; |