From cec54eddb1863ce407d0a644951e2b9aa30db00a Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Thu, 11 Jul 2013 11:44:25 -0500 Subject: [PATCH] Build fix for 64-bit. Should work on 32-bit builds too. --- indra/llrender/llglslshader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp index 0b50e530b7..07f5fb2c86 100755 --- a/indra/llrender/llglslshader.cpp +++ b/indra/llrender/llglslshader.cpp @@ -272,10 +272,13 @@ void LLGLSLShader::readProfileQuery(U32 count, U32 mode) glEndQueryARB(GL_TIME_ELAPSED); glEndQueryARB(GL_SAMPLES_PASSED); - U64 time_elapsed = 0; + // U64 and GLuint64 somehow turn out different on x86_64 + //U64 time_elapsed = 0; + GLuint64 time_elapsed = 0; glGetQueryObjectui64v(mTimerQuery, GL_QUERY_RESULT, &time_elapsed); - U64 samples_passed = 0; + //U64 samples_passed = 0; + GLuint64 samples_passed = 0; glGetQueryObjectui64v(1, GL_QUERY_RESULT, &samples_passed); sTotalTimeElapsed += time_elapsed;