QueryPool Reset for OpenGL

Author: Erfan-Ahmadi

src/nbl/video/COpenGLCommandBuffer.cpp

@@ -913,7 +913,8 @@ COpenGLCommandBuffer::~COpenGLCommandBuffer()
             case impl::ECT_RESET_QUERY_POOL:
             {
                 auto& c = cmd.get<impl::ECT_RESET_QUERY_POOL>();
-                _NBL_TODO();
+                const COpenGLQueryPool* qp = static_cast<const COpenGLQueryPool*>(c.queryPool.get());
+                qp->resetQueries(gl, c.query, c.queryCount);
             }
             break;
             case impl::ECT_BEGIN_QUERY:
@@ -1017,7 +1018,7 @@ COpenGLCommandBuffer::~COpenGLCommandBuffer()
             {
                 auto& c = cmd.get<impl::ECT_WRITE_TIMESTAMP>();
                 const COpenGLQueryPool* qp = static_cast<const COpenGLQueryPool*>(c.queryPool.get());
-                GLuint query = qp->getQueryAt(c.query);
+                const GLuint query = qp->getQueries()[c.query];
                 assert(qp->getCreationParameters().queryType == IQueryPool::E_QUERY_TYPE::EQT_TIMESTAMP);
                 gl->glQuery.pglQueryCounter(query, GL_TIMESTAMP);
             }

src/nbl/video/COpenGLCommandBuffer.h

@@ -1072,9 +1072,13 @@ class COpenGLCommandBuffer final : public IGPUCommandBuffer
 
     bool resetQueryPool(IQueryPool* queryPool, uint32_t firstQuery, uint32_t queryCount) override
     {
-        // If multiple queries are issued using the same query object id before calling glGetQueryObject or glGetQueryBufferObject:
-        // the results of the most recent query will be returned. In this case, when issuing a new query, the results of the previous query are discarded.
-        // So just ignore :)
+        if (!this->isCompatibleDevicewise(queryPool))
+            return false;
+        SCmd<impl::ECT_RESET_QUERY_POOL> cmd;
+        cmd.queryPool = core::smart_refctd_ptr<const IQueryPool>(queryPool);
+        cmd.query = firstQuery;
+        cmd.queryCount = queryCount;
+        pushCommand(std::move(cmd));
         return true;
     }
     bool beginQuery(IQueryPool* queryPool, uint32_t query, IQueryPool::E_QUERY_CONTROL_FLAGS flags = static_cast<IQueryPool::E_QUERY_CONTROL_FLAGS>(0)) override

src/nbl/video/COpenGLQueryPool.h

@@ -28,12 +28,12 @@ class COpenGLQueryPool final : public IQueryPool
 		{
 			if(_params.queryType == EQT_OCCLUSION)
 			{
-				queries.resize(params.queryCount);
+				queries.resize(_params.queryCount);
 				gl->extGlCreateQueries(GL_SAMPLES_PASSED, _params.queryCount, queries.data());
 			}
 			else if(_params.queryType == EQT_TIMESTAMP)
 			{
-				queries.resize(params.queryCount);
+				queries.resize(_params.queryCount);
 				gl->extGlCreateQueries(GL_TIMESTAMP, _params.queryCount, queries.data());
 			}
 			else if(_params.queryType == EQT_TRANSFORM_FEEDBACK_STREAM_EXT)
@@ -42,9 +42,9 @@ class COpenGLQueryPool final : public IQueryPool
 				// The first integer is the number of primitives successfully written to the corresponding transform feedback buffer
 				// and the second is the number of primitives output to the vertex stream.
 				// But in OpenGL there you need twice the queries to get both values.
-				queries.resize(params.queryCount * 2);
+				queries.resize(_params.queryCount * 2);
 				gl->extGlCreateQueries(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, _params.queryCount, queries.data());
-				gl->extGlCreateQueries(GL_PRIMITIVES_GENERATED, _params.queryCount, queries.data() + params.queryCount);
+				gl->extGlCreateQueries(GL_PRIMITIVES_GENERATED, _params.queryCount, queries.data() + _params.queryCount);
 			}
 			else
 			{
@@ -57,18 +57,6 @@ class COpenGLQueryPool final : public IQueryPool
 			return core::SRange<const GLuint>(queries.data(), queries.data() + queries.size());
 		}
 
-		inline GLuint getQueryAt(uint32_t index) const
-		{
-			if(index < queries.size())
-			{
-				return queries[index];
-			}
-			else
-			{
-				return 0; // is 0 an invalid GLuint?
-			}
-		}
-
 		inline void beginQuery(IOpenGL_FunctionTable* gl, uint32_t queryIndex, E_QUERY_CONTROL_FLAGS flags) const
 		{
 			if(gl != nullptr)
@@ -174,6 +162,59 @@ class COpenGLQueryPool final : public IQueryPool
 				}
 			}
 		}
+
+		inline bool resetQueries(IOpenGL_FunctionTable* gl, uint32_t query, uint32_t queryCount)
+		{
+			// NOTE: There is no Reset Queries on OpenGL but to make the queries invalid/unavailable and not return the previous ones we just delete the queries and recreate them.
+			// TODO: Needs test
+			size_t logicalQuerySize = 0ull;
+			if(params.queryType == EQT_TRANSFORM_FEEDBACK_STREAM_EXT)
+				logicalQuerySize = queries.size() / 2ull;
+			else
+				logicalQuerySize = queries.size();
+
+			if(query + queryCount > logicalQuerySize)
+			{
+				assert(false);
+				return false;
+			}
+
+			if(params.queryType == EQT_OCCLUSION)
+			{
+				gl->glQuery.pglDeleteQueries(queryCount, queries.data() + query);
+				gl->extGlCreateQueries(GL_SAMPLES_PASSED, queryCount, queries.data() + query);
+			}
+			else if(params.queryType == EQT_TIMESTAMP)
+			{
+				gl->glQuery.pglDeleteQueries(queryCount, queries.data() + query);
+				gl->extGlCreateQueries(GL_TIMESTAMP, queryCount, queries.data() + query);
+			}
+			else if(params.queryType == EQT_TRANSFORM_FEEDBACK_STREAM_EXT)
+			{
+				gl->glQuery.pglDeleteQueries(queryCount, queries.data() + query);
+				gl->glQuery.pglDeleteQueries(queryCount, (queries.data() + logicalQuerySize) + query);
+				gl->extGlCreateQueries(GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, queryCount, queries.data() + query);
+				gl->extGlCreateQueries(GL_PRIMITIVES_GENERATED, queryCount, (queries.data() + logicalQuerySize) + query );
+			}
+
+			return true;
+		}
+
+		protected:
+			
+		inline GLuint getQueryAt(uint32_t index) const
+		{
+			if(index < queries.size())
+			{
+				return queries[index];
+			}
+			else
+			{
+				assert(false);
+				return 0u; // is 0 an invalid GLuint?
+			}
+		}
+
 };
 
 } // end namespace nbl::video