Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

attempt #1 to fix jenkins build error

Browse source
This commit is contained in:
Niraj Venkat 2015-07-08 14:24:24 -07:00
parent 5ededf7515
commit a6ec668b2e
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/gpu/src/gpu/GLBackendQuery.cpp
View file

@ -61,7 +61,7 @@ GLuint GLBackend::getQueryID(const QueryPointer& query) {
} }
void GLBackend::do_beginQuery(Batch& batch, uint32 paramOffset) { void GLBackend::do_beginQuery(Batch& batch, uint32 paramOffset) {
auto& query = batch._queries.get(batch._params[paramOffset]._uint); auto query = batch._queries.get(batch._params[paramOffset]._uint);
GLQuery* glquery = syncGPUObject(*query); GLQuery* glquery = syncGPUObject(*query);
if (glquery) { if (glquery) {
glBeginQuery(GL_TIME_ELAPSED, glquery->_qo); glBeginQuery(GL_TIME_ELAPSED, glquery->_qo);
@ -70,7 +70,7 @@ void GLBackend::do_beginQuery(Batch& batch, uint32 paramOffset) {
} }
void GLBackend::do_endQuery(Batch& batch, uint32 paramOffset) { void GLBackend::do_endQuery(Batch& batch, uint32 paramOffset) {
auto& query = batch._queries.get(batch._params[paramOffset]._uint); auto query = batch._queries.get(batch._params[paramOffset]._uint);
GLQuery* glquery = syncGPUObject(*query); GLQuery* glquery = syncGPUObject(*query);
if (glquery) { if (glquery) {
glEndQuery(GL_TIME_ELAPSED); glEndQuery(GL_TIME_ELAPSED);
@ -79,14 +79,9 @@ void GLBackend::do_endQuery(Batch& batch, uint32 paramOffset) {
} }
void GLBackend::do_getQuery(Batch& batch, uint32 paramOffset) { void GLBackend::do_getQuery(Batch& batch, uint32 paramOffset) {
auto& query = batch._queries.get(batch._params[paramOffset]._uint); auto query = batch._queries.get(batch._params[paramOffset]._uint);
GLQuery* glquery = syncGPUObject(*query); GLQuery* glquery = syncGPUObject(*query);
if (glquery) { if (glquery) {
GLint available = 0;
while (!available) {
glGetQueryObjectiv(glquery->_qo, GL_QUERY_RESULT_AVAILABLE, &available);
}
glGetQueryObjectui64v(glquery->_qo, GL_QUERY_RESULT, &glquery->_result); glGetQueryObjectui64v(glquery->_qo, GL_QUERY_RESULT, &glquery->_result);
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} }