Some renaming

src/anki/gr/vulkan/CommandBufferImpl.inl.h

@@ -349,8 +349,8 @@ inline void CommandBufferImpl::resetOcclusionQuery(OcclusionQueryPtr query)
 {
 	commandCommon();
 
-	VkQueryPool handle = static_cast<const OcclusionQueryImpl&>(*query).m_handle.m_pool;
-	U32 idx = static_cast<const OcclusionQueryImpl&>(*query).m_handle.m_queryIndex;
+	VkQueryPool handle = static_cast<const OcclusionQueryImpl&>(*query).m_handle.getQueryPool();
+	U32 idx = static_cast<const OcclusionQueryImpl&>(*query).m_handle.getQueryIndex();
 	ANKI_ASSERT(handle);
 
 #if ANKI_BATCH_COMMANDS
@@ -377,8 +377,8 @@ inline void CommandBufferImpl::beginOcclusionQuery(OcclusionQueryPtr query)
 {
 	commandCommon();
 
-	VkQueryPool handle = static_cast<const OcclusionQueryImpl&>(*query).m_handle.m_pool;
-	U32 idx = static_cast<const OcclusionQueryImpl&>(*query).m_handle.m_queryIndex;
+	const VkQueryPool handle = static_cast<const OcclusionQueryImpl&>(*query).m_handle.getQueryPool();
+	const U32 idx = static_cast<const OcclusionQueryImpl&>(*query).m_handle.getQueryIndex();
 	ANKI_ASSERT(handle);
 
 	ANKI_CMD(vkCmdBeginQuery(m_handle, handle, idx, 0), ANY_OTHER_COMMAND);
@@ -390,8 +390,8 @@ inline void CommandBufferImpl::endOcclusionQuery(OcclusionQueryPtr query)
 {
 	commandCommon();
 
-	VkQueryPool handle = static_cast<const OcclusionQueryImpl&>(*query).m_handle.m_pool;
-	U32 idx = static_cast<const OcclusionQueryImpl&>(*query).m_handle.m_queryIndex;
+	const VkQueryPool handle = static_cast<const OcclusionQueryImpl&>(*query).m_handle.getQueryPool();
+	const U32 idx = static_cast<const OcclusionQueryImpl&>(*query).m_handle.getQueryIndex();
 	ANKI_ASSERT(handle);
 
 	ANKI_CMD(vkCmdEndQuery(m_handle, handle, idx), ANY_OTHER_COMMAND);
@@ -652,8 +652,8 @@ inline void CommandBufferImpl::writeOcclusionQueryResultToBuffer(
 	flushBatches(CommandBufferCommandType::WRITE_QUERY_RESULT);
 
 	WriteQueryAtom atom;
-	atom.m_pool = q.m_handle.m_pool;
-	atom.m_queryIdx = q.m_handle.m_queryIndex;
+	atom.m_pool = q.m_handle.getQueryPool();
+	atom.m_queryIdx = q.m_handle.getQueryIndex();
 	atom.m_buffer = impl.getHandle();
 	atom.m_offset = offset;
 

src/anki/gr/vulkan/GrManagerImpl.h

@@ -12,7 +12,7 @@
 #include <anki/gr/vulkan/DeferredBarrierFactory.h>
 #include <anki/gr/vulkan/FenceFactory.h>
 #include <anki/gr/vulkan/SamplerFactory.h>
-#include <anki/gr/vulkan/QueryExtra.h>
+#include <anki/gr/vulkan/QueryFactory.h>
 #include <anki/gr/vulkan/DescriptorSet.h>
 #include <anki/gr/vulkan/CommandBufferFactory.h>
 #include <anki/gr/vulkan/SwapchainFactory.h>
@@ -118,7 +118,7 @@ public:
 	}
 	/// @}
 
-	QueryAllocator& getQueryAllocator()
+	QueryFactory& getQueryAllocator()
 	{
 		return m_queryAlloc;
 	}
@@ -302,7 +302,7 @@ private:
 
 	DescriptorSetFactory m_descrFactory;
 
-	QueryAllocator m_queryAlloc;
+	QueryFactory m_queryAlloc;
 
 	PipelineCache m_pplineCache;
 

src/anki/gr/vulkan/OcclusionQueryImpl.cpp

@@ -30,8 +30,8 @@ OcclusionQueryResult OcclusionQueryImpl::getResult() const
 
 	VkResult res;
 	ANKI_VK_CHECKF(res = vkGetQueryPoolResults(getDevice(),
-					   m_handle.m_pool,
-					   m_handle.m_queryIndex,
+					   m_handle.getQueryPool(),
+					   m_handle.getQueryIndex(),
 					   1,
 					   sizeof(out),
 					   &out,

src/anki/gr/vulkan/OcclusionQueryImpl.h

@@ -7,7 +7,7 @@
 
 #include <anki/gr/OcclusionQuery.h>
 #include <anki/gr/vulkan/VulkanObject.h>
-#include <anki/gr/vulkan/QueryExtra.h>
+#include <anki/gr/vulkan/QueryFactory.h>
 
 namespace anki
 {
@@ -19,7 +19,7 @@ namespace anki
 class OcclusionQueryImpl final : public OcclusionQuery, public VulkanObject<OcclusionQuery, OcclusionQueryImpl>
 {
 public:
-	QueryAllocationHandle m_handle = {};
+	MicroQuery m_handle = {};
 
 	OcclusionQueryImpl(GrManager* manager, CString name)
 		: OcclusionQuery(manager, name)

src/anki/gr/vulkan/QueryExtra.cpp → src/anki/gr/vulkan/QueryFactory.cpp

@@ -3,12 +3,12 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/vulkan/QueryExtra.h>
+#include <anki/gr/vulkan/QueryFactory.h>
 
 namespace anki
 {
 
-QueryAllocator::~QueryAllocator()
+QueryFactory::~QueryFactory()
 {
 	if(!m_chunks.isEmpty())
 	{
@@ -16,7 +16,7 @@ QueryAllocator::~QueryAllocator()
 	}
 }
 
-Error QueryAllocator::newQuery(QueryAllocationHandle& handle)
+Error QueryFactory::newQuery(MicroQuery& handle)
 {
 	ANKI_ASSERT(!handle);
 
@@ -77,7 +77,7 @@ Error QueryAllocator::newQuery(QueryAllocationHandle& handle)
 	return Error::NONE;
 }
 
-void QueryAllocator::deleteQuery(QueryAllocationHandle& handle)
+void QueryFactory::deleteQuery(MicroQuery& handle)
 {
 	ANKI_ASSERT(handle.m_pool && handle.m_queryIndex != MAX_U32 && handle.m_chunk);
 

src/anki/gr/vulkan/QueryExtra.h → src/anki/gr/vulkan/QueryFactory.h

@@ -13,7 +13,7 @@ namespace anki
 {
 
 // Forward
-class QueryAllocatorChunk;
+class QueryFactoryChunk;
 
 /// @addtogroup vulkan
 /// @{
@@ -21,13 +21,23 @@ class QueryAllocatorChunk;
 const U MAX_SUB_ALLOCATIONS_PER_QUERY_CHUNK = 64;
 
 /// The return handle of a query allocation.
-class QueryAllocationHandle
+class MicroQuery
 {
-	friend class QueryAllocator;
+	friend class QueryFactory;
 
 public:
-	VkQueryPool m_pool = VK_NULL_HANDLE;
-	U32 m_queryIndex = MAX_U32;
+	VkQueryPool getQueryPool() const
+	{
+		ANKI_ASSERT(m_pool != VK_NULL_HANDLE);
+		return m_pool;
+	}
+
+	/// Get the index of the query inside the query pool.
+	U32 getQueryIndex() const
+	{
+		ANKI_ASSERT(m_queryIndex != MAX_U32);
+		return m_queryIndex;
+	}
 
 	operator Bool() const
 	{
@@ -35,13 +45,15 @@ public:
 	}
 
 private:
-	QueryAllocatorChunk* m_chunk = nullptr;
+	VkQueryPool m_pool = VK_NULL_HANDLE;
+	U32 m_queryIndex = MAX_U32;
+	QueryFactoryChunk* m_chunk = nullptr;
 };
 
 /// An allocation chunk.
-class QueryAllocatorChunk : public IntrusiveListEnabled<QueryAllocatorChunk>
+class QueryFactoryChunk : public IntrusiveListEnabled<QueryFactoryChunk>
 {
-	friend class QueryAllocator;
+	friend class QueryFactory;
 
 private:
 	VkQueryPool m_pool = VK_NULL_HANDLE;
@@ -50,14 +62,14 @@ private:
 };
 
 /// Batch allocator of queries.
-class QueryAllocator : public NonCopyable
+class QueryFactory : public NonCopyable
 {
 public:
-	QueryAllocator()
+	QueryFactory()
 	{
 	}
 
-	~QueryAllocator();
+	~QueryFactory();
 
 	void init(GrAllocator<U8> alloc, VkDevice dev)
 	{
@@ -65,12 +77,14 @@ public:
 		m_dev = dev;
 	}
 
-	ANKI_USE_RESULT Error newQuery(QueryAllocationHandle& handle);
+	/// @note It's thread-safe.
+	ANKI_USE_RESULT Error newQuery(MicroQuery& handle);
 
-	void deleteQuery(QueryAllocationHandle& handle);
+	/// @note It's thread-safe.
+	void deleteQuery(MicroQuery& handle);
 
 private:
-	using Chunk = QueryAllocatorChunk;
+	using Chunk = QueryFactoryChunk;
 
 	GrAllocator<U8> m_alloc;
 	VkDevice m_dev;