diff options
| author | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2020-11-12 11:26:20 +0300 |
| commit | de6cee4fc1913982b0b2bd786bfd813c935bbe73 (patch) | |
| tree | a726c0c63bbd1d6c47c90c32119ce14c8048cddc /source/blender/gpu/opengl/gl_query.cc | |
| parent | e4d432500a0e2f978fe019da43deb843da405032 (diff) | |
| parent | 88bb29dea668df8cc46aa7f55895f229748bdbb4 (diff) | |
Merge branch 'master' into codesign_error_tracker
Diffstat (limited to 'source/blender/gpu/opengl/gl_query.cc')
| -rw-r--r-- | source/blender/gpu/opengl/gl_query.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/opengl/gl_query.cc b/source/blender/gpu/opengl/gl_query.cc index 6da5cacfcb2..8a42719c665 100644 --- a/source/blender/gpu/opengl/gl_query.cc +++ b/source/blender/gpu/opengl/gl_query.cc @@ -48,7 +48,7 @@ void GLQueryPool::reset(GPUQueryType type) } #endif -void GLQueryPool::begin_query(void) +void GLQueryPool::begin_query() { /* TODO add assert about expected usage. */ while (query_issued_ >= query_ids_.size()) { @@ -59,7 +59,7 @@ void GLQueryPool::begin_query(void) glBeginQuery(gl_type_, query_ids_[query_issued_++]); } -void GLQueryPool::end_query(void) +void GLQueryPool::end_query() { /* TODO add assert about expected usage. */ glEndQuery(gl_type_); |