Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 00:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Fixing names of GL enums

Browse source
This commit is contained in:
Niraj Venkat 2015-07-08 17:17:31 -07:00
parent 1894b42773
commit 58f127f299
2 changed files with 4 additions and 5 deletions
libraries/gpu/src/gpu
GLBackend.hGLBackendQuery.cpp

2
libraries/gpu/src/gpu/GLBackend.h
View file

@ -191,7 +191,7 @@ public:
class GLQuery : public GPUObject {
public:
GLuint _qo = 0;
GLuint _result = 0;
GLuint64 _result = 0;
GLQuery();
~GLQuery();

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

@ -65,10 +65,9 @@ void GLBackend::do_beginQuery(Batch& batch, uint32 paramOffset) {
auto query = batch._queries.get(batch._params[paramOffset]._uint);
GLQuery* glquery = syncGPUObject(*query);
if (glquery) {
glBeginQuery(GL_TIME_ELAPSED, glquery->_qo);
#if (GPU_FEATURE_PROFILE == GPU_LEGACY)
// (EXT_TIMER_QUERY)
glBeginQuery(TIME_ELAPSED_EXT, glquery->_qo);
glBeginQuery(GL_TIME_ELAPSED_EXT, glquery->_qo);
#else
glBeginQuery(GL_TIME_ELAPSED, glquery->_qo);
#endif
@ -82,7 +81,7 @@ void GLBackend::do_endQuery(Batch& batch, uint32 paramOffset) {
if (glquery) {
#if (GPU_FEATURE_PROFILE == GPU_LEGACY)
// (EXT_TIMER_QUERY)
glEndQuery(TIME_ELAPSED_EXT);
glEndQuery(GL_TIME_ELAPSED_EXT);
#else
glEndQuery(GL_TIME_ELAPSED);
#endif
@ -96,7 +95,7 @@ void GLBackend::do_getQuery(Batch& batch, uint32 paramOffset) {
if (glquery) {
#if (GPU_FEATURE_PROFILE == GPU_LEGACY)
// (EXT_TIMER_QUERY)
GetQueryObjectui64vEXT(glquery->_qo, GL_QUERY_RESULT, &glquery->_result);
glGetQueryObjectui64vEXT(glquery->_qo, GL_QUERY_RESULT, &glquery->_result);
#else
glGetQueryObjectui64v(glquery->_qo, GL_QUERY_RESULT, &glquery->_result);
#endif