livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fix for 64-bit. Should work on 32-bit builds too.

master
Tonya Souther 2013-07-11 11:44:25 -05:00
parent 65941a5493
commit cec54eddb1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llrender/llglslshader.cpp
View File

@ -272,10 +272,13 @@ void LLGLSLShader::readProfileQuery(U32 count, U32 mode)
glEndQueryARB(GL_TIME_ELAPSED);
glEndQueryARB(GL_SAMPLES_PASSED);
U64 time_elapsed = 0;
//<FS:TS> 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;