diff options
| author | Anchor <none@none> | 2019-04-10 11:47:57 -0700 |
|---|---|---|
| committer | Anchor <none@none> | 2019-04-10 11:47:57 -0700 |
| commit | 4b1c786c6e7236d45be33bbf216be142dbfa33c2 (patch) | |
| tree | e414dd7a512d6d885b3f6e1ac2ea236ec4e82619 /indra/llrender/llgl.cpp | |
| parent | 83fe55c429181a2adb67346db79becf00d501536 (diff) | |
| parent | 5cf18cb867be567bf921f0b94a78fd822e4112ad (diff) | |
Merge
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 35b6951779..c0f0cec80b 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -1890,7 +1890,7 @@ void LLGLState::checkClientArrays(const std::string& msg, U32 data_mask) GL_TEXTURE_COORD_ARRAY }; - U32 mask[] = + static const U32 mask[] = { //copied from llvertexbuffer.h 0x0001, //MAP_VERTEX, 0x0002, //MAP_NORMAL, @@ -2561,5 +2561,11 @@ void LLGLSyncFence::wait() #endif } - +#if LL_WINDOWS +// Expose desired use of high-performance graphics processor to Optimus driver +extern "C" +{ + _declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; +} +#endif |