diff options
| author | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-06-13 02:22:03 +0200 |
|---|---|---|
| committer | Ansariel <ansariel.hiller@phoenixviewer.com> | 2024-06-13 02:22:03 +0200 |
| commit | 15b3c9f1643368fe0c5356ea11288525bbe9fbb3 (patch) | |
| tree | 3e8744a63723d3a3a3490ec6554070d0272e0f70 /indra/llrender | |
| parent | ae74ca80692c8bcf157e903033fcfa1778706d64 (diff) | |
Fix a few merge issues
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llglslshader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index e47c842228..45abb695cb 100644 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -279,7 +279,7 @@ bool LLGLSLShader::readProfileQuery(bool for_runtime, bool force_read) GLuint64 samples_passed = 0; glGetQueryObjectui64v(mSamplesQuery, GL_QUERY_RESULT, &samples_passed); - U64 primitives_generated = 0; + GLuint64 primitives_generated = 0; glGetQueryObjectui64v(mPrimitivesQuery, GL_QUERY_RESULT, &primitives_generated); sTotalTimeElapsed += time_elapsed; |