Some code style refactoring #9

AnKi/Core/GpuMemoryPools.h

@@ -108,11 +108,11 @@ public:
 	void endFrame();
 
 	/// Allocate staging memory for various operations. The memory will be reclaimed at the begining of the
-	/// N-(MAX_FRAMES_IN_FLIGHT-1) frame.
+	/// N-(kMaxFramesInFlight-1) frame.
 	void* allocateFrame(PtrSize size, StagingGpuMemoryType usage, StagingGpuMemoryToken& token);
 
 	/// Allocate staging memory for various operations. The memory will be reclaimed at the begining of the
-	/// N-(MAX_FRAMES_IN_FLIGHT-1) frame.
+	/// N-(kMaxFramesInFlight-1) frame.
 	void* tryAllocateFrame(PtrSize size, StagingGpuMemoryType usage, StagingGpuMemoryToken& token);
 
 private:

AnKi/Gr/AccelerationStructure.h

@@ -113,7 +113,7 @@ class AccelerationStructure : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::ACCELERATION_STRUCTURE;
+	static constexpr GrObjectType kClassType = GrObjectType::kAccelerationStructure;
 
 	AccelerationStructureType getType() const
 	{
@@ -126,7 +126,7 @@ protected:
 
 	/// Construct.
 	AccelerationStructure(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/Buffer.h

@@ -47,7 +47,7 @@ class Buffer : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::BUFFER;
+	static constexpr GrObjectType kClassType = GrObjectType::kBuffer;
 
 	/// Return the size of the buffer.
 	PtrSize getSize() const
@@ -114,7 +114,7 @@ protected:
 
 	/// Construct.
 	Buffer(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/CommandBuffer.h

@@ -19,18 +19,18 @@ namespace anki {
 /// Command buffer initialization flags.
 enum class CommandBufferFlag : U8
 {
-	NONE = 0,
+	kNone = 0,
 
-	SECOND_LEVEL = 1 << 0,
+	kSecondLevel = 1 << 0,
 
 	/// It will contain a handfull of commands.
-	SMALL_BATCH = 1 << 3,
+	kSmallBatch = 1 << 3,
 
 	/// Will contain graphics, compute and transfer work.
-	GENERAL_WORK = 1 << 4,
+	kGeneralWork = 1 << 4,
 
 	/// Will contain only compute work. It binds to async compute queues.
-	COMPUTE_WORK = 1 << 5,
+	kComputeWork = 1 << 5,
 };
 ANKI_ENUM_ALLOW_NUMERIC_OPERATIONS(CommandBufferFlag)
 
@@ -39,10 +39,10 @@ class CommandBufferInitInfo : public GrBaseInitInfo
 {
 public:
 	FramebufferPtr m_framebuffer; ///< For second level command buffers.
-	Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS> m_colorAttachmentUsages = {};
+	Array<TextureUsageBit, kMaxColorRenderTargets> m_colorAttachmentUsages = {};
 	TextureUsageBit m_depthStencilAttachmentUsage = TextureUsageBit::kNone;
 
-	CommandBufferFlag m_flags = CommandBufferFlag::NONE;
+	CommandBufferFlag m_flags = CommandBufferFlag::kNone;
 
 	CommandBufferInitInfo(CString name = {})
 		: GrBaseInitInfo(name)
@@ -56,7 +56,7 @@ class CommandBuffer : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::COMMAND_BUFFER;
+	static constexpr GrObjectType kClassType = GrObjectType::kCommandBuffer;
 
 	/// Finalize and submit if it's primary command buffer and just finalize if it's second level.
 	/// @param[in]  waitFences Optionally wait for some fences.
@@ -235,7 +235,7 @@ public:
 	/// The minx, miny, width, height control the area that the load and store operations will happen. If the scissor is
 	/// bigger than the render area the results are undefined.
 	void beginRenderPass(const FramebufferPtr& fb,
-						 const Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS>& colorAttachmentUsages,
+						 const Array<TextureUsageBit, kMaxColorRenderTargets>& colorAttachmentUsages,
 						 TextureUsageBit depthStencilAttachmentUsage, U32 minx = 0, U32 miny = 0, U32 width = kMaxU32,
 						 U32 height = kMaxU32);
 
@@ -408,7 +408,7 @@ public:
 protected:
 	/// Construct.
 	CommandBuffer(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/Common.h

@@ -38,17 +38,17 @@ class GrUpscalerInitInfo;
 #define ANKI_GR_LOGF(...) ANKI_LOG("GR", kFatal, __VA_ARGS__)
 
 // Some constants
-constexpr U32 MAX_VERTEX_ATTRIBUTES = 8;
-constexpr U32 MAX_COLOR_ATTACHMENTS = 4;
-constexpr U32 MAX_DESCRIPTOR_SETS = 3; ///< Groups that can be bound at the same time.
-constexpr U32 MAX_BINDINGS_PER_DESCRIPTOR_SET = 32;
-constexpr U32 MAX_FRAMES_IN_FLIGHT = 3; ///< Triple buffering.
-constexpr U32 MAX_GR_OBJECT_NAME_LENGTH = 31;
-constexpr U32 MAX_BINDLESS_TEXTURES = 512;
-constexpr U32 MAX_BINDLESS_READONLY_TEXTURE_BUFFERS = 512;
+constexpr U32 kMaxVertexAttributes = 8;
+constexpr U32 kMaxColorRenderTargets = 4;
+constexpr U32 kMaxDescriptorSets = 3; ///< Groups that can be bound at the same time.
+constexpr U32 kMaxBindingsPerDescriptorSet = 32;
+constexpr U32 kMaxFramesInFlight = 3; ///< Triple buffering.
+constexpr U32 kMaxGrObjectNameLength = 31;
+constexpr U32 kMaxBindlessTextures = 512;
+constexpr U32 kMaxBindlessReadonlyTextureBuffers = 512;
 
 /// The number of commands in a command buffer that make it a small batch command buffer.
-constexpr U32 COMMAND_BUFFER_SMALL_BATCH_MAX_COMMANDS = 100;
+constexpr U32 kCommandBufferSmallBatchMaxCommands = 100;
 
 /// Smart pointer for resources.
 template<typename T>
@@ -112,8 +112,8 @@ enum class GpuVendor : U8
 	kCount
 };
 
-inline constexpr Array<CString, U(GpuVendor::kCount)> GPU_VENDOR_STR = {"unknown", "ARM",   "nVidia",
-																		"AMD",     "Intel", "Qualcomm"};
+inline constexpr Array<CString, U(GpuVendor::kCount)> kGPUVendorStrings = {"unknown", "ARM",   "nVidia",
+																		   "AMD",     "Intel", "Qualcomm"};
 
 /// Device capabilities.
 ANKI_BEGIN_PACKED_STRUCT
@@ -234,13 +234,13 @@ public:
 		U32 len;
 		if(name && (len = name.getLength()) > 0)
 		{
-			len = min(len, MAX_GR_OBJECT_NAME_LENGTH);
+			len = min(len, kMaxGrObjectNameLength);
 			memcpy(&m_name[0], &name[0], len);
 		}
 	}
 
 private:
-	Array<char, MAX_GR_OBJECT_NAME_LENGTH + 1> m_name;
+	Array<char, kMaxGrObjectNameLength + 1> m_name;
 };
 
 enum class ColorBit : U8

AnKi/Gr/Fence.h

@@ -18,7 +18,7 @@ class Fence : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::FENCE;
+	static constexpr GrObjectType kClassType = GrObjectType::kFence;
 
 	/// Wait for the fence.
 	/// @param seconds The time to wait in seconds. If it's zero then just return the status.
@@ -28,7 +28,7 @@ public:
 protected:
 	/// Construct.
 	Fence(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/Framebuffer.h

@@ -32,7 +32,7 @@ public:
 class FramebufferInitInfo : public GrBaseInitInfo
 {
 public:
-	Array<FramebufferAttachmentInfo, MAX_COLOR_ATTACHMENTS> m_colorAttachments;
+	Array<FramebufferAttachmentInfo, kMaxColorRenderTargets> m_colorAttachments;
 	U32 m_colorAttachmentCount = 0;
 	FramebufferAttachmentInfo m_depthStencilAttachment;
 
@@ -115,12 +115,12 @@ class Framebuffer : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::FRAMEBUFFER;
+	static constexpr GrObjectType kClassType = GrObjectType::kFramebuffer;
 
 protected:
 	/// Construct.
 	Framebuffer(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/Gl/CommandBuffer.cpp

@@ -832,7 +832,7 @@ void CommandBuffer::bindShaderProgram(ShaderProgramPtr prog)
 }
 
 void CommandBuffer::beginRenderPass(FramebufferPtr fb,
-									const Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS>& colorAttachmentUsages,
+									const Array<TextureUsageBit, kMaxColorRenderTargets>& colorAttachmentUsages,
 									TextureUsageBit depthStencilAttachmentUsage, U32 minx, U32 miny, U32 width,
 									U32 height)
 {
@@ -1085,7 +1085,7 @@ void CommandBuffer::dispatchCompute(U32 groupCountX, U32 groupCountY, U32 groupC
 
 	ANKI_GL_SELF(CommandBufferImpl);
 
-	ANKI_ASSERT(!!(self.m_flags & CommandBufferFlag::COMPUTE_WORK));
+	ANKI_ASSERT(!!(self.m_flags & CommandBufferFlag::kComputeWork));
 	self.m_state.checkDispatch();
 	self.pushBackNewCommand<DispatchCommand>(groupCountX, groupCountY, groupCountZ);
 }

AnKi/Gr/Gl/CommandBufferImpl.cpp

@@ -30,10 +30,10 @@ void CommandBufferImpl::init(const CommandBufferInitInfo& init)
 	m_flags = init.m_flags;
 
 #if ANKI_EXTRA_CHECKS
-	m_state.m_secondLevel = !!(init.m_flags & CommandBufferFlag::SECOND_LEVEL);
+	m_state.m_secondLevel = !!(init.m_flags & CommandBufferFlag::kSecondLevel);
 #endif
 
-	if(!!(init.m_flags & CommandBufferFlag::SECOND_LEVEL))
+	if(!!(init.m_flags & CommandBufferFlag::kSecondLevel))
 	{
 		// TODO Need to hold a ref
 		m_state.m_fb = static_cast<const FramebufferImpl*>(init.m_framebuffer.get());
@@ -160,7 +160,7 @@ void CommandBufferImpl::flushDrawcall(CommandBuffer& cmdb)
 			cmdb.setDepthCompareOperation(CompareOperation::LESS);
 		}
 
-		for(U i = 0; i < MAX_COLOR_ATTACHMENTS; ++i)
+		for(U i = 0; i < kMaxColorRenderTargets; ++i)
 		{
 			const auto& att = m_state.m_colorAtt[i];
 			if(att.m_writeMask == StateTracker::INVALID_COLOR_MASK)
@@ -294,7 +294,7 @@ void CommandBufferImpl::flushDrawcall(CommandBuffer& cmdb)
 
 		Error operator()(GlState&)
 		{
-			for(U i = 0; i < MAX_COLOR_ATTACHMENTS; ++i)
+			for(U i = 0; i < kMaxColorRenderTargets; ++i)
 			{
 				if(m_enableMask & (1 << i))
 				{
@@ -311,7 +311,7 @@ void CommandBufferImpl::flushDrawcall(CommandBuffer& cmdb)
 
 	U8 blendEnableMask = 0;
 	U8 blendDisableMask = 0;
-	for(U i = 0; i < MAX_COLOR_ATTACHMENTS; ++i)
+	for(U i = 0; i < kMaxColorRenderTargets; ++i)
 	{
 		if(m_state.maybeEnableBlend(i))
 		{

AnKi/Gr/Gl/CommandBufferImpl.h

@@ -99,7 +99,7 @@ public:
 
 	Bool isSecondLevel() const
 	{
-		return !!(m_flags & CommandBufferFlag::SECOND_LEVEL);
+		return !!(m_flags & CommandBufferFlag::kSecondLevel);
 	}
 
 	void flushDrawcall(CommandBuffer& cmdb);

AnKi/Gr/Gl/FramebufferImpl.h

@@ -45,8 +45,8 @@ private:
 	FramebufferInitInfo m_in;
 
 	Array<U32, 2> m_fbSize = {};
-	Array<GLenum, MAX_COLOR_ATTACHMENTS> m_drawBuffers;
-	Array<GLenum, MAX_COLOR_ATTACHMENTS + 1> m_invalidateBuffers;
+	Array<GLenum, kMaxColorRenderTargets> m_drawBuffers;
+	Array<GLenum, kMaxColorRenderTargets + 1> m_invalidateBuffers;
 	U8 m_invalidateBuffersCount = 0;
 	Bool m_clearDepth = false;
 	Bool m_clearStencil = false;
@@ -56,7 +56,8 @@ private:
 									  const FramebufferAttachmentInfo& info);
 
 	/// Create the FBO
-	ANKI_USE_RESULT Error createFbo(const Array<U, MAX_COLOR_ATTACHMENTS + 1>& layers, GLenum depthStencilBindingPoint);
+	ANKI_USE_RESULT Error createFbo(const Array<U, kMaxColorRenderTargets + 1>& layers,
+									GLenum depthStencilBindingPoint);
 };
 /// @}
 

AnKi/Gr/Gl/GlState.cpp

@@ -108,7 +108,7 @@ void GlState::initRenderThread()
 		m_gpu = GpuVendor::INTEL;
 	}
 
-	ANKI_GL_LOGI("GPU vendor is %s", &GPU_VENDOR_STR[m_gpu][0]);
+	ANKI_GL_LOGI("GPU vendor is %s", &kGPUVendorStrings[m_gpu][0]);
 
 // Enable debug messages
 #if ANKI_GL == ANKI_GL_DESKTOP
@@ -142,7 +142,7 @@ void GlState::initRenderThread()
 	glBindVertexArray(m_defaultVao);
 
 	// Enable all attributes
-	for(U i = 0; i < MAX_VERTEX_ATTRIBUTES; ++i)
+	for(U i = 0; i < kMaxVertexAttributes; ++i)
 	{
 		glEnableVertexAttribArray(i);
 	}
@@ -166,12 +166,12 @@ void GlState::initRenderThread()
 	m_tboMaxRange = kMaxU32;
 
 	// Texture buffer textures
-	glGenTextures(MAX_DESCRIPTOR_SETS * MAX_TEXTURE_BUFFER_BINDINGS, &m_texBuffTextures[0][0]);
-	for(U i = 0; i < MAX_DESCRIPTOR_SETS; ++i)
+	glGenTextures(kMaxDescriptorSets * MAX_TEXTURE_BUFFER_BINDINGS, &m_texBuffTextures[0][0]);
+	for(U i = 0; i < kMaxDescriptorSets; ++i)
 	{
 		for(U j = 0; j < MAX_TEXTURE_BUFFER_BINDINGS; ++j)
 		{
-			U unit = MAX_TEXTURE_BINDINGS * MAX_DESCRIPTOR_SETS + MAX_TEXTURE_BUFFER_BINDINGS * i + j;
+			U unit = MAX_TEXTURE_BINDINGS * kMaxDescriptorSets + MAX_TEXTURE_BUFFER_BINDINGS * i + j;
 			glActiveTexture(GL_TEXTURE0 + unit);
 
 			glBindTexture(GL_TEXTURE_BUFFER, m_texBuffTextures[i][j]);

AnKi/Gr/Gl/GlState.h

@@ -42,17 +42,17 @@ public:
 
 	/// @name FB
 	/// @{
-	Array2d<Bool, MAX_COLOR_ATTACHMENTS, 4> m_colorWriteMasks = {{{{true, true, true, true}},
-																  {{true, true, true, true}},
-																  {{true, true, true, true}},
-																  {{true, true, true, true}}}};
+	Array2d<Bool, kMaxColorRenderTargets, 4> m_colorWriteMasks = {{{{true, true, true, true}},
+																   {{true, true, true, true}},
+																   {{true, true, true, true}},
+																   {{true, true, true, true}}}};
 
 	Bool m_depthWriteMask = true;
 
 	Array<U32, 2> m_stencilWriteMask = {{kMaxU32, kMaxU32}};
 	/// @}
 
-	Array2d<GLuint, MAX_DESCRIPTOR_SETS, MAX_TEXTURE_BUFFER_BINDINGS> m_texBuffTextures = {};
+	Array2d<GLuint, kMaxDescriptorSets, MAX_TEXTURE_BUFFER_BINDINGS> m_texBuffTextures = {};
 
 	Array<GLsizei, 4> m_scissor = {{0, 0, kMaxI32, kMaxI32}};
 

AnKi/Gr/Gl/StateTracker.h

@@ -47,7 +47,7 @@ public:
 		PtrSize m_relativeOffset = kMaxPtrSize;
 	};
 
-	Array<VertexAttribute, MAX_VERTEX_ATTRIBUTES> m_attribs;
+	Array<VertexAttribute, kMaxVertexAttributes> m_attribs;
 
 	Bool setVertexAttribute(U32 location, U32 buffBinding, Format fmt, PtrSize relativeOffset)
 	{
@@ -72,7 +72,7 @@ public:
 		VertexStepRate m_stepRate = VertexStepRate::COUNT;
 	};
 
-	Array<VertexBuffer, MAX_VERTEX_ATTRIBUTES> m_vertBuffs;
+	Array<VertexBuffer, kMaxVertexAttributes> m_vertBuffs;
 
 	Bool bindVertexBuffer(U32 binding, BufferPtr buff, PtrSize offset, PtrSize stride, VertexStepRate stepRate)
 	{
@@ -380,7 +380,7 @@ public:
 		BlendOperation m_blendOpA = BlendOperation::COUNT;
 	};
 
-	Array<ColorAttachment, MAX_COLOR_ATTACHMENTS> m_colorAtt;
+	Array<ColorAttachment, kMaxColorRenderTargets> m_colorAtt;
 
 	Bool setColorChannelWriteMask(U32 attachment, ColorBit mask)
 	{
@@ -444,7 +444,7 @@ public:
 		U64 m_samplerUuid = 0;
 	};
 
-	Array2d<TextureBinding, MAX_DESCRIPTOR_SETS, MAX_TEXTURE_BINDINGS> m_textures;
+	Array2d<TextureBinding, kMaxDescriptorSets, MAX_TEXTURE_BINDINGS> m_textures;
 
 	Bool bindTextureViewAndSampler(U32 set, U32 binding, const TextureViewPtr& texView, const SamplerPtr& sampler)
 	{
@@ -473,7 +473,7 @@ public:
 		PtrSize m_range;
 	};
 
-	Array2d<ShaderBufferBinding, MAX_DESCRIPTOR_SETS, MAX_UNIFORM_BUFFER_BINDINGS> m_ubos;
+	Array2d<ShaderBufferBinding, kMaxDescriptorSets, MAX_UNIFORM_BUFFER_BINDINGS> m_ubos;
 
 	Bool bindUniformBuffer(U32 set, U32 binding, BufferPtr buff, PtrSize offset, PtrSize range)
 	{
@@ -484,7 +484,7 @@ public:
 		return true;
 	}
 
-	Array2d<ShaderBufferBinding, MAX_DESCRIPTOR_SETS, MAX_STORAGE_BUFFER_BINDINGS> m_ssbos;
+	Array2d<ShaderBufferBinding, kMaxDescriptorSets, MAX_STORAGE_BUFFER_BINDINGS> m_ssbos;
 
 	Bool bindStorageBuffer(U32 set, U32 binding, BufferPtr buff, PtrSize offset, PtrSize range)
 	{
@@ -501,7 +501,7 @@ public:
 		U64 m_texViewUuid = 0;
 	};
 
-	Array2d<ImageBinding, MAX_DESCRIPTOR_SETS, MAX_IMAGE_BINDINGS> m_images;
+	Array2d<ImageBinding, kMaxDescriptorSets, MAX_IMAGE_BINDINGS> m_images;
 
 	Bool bindImage(U32 set, U32 binding, const TextureViewPtr& img)
 	{

AnKi/Gr/GrObject.h

@@ -16,20 +16,20 @@ namespace anki {
 /// Graphics object type.
 enum class GrObjectType : U8
 {
-	BUFFER,
-	COMMAND_BUFFER,
-	FRAMEBUFFER,
-	OCCLUSION_QUERY,
-	TIMESTAMP_QUERY,
-	SAMPLER,
-	SHADER,
-	TEXTURE,
-	TEXTURE_VIEW,
-	SHADER_PROGRAM,
-	FENCE,
-	RENDER_GRAPH,
-	ACCELERATION_STRUCTURE,
-	GR_UPSCALER,
+	kBuffer,
+	kCommandBuffer,
+	kFramebuffer,
+	kOcclusionQuery,
+	kTimstampQuery,
+	kSampler,
+	kShader,
+	kTexture,
+	kTextureView,
+	kShaderProgram,
+	kFence,
+	kRenderGraph,
+	kAccelerationStructure,
+	kGrUpscaler,
 
 	kCount,
 	kFirst = 0

AnKi/Gr/GrUpscaler.h

@@ -18,18 +18,18 @@ namespace anki {
 /// Different upscalers supported internally by GrUpscaler
 enum class GrUpscalerType : U8
 {
-	DLSS_2 = 0,
-	COUNT
+	kDlss2 = 0,
+	kCount
 };
 
 /// Quality preset to be used by the upscaler if available
 enum class GrUpscalerQualityMode : U8
 {
-	PERFORMANCE,
-	BALANCED,
-	QUALITY,
+	kPerformance,
+	kBalanced,
+	kQuality,
 
-	COUNT
+	kCount
 };
 ANKI_ENUM_ALLOW_NUMERIC_OPERATIONS(GrUpscalerQualityMode)
 
@@ -39,8 +39,8 @@ class GrUpscalerInitInfo : public GrBaseInitInfo
 public:
 	UVec2 m_sourceTextureResolution = UVec2(0u);
 	UVec2 m_targetTextureResolution = UVec2(0u);
-	GrUpscalerType m_upscalerType = GrUpscalerType::COUNT;
-	GrUpscalerQualityMode m_qualityMode = GrUpscalerQualityMode::PERFORMANCE;
+	GrUpscalerType m_upscalerType = GrUpscalerType::kCount;
+	GrUpscalerQualityMode m_qualityMode = GrUpscalerQualityMode::kPerformance;
 };
 
 class GrUpscaler : public GrObject
@@ -48,20 +48,20 @@ class GrUpscaler : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::GR_UPSCALER;
+	static constexpr GrObjectType kClassType = GrObjectType::kGrUpscaler;
 
 	GrUpscalerType getUpscalerType() const
 	{
-		ANKI_ASSERT(m_upscalerType != GrUpscalerType::COUNT);
+		ANKI_ASSERT(m_upscalerType != GrUpscalerType::kCount);
 		return m_upscalerType;
 	}
 
 protected:
-	GrUpscalerType m_upscalerType = GrUpscalerType::COUNT;
+	GrUpscalerType m_upscalerType = GrUpscalerType::kCount;
 
 	/// Construct.
 	GrUpscaler(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/OcclusionQuery.h

@@ -18,7 +18,7 @@ class OcclusionQuery : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::OCCLUSION_QUERY;
+	static constexpr GrObjectType kClassType = GrObjectType::kOcclusionQuery;
 
 	/// Get the occlusion query result. It won't block.
 	OcclusionQueryResult getResult() const;
@@ -26,7 +26,7 @@ public:
 protected:
 	/// Construct.
 	OcclusionQuery(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/RenderGraph.cpp

@@ -116,7 +116,7 @@ public:
 	/// Will reuse the m_secondLevelCmdbInitInfo.m_framebuffer to get the framebuffer.
 	CommandBufferInitInfo m_secondLevelCmdbInitInfo;
 	Array<U32, 4> m_fbRenderArea;
-	Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS> m_colorUsages = {}; ///< For beginRender pass
+	Array<TextureUsageBit, kMaxColorRenderTargets> m_colorUsages = {}; ///< For beginRender pass
 	TextureUsageBit m_dsUsage = TextureUsageBit::kNone; ///< For beginRender pass
 
 	U32 m_batchIdx ANKI_DEBUG_CODE(= kMaxU32);
@@ -151,7 +151,7 @@ class RenderGraph::BakeContext
 public:
 	StackAllocator<U8> m_alloc;
 	DynamicArray<Pass> m_passes;
-	BitSet<MAX_RENDER_GRAPH_PASSES, U64> m_passIsInBatch{false};
+	BitSet<kMaxRenderGraphPasses, U64> m_passIsInBatch{false};
 	DynamicArray<Batch> m_batches;
 	DynamicArray<RT> m_rts;
 	DynamicArray<Buffer> m_buffers;
@@ -186,7 +186,7 @@ void FramebufferDescription::bake()
 		ANKI_END_PACKED_STRUCT
 		static_assert(sizeof(ColorAttachment) == 4 * (4 + 1 + 1 + 4), "Wrong size");
 
-		Array<ColorAttachment, MAX_COLOR_ATTACHMENTS> colorAttachments;
+		Array<ColorAttachment, kMaxColorRenderTargets> colorAttachments;
 		for(U i = 0; i < m_colorAttachmentCount; ++i)
 		{
 			const FramebufferDescriptionAttachment& inAtt = m_colorAttachments[i];
@@ -258,7 +258,7 @@ void FramebufferDescription::bake()
 }
 
 RenderGraph::RenderGraph(GrManager* manager, CString name)
-	: GrObject(manager, CLASS_TYPE, name)
+	: GrObject(manager, kClassType, name)
 {
 	ANKI_ASSERT(manager);
 }
@@ -299,7 +299,7 @@ void RenderGraph::reset()
 		return;
 	}
 
-	if((m_version % PERIODIC_CLEANUP_EVERY) == 0)
+	if((m_version % kPeriodicCleanupEvery) == 0)
 	{
 		// Do cleanup
 		periodicCleanup();
@@ -425,7 +425,7 @@ FramebufferPtr RenderGraph::getOrCreateFramebuffer(const FramebufferDescription&
 	drawsToPresentable = false;
 
 	// Create a hash that includes the render targets
-	Array<U64, MAX_COLOR_ATTACHMENTS + 2> uuids;
+	Array<U64, kMaxColorRenderTargets + 2> uuids;
 	U count = 0;
 	for(U i = 0; i < fbDescr.m_colorAttachmentCount; ++i)
 	{
@@ -439,12 +439,12 @@ FramebufferPtr RenderGraph::getOrCreateFramebuffer(const FramebufferDescription&
 
 	if(!!fbDescr.m_depthStencilAttachment.m_aspect)
 	{
-		uuids[count++] = m_ctx->m_rts[rtHandles[MAX_COLOR_ATTACHMENTS].m_idx].m_texture->getUuid();
+		uuids[count++] = m_ctx->m_rts[rtHandles[kMaxColorRenderTargets].m_idx].m_texture->getUuid();
 	}
 
 	if(fbDescr.m_shadingRateAttachmentTexelWidth > 0)
 	{
-		uuids[count++] = m_ctx->m_rts[rtHandles[MAX_COLOR_ATTACHMENTS + 1].m_idx].m_texture->getUuid();
+		uuids[count++] = m_ctx->m_rts[rtHandles[kMaxColorRenderTargets + 1].m_idx].m_texture->getUuid();
 	}
 
 	hash = appendHash(&uuids[0], sizeof(U64) * count, hash);
@@ -493,7 +493,7 @@ FramebufferPtr RenderGraph::getOrCreateFramebuffer(const FramebufferDescription&
 			outAtt.m_stencilStoreOperation = inAtt.m_stencilStoreOperation;
 
 			// Create texture view
-			TextureViewInitInfo viewInit(m_ctx->m_rts[rtHandles[MAX_COLOR_ATTACHMENTS].m_idx].m_texture,
+			TextureViewInitInfo viewInit(m_ctx->m_rts[rtHandles[kMaxColorRenderTargets].m_idx].m_texture,
 										 TextureSubresourceInfo(inAtt.m_surface, inAtt.m_aspect), "RenderGraph");
 			TextureViewPtr view = getManager().newTextureView(viewInit);
 
@@ -502,7 +502,7 @@ FramebufferPtr RenderGraph::getOrCreateFramebuffer(const FramebufferDescription&
 
 		if(fbDescr.m_shadingRateAttachmentTexelWidth > 0)
 		{
-			TextureViewInitInfo viewInit(m_ctx->m_rts[rtHandles[MAX_COLOR_ATTACHMENTS + 1].m_idx].m_texture,
+			TextureViewInitInfo viewInit(m_ctx->m_rts[rtHandles[kMaxColorRenderTargets + 1].m_idx].m_texture,
 										 fbDescr.m_shadingRateAttachmentSurface, "RenderGraph SRI");
 			TextureViewPtr view = getManager().newTextureView(viewInit);
 
@@ -540,11 +540,11 @@ Bool RenderGraph::passADependsOnB(const RenderPassDescriptionBase& a, const Rend
 	// Render targets
 	{
 		// Compute the 3 types of dependencies
-		const BitSet<MAX_RENDER_GRAPH_RENDER_TARGETS, U64> aReadBWrite = a.m_readRtMask & b.m_writeRtMask;
-		const BitSet<MAX_RENDER_GRAPH_RENDER_TARGETS, U64> aWriteBRead = a.m_writeRtMask & b.m_readRtMask;
-		const BitSet<MAX_RENDER_GRAPH_RENDER_TARGETS, U64> aWriteBWrite = a.m_writeRtMask & b.m_writeRtMask;
+		const BitSet<kMaxRenderGraphRenderTargets, U64> aReadBWrite = a.m_readRtMask & b.m_writeRtMask;
+		const BitSet<kMaxRenderGraphRenderTargets, U64> aWriteBRead = a.m_writeRtMask & b.m_readRtMask;
+		const BitSet<kMaxRenderGraphRenderTargets, U64> aWriteBWrite = a.m_writeRtMask & b.m_writeRtMask;
 
-		const BitSet<MAX_RENDER_GRAPH_RENDER_TARGETS, U64> fullDep = aReadBWrite | aWriteBRead | aWriteBWrite;
+		const BitSet<kMaxRenderGraphRenderTargets, U64> fullDep = aReadBWrite | aWriteBRead | aWriteBWrite;
 
 		if(fullDep.getAny())
 		{
@@ -582,11 +582,11 @@ Bool RenderGraph::passADependsOnB(const RenderPassDescriptionBase& a, const Rend
 	// Buffers
 	if(a.m_readBuffMask || a.m_writeBuffMask)
 	{
-		const BitSet<MAX_RENDER_GRAPH_BUFFERS, U64> aReadBWrite = a.m_readBuffMask & b.m_writeBuffMask;
-		const BitSet<MAX_RENDER_GRAPH_BUFFERS, U64> aWriteBRead = a.m_writeBuffMask & b.m_readBuffMask;
-		const BitSet<MAX_RENDER_GRAPH_BUFFERS, U64> aWriteBWrite = a.m_writeBuffMask & b.m_writeBuffMask;
+		const BitSet<kMaxRenderGraphBuffers, U64> aReadBWrite = a.m_readBuffMask & b.m_writeBuffMask;
+		const BitSet<kMaxRenderGraphBuffers, U64> aWriteBRead = a.m_writeBuffMask & b.m_readBuffMask;
+		const BitSet<kMaxRenderGraphBuffers, U64> aWriteBWrite = a.m_writeBuffMask & b.m_writeBuffMask;
 
-		const BitSet<MAX_RENDER_GRAPH_BUFFERS, U64> fullDep = aReadBWrite | aWriteBRead | aWriteBWrite;
+		const BitSet<kMaxRenderGraphBuffers, U64> fullDep = aReadBWrite | aWriteBRead | aWriteBWrite;
 
 		if(fullDep.getAny())
 		{
@@ -622,11 +622,11 @@ Bool RenderGraph::passADependsOnB(const RenderPassDescriptionBase& a, const Rend
 	// AS
 	if(a.m_readAsMask || a.m_writeAsMask)
 	{
-		const BitSet<MAX_RENDER_GRAPH_ACCELERATION_STRUCTURES, U32> aReadBWrite = a.m_readAsMask & b.m_writeAsMask;
-		const BitSet<MAX_RENDER_GRAPH_ACCELERATION_STRUCTURES, U32> aWriteBRead = a.m_writeAsMask & b.m_readAsMask;
-		const BitSet<MAX_RENDER_GRAPH_ACCELERATION_STRUCTURES, U32> aWriteBWrite = a.m_writeAsMask & b.m_writeAsMask;
+		const BitSet<kMaxRenderGraphAccelerationStructures, U32> aReadBWrite = a.m_readAsMask & b.m_writeAsMask;
+		const BitSet<kMaxRenderGraphAccelerationStructures, U32> aWriteBRead = a.m_writeAsMask & b.m_readAsMask;
+		const BitSet<kMaxRenderGraphAccelerationStructures, U32> aWriteBWrite = a.m_writeAsMask & b.m_writeAsMask;
 
-		const BitSet<MAX_RENDER_GRAPH_ACCELERATION_STRUCTURES, U32> fullDep = aReadBWrite | aWriteBRead | aWriteBWrite;
+		const BitSet<kMaxRenderGraphAccelerationStructures, U32> fullDep = aReadBWrite | aWriteBRead | aWriteBWrite;
 
 		if(fullDep)
 		{
@@ -798,7 +798,7 @@ void RenderGraph::initRenderPassesAndSetDeps(const RenderGraphDescription& descr
 		for(U32 depIdx = 0; depIdx < inPass.m_rtDeps.getSize(); ++depIdx)
 		{
 			const RenderPassDependency& inDep = inPass.m_rtDeps[depIdx];
-			ANKI_ASSERT(inDep.m_type == RenderPassDependency::Type::TEXTURE);
+			ANKI_ASSERT(inDep.m_type == RenderPassDependency::Type::kTexture);
 
 			RenderPassDependency::TextureInfo& inf = outPass.m_consumedTextures[depIdx];
 
@@ -807,7 +807,7 @@ void RenderGraph::initRenderPassesAndSetDeps(const RenderGraphDescription& descr
 		}
 
 		// Create command buffers and framebuffer
-		if(inPass.m_type == RenderPassDescriptionBase::Type::GRAPHICS)
+		if(inPass.m_type == RenderPassDescriptionBase::Type::kGraphics)
 		{
 			const GraphicsRenderPassDescription& graphicsPass =
 				static_cast<const GraphicsRenderPassDescription&>(inPass);
@@ -878,7 +878,7 @@ void RenderGraph::initBatches()
 		if(m_ctx->m_graphicsCmdbs.isEmpty() || drawsToPresentable)
 		{
 			CommandBufferInitInfo cmdbInit;
-			cmdbInit.m_flags = CommandBufferFlag::GENERAL_WORK;
+			cmdbInit.m_flags = CommandBufferFlag::kGeneralWork;
 			CommandBufferPtr cmdb = getManager().newCommandBuffer(cmdbInit);
 
 			m_ctx->m_graphicsCmdbs.emplaceBack(m_ctx->m_alloc, cmdb);
@@ -893,7 +893,7 @@ void RenderGraph::initBatches()
 				cmdb->resetTimestampQuery(query);
 				cmdb->writeTimestamp(query);
 
-				m_statistics.m_nextTimestamp = (m_statistics.m_nextTimestamp + 1) % MAX_TIMESTAMPS_BUFFERED;
+				m_statistics.m_nextTimestamp = (m_statistics.m_nextTimestamp + 1) % kMaxBufferedTimestamps;
 				m_statistics.m_timestamps[m_statistics.m_nextTimestamp * 2] = query;
 			}
 		}
@@ -923,7 +923,7 @@ void RenderGraph::initGraphicsPasses(const RenderGraphDescription& descr, StackA
 		Pass& outPass = ctx.m_passes[passIdx];
 
 		// Create command buffers and framebuffer
-		if(inPass.m_type == RenderPassDescriptionBase::Type::GRAPHICS)
+		if(inPass.m_type == RenderPassDescriptionBase::Type::kGraphics)
 		{
 			const GraphicsRenderPassDescription& graphicsPass =
 				static_cast<const GraphicsRenderPassDescription&>(inPass);
@@ -946,7 +946,7 @@ void RenderGraph::initGraphicsPasses(const RenderGraphDescription& descr, StackA
 						TextureSubresourceInfo(graphicsPass.m_fbDescr.m_depthStencilAttachment.m_surface,
 											   graphicsPass.m_fbDescr.m_depthStencilAttachment.m_aspect);
 
-					getCrntUsage(graphicsPass.m_rtHandles[MAX_COLOR_ATTACHMENTS], outPass.m_batchIdx, subresource,
+					getCrntUsage(graphicsPass.m_rtHandles[kMaxColorRenderTargets], outPass.m_batchIdx, subresource,
 								 usage);
 
 					outPass.m_dsUsage = usage;
@@ -957,7 +957,7 @@ void RenderGraph::initGraphicsPasses(const RenderGraphDescription& descr, StackA
 				{
 					outPass.m_secondLevelCmdbs.create(alloc, inPass.m_secondLevelCmdbsCount);
 					CommandBufferInitInfo& cmdbInit = outPass.m_secondLevelCmdbInitInfo;
-					cmdbInit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SECOND_LEVEL;
+					cmdbInit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSecondLevel;
 					ANKI_ASSERT(cmdbInit.m_framebuffer.isCreated());
 					cmdbInit.m_colorAttachmentUsages = outPass.m_colorUsages;
 					cmdbInit.m_depthStencilAttachmentUsage = outPass.m_dsUsage;
@@ -1001,7 +1001,7 @@ void RenderGraph::iterateSurfsOrVolumes(const TexturePtr& tex, const TextureSubr
 
 void RenderGraph::setTextureBarrier(Batch& batch, const RenderPassDependency& dep)
 {
-	ANKI_ASSERT(dep.m_type == RenderPassDependency::Type::TEXTURE);
+	ANKI_ASSERT(dep.m_type == RenderPassDependency::Type::kTexture);
 
 	BakeContext& ctx = *m_ctx;
 	const U32 batchIdx = U32(&batch - &ctx.m_batches[0]);
@@ -1057,8 +1057,8 @@ void RenderGraph::setBatchBarriers(const RenderGraphDescription& descr)
 	// For all batches
 	for(Batch& batch : ctx.m_batches)
 	{
-		BitSet<MAX_RENDER_GRAPH_BUFFERS, U64> buffHasBarrierMask(false);
-		BitSet<MAX_RENDER_GRAPH_ACCELERATION_STRUCTURES, U32> asHasBarrierMask(false);
+		BitSet<kMaxRenderGraphBuffers, U64> buffHasBarrierMask(false);
+		BitSet<kMaxRenderGraphAccelerationStructures, U32> asHasBarrierMask(false);
 
 		// For all passes of that batch
 		for(U32 passIdx : batch.m_passIndices)
@@ -1433,7 +1433,7 @@ void RenderGraph::periodicCleanup()
 
 void RenderGraph::getStatistics(RenderGraphStatistics& statistics) const
 {
-	const U32 oldFrame = (m_statistics.m_nextTimestamp + 1) % MAX_TIMESTAMPS_BUFFERED;
+	const U32 oldFrame = (m_statistics.m_nextTimestamp + 1) % kMaxBufferedTimestamps;
 
 	if(m_statistics.m_timestamps[oldFrame * 2] && m_statistics.m_timestamps[oldFrame * 2 + 1])
 	{

AnKi/Gr/RenderGraph.h

@@ -29,10 +29,10 @@ class RenderGraphDescription;
 
 /// @name RenderGraph constants
 /// @{
-constexpr U32 MAX_RENDER_GRAPH_PASSES = 128;
-constexpr U32 MAX_RENDER_GRAPH_RENDER_TARGETS = 64; ///< Max imported or not render targets in RenderGraph.
-constexpr U32 MAX_RENDER_GRAPH_BUFFERS = 64;
-constexpr U32 MAX_RENDER_GRAPH_ACCELERATION_STRUCTURES = 32;
+constexpr U32 kMaxRenderGraphPasses = 128;
+constexpr U32 kMaxRenderGraphRenderTargets = 64; ///< Max imported or not render targets in RenderGraph.
+constexpr U32 kMaxRenderGraphBuffers = 64;
+constexpr U32 kMaxRenderGraphAccelerationStructures = 32;
 /// @}
 
 /// Render target handle used in the RenderGraph.
@@ -241,7 +241,7 @@ public:
 	/// Dependency to a texture subresource.
 	RenderPassDependency(RenderTargetHandle handle, TextureUsageBit usage, const TextureSubresourceInfo& subresource)
 		: m_texture({handle, usage, subresource})
-		, m_type(Type::TEXTURE)
+		, m_type(Type::kTexture)
 	{
 		ANKI_ASSERT(handle.isValid());
 	}
@@ -250,7 +250,7 @@ public:
 	RenderPassDependency(RenderTargetHandle handle, TextureUsageBit usage,
 						 DepthStencilAspectBit aspect = DepthStencilAspectBit::kNone)
 		: m_texture({handle, usage, TextureSubresourceInfo()})
-		, m_type(Type::TEXTURE)
+		, m_type(Type::kTexture)
 	{
 		ANKI_ASSERT(handle.isValid());
 		m_texture.m_subresource.m_mipmapCount = kMaxU32; // Mark it as "whole texture"
@@ -259,14 +259,14 @@ public:
 
 	RenderPassDependency(BufferHandle handle, BufferUsageBit usage)
 		: m_buffer({handle, usage})
-		, m_type(Type::BUFFER)
+		, m_type(Type::kBuffer)
 	{
 		ANKI_ASSERT(handle.isValid());
 	}
 
 	RenderPassDependency(AccelerationStructureHandle handle, AccelerationStructureUsageBit usage)
 		: m_as({handle, usage})
-		, m_type(Type::ACCELERATION_STRUCTURE)
+		, m_type(Type::kAccelerationStructure)
 	{
 		ANKI_ASSERT(handle.isValid());
 	}
@@ -303,9 +303,9 @@ private:
 
 	enum class Type : U8
 	{
-		BUFFER,
-		TEXTURE,
-		ACCELERATION_STRUCTURE
+		kBuffer,
+		kTexture,
+		kAccelerationStructure
 	};
 
 	Type m_type;
@@ -331,7 +331,7 @@ public:
 	template<typename TFunc>
 	void setWork(U32 secondLeveCmdbCount, TFunc func)
 	{
-		ANKI_ASSERT(m_type == Type::GRAPHICS || secondLeveCmdbCount == 0);
+		ANKI_ASSERT(m_type == Type::kGraphics || secondLeveCmdbCount == 0);
 		m_callback.init(m_alloc, func);
 		m_secondLevelCmdbsCount = secondLeveCmdbCount;
 	}
@@ -348,8 +348,8 @@ public:
 protected:
 	enum class Type : U8
 	{
-		GRAPHICS,
-		NO_GRAPHICS
+		kGraphics,
+		kNoGraphics
 	};
 
 	Type m_type;
@@ -364,12 +364,12 @@ protected:
 	DynamicArray<RenderPassDependency> m_buffDeps;
 	DynamicArray<RenderPassDependency> m_asDeps;
 
-	BitSet<MAX_RENDER_GRAPH_RENDER_TARGETS, U64> m_readRtMask{false};
-	BitSet<MAX_RENDER_GRAPH_RENDER_TARGETS, U64> m_writeRtMask{false};
-	BitSet<MAX_RENDER_GRAPH_BUFFERS, U64> m_readBuffMask{false};
-	BitSet<MAX_RENDER_GRAPH_BUFFERS, U64> m_writeBuffMask{false};
-	BitSet<MAX_RENDER_GRAPH_ACCELERATION_STRUCTURES, U32> m_readAsMask{false};
-	BitSet<MAX_RENDER_GRAPH_ACCELERATION_STRUCTURES, U32> m_writeAsMask{false};
+	BitSet<kMaxRenderGraphRenderTargets, U64> m_readRtMask{false};
+	BitSet<kMaxRenderGraphRenderTargets, U64> m_writeRtMask{false};
+	BitSet<kMaxRenderGraphBuffers, U64> m_readBuffMask{false};
+	BitSet<kMaxRenderGraphBuffers, U64> m_writeBuffMask{false};
+	BitSet<kMaxRenderGraphAccelerationStructures, U32> m_readAsMask{false};
+	BitSet<kMaxRenderGraphAccelerationStructures, U32> m_writeAsMask{false};
 
 	String m_name;
 
@@ -413,7 +413,7 @@ class FramebufferDescription
 	friend class RenderGraph;
 
 public:
-	Array<FramebufferDescriptionAttachment, MAX_COLOR_ATTACHMENTS> m_colorAttachments;
+	Array<FramebufferDescriptionAttachment, kMaxColorRenderTargets> m_colorAttachments;
 	U32 m_colorAttachmentCount = 0;
 	FramebufferDescriptionAttachment m_depthStencilAttachment;
 	U32 m_shadingRateAttachmentTexelWidth = 0;
@@ -455,12 +455,12 @@ public:
 							U32 maxx = kMaxU32, U32 maxy = kMaxU32);
 
 private:
-	Array<RenderTargetHandle, MAX_COLOR_ATTACHMENTS + 2> m_rtHandles;
+	Array<RenderTargetHandle, kMaxColorRenderTargets + 2> m_rtHandles;
 	FramebufferDescription m_fbDescr;
 	Array<U32, 4> m_fbRenderArea = {};
 
 	GraphicsRenderPassDescription(RenderGraphDescription* descr)
-		: RenderPassDescriptionBase(Type::GRAPHICS, descr)
+		: RenderPassDescriptionBase(Type::kGraphics, descr)
 	{
 		memset(&m_rtHandles[0], 0xFF, sizeof(m_rtHandles));
 	}
@@ -481,7 +481,7 @@ class ComputeRenderPassDescription : public RenderPassDescriptionBase
 
 private:
 	ComputeRenderPassDescription(RenderGraphDescription* descr)
-		: RenderPassDescriptionBase(Type::NO_GRAPHICS, descr)
+		: RenderPassDescriptionBase(Type::kNoGraphics, descr)
 	{
 	}
 };
@@ -534,12 +534,12 @@ private:
 	class Resource
 	{
 	public:
-		Array<char, MAX_GR_OBJECT_NAME_LENGTH + 1> m_name;
+		Array<char, kMaxGrObjectNameLength + 1> m_name;
 
 		void setName(CString name)
 		{
 			const U len = name.getLength();
-			ANKI_ASSERT(len <= MAX_GR_OBJECT_NAME_LENGTH);
+			ANKI_ASSERT(len <= kMaxGrObjectNameLength);
 			strcpy(&m_name[0], (len) ? &name[0] : "unnamed");
 		}
 	};
@@ -624,7 +624,7 @@ class RenderGraph final : public GrObject
 	friend class RenderPassWorkContext;
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::RENDER_GRAPH;
+	static constexpr GrObjectType kClassType = GrObjectType::kRenderGraph;
 
 	/// @name 1st step methods
 	/// @{
@@ -665,7 +665,7 @@ public:
 	/// @}
 
 private:
-	static constexpr U PERIODIC_CLEANUP_EVERY = 60; ///< How many frames between cleanups.
+	static constexpr U kPeriodicCleanupEvery = 60; ///< How many frames between cleanups.
 
 	// Forward declarations of internal classes.
 	class BakeContext;
@@ -700,12 +700,12 @@ private:
 	BakeContext* m_ctx = nullptr;
 	U64 m_version = 0;
 
-	static constexpr U MAX_TIMESTAMPS_BUFFERED = MAX_FRAMES_IN_FLIGHT + 1;
+	static constexpr U kMaxBufferedTimestamps = kMaxFramesInFlight + 1;
 	class
 	{
 	public:
-		Array<TimestampQueryPtr, MAX_TIMESTAMPS_BUFFERED * 2> m_timestamps;
-		Array<Second, MAX_TIMESTAMPS_BUFFERED> m_cpuStartTimes;
+		Array<TimestampQueryPtr, kMaxBufferedTimestamps * 2> m_timestamps;
+		Array<Second, kMaxBufferedTimestamps> m_cpuStartTimes;
 		U8 m_nextTimestamp = 0;
 	} m_statistics;
 

AnKi/Gr/RenderGraph.inl.h

@@ -33,7 +33,7 @@ inline TexturePtr RenderPassWorkContext::getTexture(RenderTargetHandle handle) c
 
 inline void RenderPassDescriptionBase::fixSubresource(RenderPassDependency& dep) const
 {
-	ANKI_ASSERT(dep.m_type == RenderPassDependency::Type::TEXTURE);
+	ANKI_ASSERT(dep.m_type == RenderPassDependency::Type::kTexture);
 
 	TextureSubresourceInfo& subresource = dep.m_texture.m_subresource;
 	const Bool wholeTexture = subresource.m_mipmapCount == kMaxU32;
@@ -65,10 +65,10 @@ inline void RenderPassDescriptionBase::fixSubresource(RenderPassDependency& dep)
 inline void RenderPassDescriptionBase::validateDep(const RenderPassDependency& dep)
 {
 	// Validate dep
-	if(dep.m_type == RenderPassDependency::Type::TEXTURE)
+	if(dep.m_type == RenderPassDependency::Type::kTexture)
 	{
 		[[maybe_unused]] const TextureUsageBit usage = dep.m_texture.m_usage;
-		if(m_type == Type::GRAPHICS)
+		if(m_type == Type::kGraphics)
 		{
 			ANKI_ASSERT(!(usage & TextureUsageBit::kAllCompute));
 		}
@@ -79,10 +79,10 @@ inline void RenderPassDescriptionBase::validateDep(const RenderPassDependency& d
 
 		ANKI_ASSERT(!!(usage & TextureUsageBit::kAllRead) || !!(usage & TextureUsageBit::kAllWrite));
 	}
-	else if(dep.m_type == RenderPassDependency::Type::BUFFER)
+	else if(dep.m_type == RenderPassDependency::Type::kBuffer)
 	{
 		[[maybe_unused]] const BufferUsageBit usage = dep.m_buffer.m_usage;
-		if(m_type == Type::GRAPHICS)
+		if(m_type == Type::kGraphics)
 		{
 			ANKI_ASSERT(!(usage & BufferUsageBit::kAllCompute));
 		}
@@ -95,8 +95,8 @@ inline void RenderPassDescriptionBase::validateDep(const RenderPassDependency& d
 	}
 	else
 	{
-		ANKI_ASSERT(dep.m_type == RenderPassDependency::Type::ACCELERATION_STRUCTURE);
-		if(m_type == Type::GRAPHICS)
+		ANKI_ASSERT(dep.m_type == RenderPassDependency::Type::kAccelerationStructure);
+		if(m_type == Type::kGraphics)
 		{
 			ANKI_ASSERT(!(dep.m_as.m_usage & ~AccelerationStructureUsageBit::kAllGraphics));
 		}
@@ -111,7 +111,7 @@ inline void RenderPassDescriptionBase::newDependency(const RenderPassDependency&
 {
 	validateDep(dep);
 
-	if(dep.m_type == RenderPassDependency::Type::TEXTURE)
+	if(dep.m_type == RenderPassDependency::Type::kTexture)
 	{
 		m_rtDeps.emplaceBack(m_alloc, dep);
 		fixSubresource(m_rtDeps.getBack());
@@ -129,7 +129,7 @@ inline void RenderPassDescriptionBase::newDependency(const RenderPassDependency&
 		// Try to derive the usage by that dep
 		m_descr->m_renderTargets[dep.m_texture.m_handle.m_idx].m_usageDerivedByDeps |= dep.m_texture.m_usage;
 	}
-	else if(dep.m_type == RenderPassDependency::Type::BUFFER)
+	else if(dep.m_type == RenderPassDependency::Type::kBuffer)
 	{
 		m_buffDeps.emplaceBack(m_alloc, dep);
 
@@ -145,7 +145,7 @@ inline void RenderPassDescriptionBase::newDependency(const RenderPassDependency&
 	}
 	else
 	{
-		ANKI_ASSERT(dep.m_type == RenderPassDependency::Type::ACCELERATION_STRUCTURE);
+		ANKI_ASSERT(dep.m_type == RenderPassDependency::Type::kAccelerationStructure);
 		m_asDeps.emplaceBack(m_alloc, dep);
 
 		if(!!(dep.m_as.m_usage & AccelerationStructureUsageBit::kAllRead))
@@ -165,7 +165,7 @@ inline void GraphicsRenderPassDescription::setFramebufferInfo(
 	RenderTargetHandle depthStencilRenderTargetHandle, RenderTargetHandle shadingRateRenderTargetHandle, U32 minx,
 	U32 miny, U32 maxx, U32 maxy)
 {
-	Array<RenderTargetHandle, MAX_COLOR_ATTACHMENTS> rts;
+	Array<RenderTargetHandle, kMaxColorRenderTargets> rts;
 	U32 count = 0;
 	for(const RenderTargetHandle& h : colorRenderTargetHandles)
 	{
@@ -215,8 +215,8 @@ inline void GraphicsRenderPassDescription::setFramebufferInfo(
 
 	m_fbDescr = fbInfo;
 	memcpy(m_rtHandles.getBegin(), colorRenderTargetHandles.getBegin(), colorRenderTargetHandles.getSizeInBytes());
-	m_rtHandles[MAX_COLOR_ATTACHMENTS] = depthStencilRenderTargetHandle;
-	m_rtHandles[MAX_COLOR_ATTACHMENTS + 1] = shadingRateRenderTargetHandle;
+	m_rtHandles[kMaxColorRenderTargets] = depthStencilRenderTargetHandle;
+	m_rtHandles[kMaxColorRenderTargets + 1] = shadingRateRenderTargetHandle;
 	m_fbRenderArea = {minx, miny, maxx, maxy};
 }
 

AnKi/Gr/Sampler.h

@@ -51,12 +51,12 @@ class Sampler : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::SAMPLER;
+	static constexpr GrObjectType kClassType = GrObjectType::kSampler;
 
 protected:
 	/// Construct.
 	Sampler(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/Shader.h

@@ -89,7 +89,7 @@ class Shader : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::SHADER;
+	static constexpr GrObjectType kClassType = GrObjectType::kShader;
 
 	ShaderType getShaderType() const
 	{
@@ -102,7 +102,7 @@ protected:
 
 	/// Construct.
 	Shader(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/ShaderProgram.h

@@ -58,7 +58,7 @@ class ShaderProgram : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::SHADER_PROGRAM;
+	static constexpr GrObjectType kClassType = GrObjectType::kShaderProgram;
 
 	/// Get the shader group handles that will be used in the SBTs. The size of each handle is
 	/// GpuDeviceCapabilities::m_shaderGroupHandleSize. To access a handle use:
@@ -74,7 +74,7 @@ public:
 protected:
 	/// Construct.
 	ShaderProgram(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/Texture.h

@@ -100,7 +100,7 @@ class Texture : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::TEXTURE;
+	static constexpr GrObjectType kClassType = GrObjectType::kTexture;
 
 	U32 getWidth() const
 	{
@@ -255,7 +255,7 @@ protected:
 
 	/// Construct.
 	Texture(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/TextureView.h

@@ -74,7 +74,7 @@ class TextureView : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::TEXTURE_VIEW;
+	static constexpr GrObjectType kClassType = GrObjectType::kTextureView;
 
 	TextureType getTextureType() const
 	{
@@ -98,7 +98,7 @@ protected:
 
 	/// Construct.
 	TextureView(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 		m_subresource.m_depthStencilAspect = DepthStencilAspectBit::kNone;
 

AnKi/Gr/TimestampQuery.h

@@ -18,7 +18,7 @@ class TimestampQuery : public GrObject
 	ANKI_GR_OBJECT
 
 public:
-	static constexpr GrObjectType CLASS_TYPE = GrObjectType::TIMESTAMP_QUERY;
+	static constexpr GrObjectType kClassType = GrObjectType::kTimstampQuery;
 
 	/// Get the result if it's available. It won't block.
 	TimestampQueryResult getResult(Second& timestamp) const;
@@ -26,7 +26,7 @@ public:
 protected:
 	/// Construct.
 	TimestampQuery(GrManager* manager, CString name)
-		: GrObject(manager, CLASS_TYPE, name)
+		: GrObject(manager, kClassType, name)
 	{
 	}
 

AnKi/Gr/Utils/FrameGpuAllocator.cpp

@@ -12,9 +12,9 @@ void FrameGpuAllocator::init(PtrSize size, U32 alignment, PtrSize maxAllocationS
 	ANKI_ASSERT(!isCreated());
 	ANKI_ASSERT(size > 0 && alignment > 0 && maxAllocationSize > 0);
 
-	PtrSize perFrameSize = size / MAX_FRAMES_IN_FLIGHT;
+	PtrSize perFrameSize = size / kMaxFramesInFlight;
 	alignRoundDown(alignment, perFrameSize);
-	m_size = perFrameSize * MAX_FRAMES_IN_FLIGHT;
+	m_size = perFrameSize * kMaxFramesInFlight;
 
 	m_alignment = alignment;
 	m_maxAllocationSize = maxAllocationSize;
@@ -24,11 +24,11 @@ PtrSize FrameGpuAllocator::endFrame()
 {
 	ANKI_ASSERT(isCreated());
 
-	PtrSize perFrameSize = m_size / MAX_FRAMES_IN_FLIGHT;
+	PtrSize perFrameSize = m_size / kMaxFramesInFlight;
 
-	PtrSize crntFrameStartOffset = perFrameSize * (m_frame % MAX_FRAMES_IN_FLIGHT);
+	PtrSize crntFrameStartOffset = perFrameSize * (m_frame % kMaxFramesInFlight);
 
-	PtrSize nextFrameStartOffset = perFrameSize * ((m_frame + 1) % MAX_FRAMES_IN_FLIGHT);
+	PtrSize nextFrameStartOffset = perFrameSize * ((m_frame + 1) % kMaxFramesInFlight);
 
 	PtrSize crntOffset = m_offset.exchange(nextFrameStartOffset);
 	ANKI_ASSERT(crntOffset >= crntFrameStartOffset);
@@ -51,8 +51,8 @@ Error FrameGpuAllocator::allocate(PtrSize originalSize, PtrSize& outOffset)
 	ANKI_ASSERT(size <= m_maxAllocationSize && "Too high!");
 
 	const PtrSize offset = m_offset.fetchAdd(size);
-	const PtrSize perFrameSize = m_size / MAX_FRAMES_IN_FLIGHT;
-	const PtrSize crntFrameStartOffset = perFrameSize * (m_frame % MAX_FRAMES_IN_FLIGHT);
+	const PtrSize perFrameSize = m_size / kMaxFramesInFlight;
+	const PtrSize crntFrameStartOffset = perFrameSize * (m_frame % kMaxFramesInFlight);
 
 	if(offset - crntFrameStartOffset + size <= perFrameSize)
 	{
@@ -80,8 +80,8 @@ Error FrameGpuAllocator::allocate(PtrSize originalSize, PtrSize& outOffset)
 #if ANKI_ENABLE_TRACE
 PtrSize FrameGpuAllocator::getUnallocatedMemorySize() const
 {
-	PtrSize perFrameSize = m_size / MAX_FRAMES_IN_FLIGHT;
-	PtrSize crntFrameStartOffset = perFrameSize * (m_frame % MAX_FRAMES_IN_FLIGHT);
+	PtrSize perFrameSize = m_size / kMaxFramesInFlight;
+	PtrSize crntFrameStartOffset = perFrameSize * (m_frame % kMaxFramesInFlight);
 	PtrSize usedSize = m_offset.getNonAtomically() - crntFrameStartOffset + m_lastAllocatedSize.getNonAtomically();
 
 	PtrSize remaining = (perFrameSize >= usedSize) ? (perFrameSize - usedSize) : 0;

AnKi/Gr/Vulkan/AccelerationStructureImpl.cpp

@@ -61,7 +61,7 @@ Error AccelerationStructureImpl::init(const AccelerationStructureInitInfo& inf)
 
 		// Create the buffer that holds the AS memory
 		BufferInitInfo bufferInit(inf.getName());
-		bufferInit.m_usage = PrivateBufferUsageBit::ACCELERATION_STRUCTURE;
+		bufferInit.m_usage = PrivateBufferUsageBit::kAccelerationStructure;
 		bufferInit.m_size = buildSizes.accelerationStructureSize;
 		m_asBuffer = getManager().newBuffer(bufferInit);
 
@@ -94,7 +94,7 @@ Error AccelerationStructureImpl::init(const AccelerationStructureInitInfo& inf)
 
 		BufferInitInfo buffInit("AS instances");
 		buffInit.m_size = sizeof(VkAccelerationStructureInstanceKHR) * inf.m_topLevel.m_instances.getSize();
-		buffInit.m_usage = PrivateBufferUsageBit::ACCELERATION_STRUCTURE;
+		buffInit.m_usage = PrivateBufferUsageBit::kAccelerationStructure;
 		buffInit.m_mapAccess = BufferMapAccessBit::kWrite;
 		m_topLevelInfo.m_instancesBuffer = getManager().newBuffer(buffInit);
 
@@ -150,7 +150,7 @@ Error AccelerationStructureImpl::init(const AccelerationStructureInitInfo& inf)
 
 		// Create the buffer that holds the AS memory
 		BufferInitInfo bufferInit(inf.getName());
-		bufferInit.m_usage = PrivateBufferUsageBit::ACCELERATION_STRUCTURE;
+		bufferInit.m_usage = PrivateBufferUsageBit::kAccelerationStructure;
 		bufferInit.m_size = buildSizes.accelerationStructureSize;
 		m_asBuffer = getManager().newBuffer(bufferInit);
 

AnKi/Gr/Vulkan/BufferImpl.cpp

@@ -48,7 +48,7 @@ BufferImpl::~BufferImpl()
 Error BufferImpl::init(const BufferInitInfo& inf)
 {
 	ANKI_ASSERT(!isCreated());
-	const Bool exposeGpuAddress = !!(getGrManagerImpl().getExtensions() & VulkanExtensions::KHR_BUFFER_DEVICE_ADDRESS)
+	const Bool exposeGpuAddress = !!(getGrManagerImpl().getExtensions() & VulkanExtensions::kKHR_buffer_device_address)
 								  && !!(inf.m_usage & ~BufferUsageBit::kAllTransfer);
 
 	PtrSize size = inf.m_size;
@@ -304,13 +304,13 @@ VkAccessFlags BufferImpl::computeAccessMask(BufferUsageBit usage)
 {
 	VkAccessFlags mask = 0;
 
-	constexpr BufferUsageBit SHADER_READ = BufferUsageBit::kStorageGeometryRead | BufferUsageBit::kStorageFragmentRead
+	constexpr BufferUsageBit kShaderRead = BufferUsageBit::kStorageGeometryRead | BufferUsageBit::kStorageFragmentRead
 										   | BufferUsageBit::kStorageComputeRead | BufferUsageBit::kStorageTraceRaysRead
 										   | BufferUsageBit::kTextureGeometryRead | BufferUsageBit::kTextureFragmentRead
 										   | BufferUsageBit::kTextureComputeRead
 										   | BufferUsageBit::kTextureTraceRaysRead;
 
-	constexpr BufferUsageBit SHADER_WRITE =
+	constexpr BufferUsageBit kShaderWrite =
 		BufferUsageBit::kStorageGeometryWrite | BufferUsageBit::kStorageFragmentWrite
 		| BufferUsageBit::kStorageComputeWrite | BufferUsageBit::kStorageTraceRaysWrite
 		| BufferUsageBit::kTextureGeometryWrite | BufferUsageBit::kTextureFragmentWrite
@@ -321,12 +321,12 @@ VkAccessFlags BufferImpl::computeAccessMask(BufferUsageBit usage)
 		mask |= VK_ACCESS_UNIFORM_READ_BIT;
 	}
 
-	if(!!(usage & SHADER_READ))
+	if(!!(usage & kShaderRead))
 	{
 		mask |= VK_ACCESS_SHADER_READ_BIT;
 	}
 
-	if(!!(usage & SHADER_WRITE))
+	if(!!(usage & kShaderWrite))
 	{
 		mask |= VK_ACCESS_SHADER_WRITE_BIT;
 	}

AnKi/Gr/Vulkan/CommandBuffer.cpp

@@ -246,7 +246,7 @@ void CommandBuffer::bindShaderProgram(const ShaderProgramPtr& prog)
 }
 
 void CommandBuffer::beginRenderPass(const FramebufferPtr& fb,
-									const Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS>& colorAttachmentUsages,
+									const Array<TextureUsageBit, kMaxColorRenderTargets>& colorAttachmentUsages,
 									TextureUsageBit depthStencilAttachmentUsage, U32 minx, U32 miny, U32 width,
 									U32 height)
 {

AnKi/Gr/Vulkan/CommandBufferFactory.cpp

@@ -11,15 +11,15 @@ namespace anki {
 static VulkanQueueType getQueueTypeFromCommandBufferFlags(CommandBufferFlag flags,
 														  const VulkanQueueFamilies& queueFamilies)
 {
-	ANKI_ASSERT(!!(flags & CommandBufferFlag::GENERAL_WORK) ^ !!(flags & CommandBufferFlag::COMPUTE_WORK));
-	if(!(flags & CommandBufferFlag::GENERAL_WORK) && queueFamilies[VulkanQueueType::COMPUTE] != kMaxU32)
+	ANKI_ASSERT(!!(flags & CommandBufferFlag::kGeneralWork) ^ !!(flags & CommandBufferFlag::kComputeWork));
+	if(!(flags & CommandBufferFlag::kGeneralWork) && queueFamilies[VulkanQueueType::kCompute] != kMaxU32)
 	{
-		return VulkanQueueType::COMPUTE;
+		return VulkanQueueType::kCompute;
 	}
 	else
 	{
-		ANKI_ASSERT(queueFamilies[VulkanQueueType::GENERAL] != kMaxU32);
-		return VulkanQueueType::GENERAL;
+		ANKI_ASSERT(queueFamilies[VulkanQueueType::kGeneral] != kMaxU32);
+		return VulkanQueueType::kGeneral;
 	}
 }
 
@@ -110,10 +110,10 @@ void CommandBufferThreadAllocator::destroy()
 
 Error CommandBufferThreadAllocator::newCommandBuffer(CommandBufferFlag cmdbFlags, MicroCommandBufferPtr& outPtr)
 {
-	ANKI_ASSERT(!!(cmdbFlags & CommandBufferFlag::COMPUTE_WORK) ^ !!(cmdbFlags & CommandBufferFlag::GENERAL_WORK));
+	ANKI_ASSERT(!!(cmdbFlags & CommandBufferFlag::kComputeWork) ^ !!(cmdbFlags & CommandBufferFlag::kGeneralWork));
 
-	const Bool secondLevel = !!(cmdbFlags & CommandBufferFlag::SECOND_LEVEL);
-	const Bool smallBatch = !!(cmdbFlags & CommandBufferFlag::SMALL_BATCH);
+	const Bool secondLevel = !!(cmdbFlags & CommandBufferFlag::kSecondLevel);
+	const Bool smallBatch = !!(cmdbFlags & CommandBufferFlag::kSmallBatch);
 	const VulkanQueueType queue = getQueueTypeFromCommandBufferFlags(cmdbFlags, m_factory->m_queueFamilies);
 
 	MicroObjectRecycler<MicroCommandBuffer>& recycler = m_recyclers[secondLevel][smallBatch][queue];
@@ -166,8 +166,8 @@ void CommandBufferThreadAllocator::deleteCommandBuffer(MicroCommandBuffer* ptr)
 {
 	ANKI_ASSERT(ptr);
 
-	const Bool secondLevel = !!(ptr->m_flags & CommandBufferFlag::SECOND_LEVEL);
-	const Bool smallBatch = !!(ptr->m_flags & CommandBufferFlag::SMALL_BATCH);
+	const Bool secondLevel = !!(ptr->m_flags & CommandBufferFlag::kSecondLevel);
+	const Bool smallBatch = !!(ptr->m_flags & CommandBufferFlag::kSmallBatch);
 
 	m_recyclers[secondLevel][smallBatch][ptr->m_queue].recycle(ptr);
 }

AnKi/Gr/Vulkan/CommandBufferFactory.h

@@ -50,7 +50,7 @@ public:
 
 	void setFence(MicroFencePtr& fence)
 	{
-		ANKI_ASSERT(!(m_flags & CommandBufferFlag::SECOND_LEVEL));
+		ANKI_ASSERT(!(m_flags & CommandBufferFlag::kSecondLevel));
 		ANKI_ASSERT(!m_fence.isCreated());
 		m_fence = fence;
 	}
@@ -82,13 +82,13 @@ public:
 	template<typename T>
 	void pushObjectRef(const GrObjectPtrT<T>& x)
 	{
-		pushToArray(m_objectRefs[T::CLASS_TYPE], x.get());
+		pushToArray(m_objectRefs[T::kClassType], x.get());
 	}
 
 	template<typename T>
 	void pushObjectRef(T* x)
 	{
-		pushToArray(m_objectRefs[T::CLASS_TYPE], x);
+		pushToArray(m_objectRefs[T::kClassType], x);
 	}
 
 	CommandBufferFlag getFlags() const
@@ -103,7 +103,7 @@ public:
 	}
 
 private:
-	static constexpr U32 MAX_REF_OBJECT_SEARCH = 16;
+	static constexpr U32 kMaxRefObjectSearch = 16;
 
 	StackAllocator<U8> m_fastAlloc;
 	VkCommandBuffer m_handle = {};
@@ -115,7 +115,7 @@ private:
 
 	CommandBufferThreadAllocator* m_threadAlloc;
 	mutable Atomic<I32> m_refcount = {0};
-	CommandBufferFlag m_flags = CommandBufferFlag::NONE;
+	CommandBufferFlag m_flags = CommandBufferFlag::kNone;
 	VulkanQueueType m_queue = VulkanQueueType::kCount;
 
 	void reset();
@@ -125,9 +125,9 @@ private:
 		ANKI_ASSERT(grobj);
 
 		// Search the temp cache to avoid setting the ref again
-		if(arr.getSize() >= MAX_REF_OBJECT_SEARCH)
+		if(arr.getSize() >= kMaxRefObjectSearch)
 		{
-			for(U32 i = arr.getSize() - MAX_REF_OBJECT_SEARCH; i < arr.getSize(); ++i)
+			for(U32 i = arr.getSize() - kMaxRefObjectSearch; i < arr.getSize(); ++i)
 			{
 				if(arr[i].get() == grobj)
 				{

AnKi/Gr/Vulkan/CommandBufferImpl.cpp

@@ -53,7 +53,7 @@ Error CommandBufferImpl::init(const CommandBufferInitInfo& init)
 	m_alloc = m_microCmdb->getFastAllocator();
 
 	// Store some of the init info for later
-	if(!!(m_flags & CommandBufferFlag::SECOND_LEVEL))
+	if(!!(m_flags & CommandBufferFlag::kSecondLevel))
 	{
 		m_activeFb = init.m_framebuffer;
 		m_colorAttachmentUsages = init.m_colorAttachmentUsages;
@@ -81,12 +81,12 @@ void CommandBufferImpl::beginRecording()
 	begin.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
 	begin.pInheritanceInfo = &inheritance;
 
-	if(!!(m_flags & CommandBufferFlag::SECOND_LEVEL))
+	if(!!(m_flags & CommandBufferFlag::kSecondLevel))
 	{
 		FramebufferImpl& impl = static_cast<FramebufferImpl&>(*m_activeFb);
 
 		// Calc the layouts
-		Array<VkImageLayout, MAX_COLOR_ATTACHMENTS> colAttLayouts;
+		Array<VkImageLayout, kMaxColorRenderTargets> colAttLayouts;
 		for(U i = 0; i < impl.getColorAttachmentCount(); ++i)
 		{
 			const TextureViewImpl& view = static_cast<const TextureViewImpl&>(*impl.getColorAttachment(i));
@@ -117,14 +117,14 @@ void CommandBufferImpl::beginRecording()
 	vkBeginCommandBuffer(m_handle, &begin);
 
 	// Stats
-	if(!!(getGrManagerImpl().getExtensions() & VulkanExtensions::KHR_PIPELINE_EXECUTABLE_PROPERTIES))
+	if(!!(getGrManagerImpl().getExtensions() & VulkanExtensions::kKHR_pipeline_executable_properties))
 	{
 		m_state.setEnablePipelineStatistics(true);
 	}
 }
 
 void CommandBufferImpl::beginRenderPassInternal(
-	const FramebufferPtr& fb, const Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS>& colorAttachmentUsages,
+	const FramebufferPtr& fb, const Array<TextureUsageBit, kMaxColorRenderTargets>& colorAttachmentUsages,
 	TextureUsageBit depthStencilAttachmentUsage, U32 minx, U32 miny, U32 width, U32 height)
 {
 	commandCommon();
@@ -169,7 +169,7 @@ void CommandBufferImpl::beginRenderPassInternal()
 {
 	FramebufferImpl& impl = static_cast<FramebufferImpl&>(*m_activeFb);
 
-	flushBatches(CommandBufferCommandType::ANY_OTHER_COMMAND); // Flush before the marker
+	flushBatches(CommandBufferCommandType::kAnyOtherCommand); // Flush before the marker
 
 	m_state.beginRenderPass(&impl);
 
@@ -180,7 +180,7 @@ void CommandBufferImpl::beginRenderPassInternal()
 	bi.framebuffer = impl.getFramebufferHandle();
 
 	// Calc the layouts
-	Array<VkImageLayout, MAX_COLOR_ATTACHMENTS> colAttLayouts;
+	Array<VkImageLayout, kMaxColorRenderTargets> colAttLayouts;
 	for(U i = 0; i < impl.getColorAttachmentCount(); ++i)
 	{
 		const TextureViewImpl& view = static_cast<const TextureViewImpl&>(*impl.getColorAttachment(i));
@@ -253,7 +253,7 @@ void CommandBufferImpl::endRenderPassInternal()
 	VkSubpassEndInfo subpassEndInfo = {};
 	subpassEndInfo.sType = VK_STRUCTURE_TYPE_SUBPASS_END_INFO;
 
-	ANKI_CMD(vkCmdEndRenderPass2KHR(m_handle, &subpassEndInfo), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdEndRenderPass2KHR(m_handle, &subpassEndInfo), kAnyOtherCommand);
 	getGrManagerImpl().endMarker(m_handle);
 
 	m_activeFb.reset(nullptr);
@@ -274,7 +274,7 @@ void CommandBufferImpl::endRecording()
 	ANKI_ASSERT(!m_finalized);
 	ANKI_ASSERT(!m_empty);
 
-	ANKI_CMD(ANKI_VK_CHECKF(vkEndCommandBuffer(m_handle)), ANY_OTHER_COMMAND);
+	ANKI_CMD(ANKI_VK_CHECKF(vkEndCommandBuffer(m_handle)), kAnyOtherCommand);
 	m_finalized = true;
 
 #if ANKI_EXTRA_CHECKS
@@ -282,16 +282,16 @@ void CommandBufferImpl::endRecording()
 	constexpr U32 MAX_PRINT_COUNT = 10;
 
 	CString message;
-	if(!!(m_flags & CommandBufferFlag::SMALL_BATCH))
+	if(!!(m_flags & CommandBufferFlag::kSmallBatch))
 	{
-		if(m_commandCount > COMMAND_BUFFER_SMALL_BATCH_MAX_COMMANDS * 4)
+		if(m_commandCount > kCommandBufferSmallBatchMaxCommands * 4)
 		{
 			message = "Command buffer has too many commands%s: %u";
 		}
 	}
 	else
 	{
-		if(m_commandCount <= COMMAND_BUFFER_SMALL_BATCH_MAX_COMMANDS / 4)
+		if(m_commandCount <= kCommandBufferSmallBatchMaxCommands / 4)
 		{
 			message = "Command buffer has too few commands%s: %u";
 		}
@@ -325,7 +325,7 @@ void CommandBufferImpl::generateMipmaps2dInternal(const TextureViewPtr& texView)
 	if(blitCount == 0)
 	{
 		// Nothing to be done, flush the previous commands though because you may batch (and sort) things you shouldn't
-		flushBatches(CommandBufferCommandType::ANY_OTHER_COMMAND);
+		flushBatches(CommandBufferCommandType::kAnyOtherCommand);
 		return;
 	}
 
@@ -403,7 +403,7 @@ void CommandBufferImpl::generateMipmaps2dInternal(const TextureViewPtr& texView)
 		ANKI_CMD(vkCmdBlitImage(m_handle, tex.m_imageHandle, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, tex.m_imageHandle,
 								VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &blit,
 								(!!aspect) ? VK_FILTER_NEAREST : VK_FILTER_LINEAR),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 	}
 
 	// Hold the reference
@@ -705,7 +705,7 @@ void CommandBufferImpl::copyBufferToTextureViewInternal(const BufferPtr& buff, P
 
 	ANKI_CMD(vkCmdCopyBufferToImage(m_handle, static_cast<const BufferImpl&>(*buff).getHandle(), tex.m_imageHandle,
 									layout, 1, &region),
-			 ANY_OTHER_COMMAND);
+			 kAnyOtherCommand);
 
 	m_microCmdb->pushObjectRef(texView);
 	m_microCmdb->pushObjectRef(buff);
@@ -725,14 +725,14 @@ void CommandBufferImpl::rebindDynamicState()
 	{
 		ANKI_CMD(vkCmdSetStencilCompareMask(m_handle, VK_STENCIL_FACE_FRONT_BIT | VK_STENCIL_FACE_BACK_BIT,
 											m_stencilCompareMasks[0]),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 	}
 	else
 	{
 		ANKI_CMD(vkCmdSetStencilCompareMask(m_handle, VK_STENCIL_FACE_FRONT_BIT, m_stencilCompareMasks[0]),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 		ANKI_CMD(vkCmdSetStencilCompareMask(m_handle, VK_STENCIL_FACE_BACK_BIT, m_stencilCompareMasks[1]),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 	}
 
 	// Rebind the stencil write mask
@@ -740,14 +740,14 @@ void CommandBufferImpl::rebindDynamicState()
 	{
 		ANKI_CMD(vkCmdSetStencilWriteMask(m_handle, VK_STENCIL_FACE_FRONT_BIT | VK_STENCIL_FACE_BACK_BIT,
 										  m_stencilWriteMasks[0]),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 	}
 	else
 	{
 		ANKI_CMD(vkCmdSetStencilWriteMask(m_handle, VK_STENCIL_FACE_FRONT_BIT, m_stencilWriteMasks[0]),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 		ANKI_CMD(vkCmdSetStencilWriteMask(m_handle, VK_STENCIL_FACE_BACK_BIT, m_stencilWriteMasks[1]),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 	}
 
 	// Rebind the stencil reference
@@ -755,14 +755,14 @@ void CommandBufferImpl::rebindDynamicState()
 	{
 		ANKI_CMD(vkCmdSetStencilReference(m_handle, VK_STENCIL_FACE_FRONT_BIT | VK_STENCIL_FACE_BACK_BIT,
 										  m_stencilReferenceMasks[0]),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 	}
 	else
 	{
 		ANKI_CMD(vkCmdSetStencilReference(m_handle, VK_STENCIL_FACE_FRONT_BIT, m_stencilReferenceMasks[0]),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 		ANKI_CMD(vkCmdSetStencilReference(m_handle, VK_STENCIL_FACE_BACK_BIT, m_stencilReferenceMasks[1]),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 	}
 }
 
@@ -775,7 +775,7 @@ void CommandBufferImpl::buildAccelerationStructureInternal(const AccelerationStr
 
 	// Create the scrach buffer
 	BufferInitInfo bufferInit;
-	bufferInit.m_usage = PrivateBufferUsageBit::ACCELERATION_STRUCTURE_BUILD_SCRATCH;
+	bufferInit.m_usage = PrivateBufferUsageBit::kAccelerationStructureBuildScratch;
 	bufferInit.m_size = asImpl.getBuildScratchBufferSize();
 	BufferPtr scratchBuff = getManager().newBuffer(bufferInit);
 
@@ -786,7 +786,7 @@ void CommandBufferImpl::buildAccelerationStructureInternal(const AccelerationStr
 
 	// Do the command
 	Array<const VkAccelerationStructureBuildRangeInfoKHR*, 1> pRangeInfos = {&rangeInfo};
-	ANKI_CMD(vkCmdBuildAccelerationStructuresKHR(m_handle, 1, &buildInfo, &pRangeInfos[0]), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdBuildAccelerationStructuresKHR(m_handle, 1, &buildInfo, &pRangeInfos[0]), kAnyOtherCommand);
 
 	// Push refs
 	m_microCmdb->pushObjectRef(as);
@@ -820,10 +820,10 @@ void CommandBufferImpl::upscaleInternal(const GrUpscalerPtr& upscaler, const Tex
 {
 #if ANKI_DLSS
 	ANKI_ASSERT(getGrManagerImpl().getDeviceCapabilities().m_dlss);
-	ANKI_ASSERT(upscaler->getUpscalerType() == GrUpscalerType::DLSS_2);
+	ANKI_ASSERT(upscaler->getUpscalerType() == GrUpscalerType::kDlss2);
 
 	commandCommon();
-	flushBatches(CommandBufferCommandType::ANY_OTHER_COMMAND);
+	flushBatches(CommandBufferCommandType::kAnyOtherCommand);
 
 	const GrUpscalerImpl& upscalerImpl = static_cast<const GrUpscalerImpl&>(*upscaler);
 

AnKi/Gr/Vulkan/CommandBufferImpl.h

@@ -35,11 +35,11 @@ class CommandBufferInitInfo;
 /// List the commands that can be batched.
 enum class CommandBufferCommandType : U8
 {
-	SET_BARRIER,
-	RESET_QUERY,
-	WRITE_QUERY_RESULT,
-	PUSH_SECOND_LEVEL,
-	ANY_OTHER_COMMAND
+	kSetBarrier,
+	kResetQuery,
+	kWriteQueryResult,
+	kPushSecondLevel,
+	kAnyOtherCommand
 };
 
 /// Command buffer implementation.
@@ -88,7 +88,7 @@ public:
 
 	Bool isSecondLevel() const
 	{
-		return !!(m_flags & CommandBufferFlag::SECOND_LEVEL);
+		return !!(m_flags & CommandBufferFlag::kSecondLevel);
 	}
 
 	void bindVertexBufferInternal(U32 binding, const BufferPtr& buff, PtrSize offset, PtrSize stride,
@@ -97,7 +97,7 @@ public:
 		commandCommon();
 		m_state.bindVertexBuffer(binding, stride, stepRate);
 		const VkBuffer vkbuff = static_cast<const BufferImpl&>(*buff).getHandle();
-		ANKI_CMD(vkCmdBindVertexBuffers(m_handle, binding, 1, &vkbuff, &offset), ANY_OTHER_COMMAND);
+		ANKI_CMD(vkCmdBindVertexBuffers(m_handle, binding, 1, &vkbuff, &offset), kAnyOtherCommand);
 		m_microCmdb->pushObjectRef(buff);
 	}
 
@@ -112,7 +112,7 @@ public:
 		commandCommon();
 		ANKI_CMD(vkCmdBindIndexBuffer(m_handle, static_cast<const BufferImpl&>(*buff).getHandle(), offset,
 									  convertIndexType(type)),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 		m_microCmdb->pushObjectRef(buff);
 	}
 
@@ -292,7 +292,7 @@ public:
 	}
 
 	void beginRenderPassInternal(const FramebufferPtr& fb,
-								 const Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS>& colorAttachmentUsages,
+								 const Array<TextureUsageBit, kMaxColorRenderTargets>& colorAttachmentUsages,
 								 TextureUsageBit depthStencilAttachmentUsage, U32 minx, U32 miny, U32 width,
 								 U32 height);
 
@@ -420,7 +420,7 @@ private:
 	MicroCommandBufferPtr m_microCmdb;
 	VkCommandBuffer m_handle = VK_NULL_HANDLE;
 	ThreadId m_tid = ~ThreadId(0);
-	CommandBufferFlag m_flags = CommandBufferFlag::NONE;
+	CommandBufferFlag m_flags = CommandBufferFlag::kNone;
 	Bool m_renderedToDefaultFb : 1;
 	Bool m_finalized : 1;
 	Bool m_empty : 1;
@@ -434,12 +434,12 @@ private:
 	Array<U32, 4> m_renderArea = {0, 0, kMaxU32, kMaxU32};
 	Array<U32, 2> m_fbSize = {0, 0};
 	U32 m_rpCommandCount = 0; ///< Number of drawcalls or pushed cmdbs in rp.
-	Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS> m_colorAttachmentUsages = {};
+	Array<TextureUsageBit, kMaxColorRenderTargets> m_colorAttachmentUsages = {};
 	TextureUsageBit m_depthStencilAttachmentUsage = TextureUsageBit::kNone;
 
 	PipelineStateTracker m_state;
 
-	Array<DescriptorSetState, MAX_DESCRIPTOR_SETS> m_dsetState;
+	Array<DescriptorSetState, kMaxDescriptorSets> m_dsetState;
 
 	ShaderProgramImpl* m_graphicsProg ANKI_DEBUG_CODE(= nullptr); ///< Last bound graphics program
 	ShaderProgramImpl* m_computeProg ANKI_DEBUG_CODE(= nullptr);
@@ -447,7 +447,7 @@ private:
 
 	VkSubpassContents m_subpassContents = VK_SUBPASS_CONTENTS_MAX_ENUM;
 
-	CommandBufferCommandType m_lastCmdType = CommandBufferCommandType::ANY_OTHER_COMMAND;
+	CommandBufferCommandType m_lastCmdType = CommandBufferCommandType::kAnyOtherCommand;
 
 	/// @name state_opts
 	/// @{
@@ -532,7 +532,7 @@ private:
 
 	Bool secondLevel() const
 	{
-		return !!(m_flags & CommandBufferFlag::SECOND_LEVEL);
+		return !!(m_flags & CommandBufferFlag::kSecondLevel);
 	}
 
 	/// Flush batched image and buffer barriers.

AnKi/Gr/Vulkan/CommandBufferImpl.inl.h

@@ -33,7 +33,7 @@ inline void CommandBufferImpl::setStencilCompareMaskInternal(FaceSelectionBit fa
 
 	if(flags)
 	{
-		ANKI_CMD(vkCmdSetStencilCompareMask(m_handle, flags, mask), ANY_OTHER_COMMAND);
+		ANKI_CMD(vkCmdSetStencilCompareMask(m_handle, flags, mask), kAnyOtherCommand);
 	}
 }
 
@@ -57,7 +57,7 @@ inline void CommandBufferImpl::setStencilWriteMaskInternal(FaceSelectionBit face
 
 	if(flags)
 	{
-		ANKI_CMD(vkCmdSetStencilWriteMask(m_handle, flags, mask), ANY_OTHER_COMMAND);
+		ANKI_CMD(vkCmdSetStencilWriteMask(m_handle, flags, mask), kAnyOtherCommand);
 	}
 }
 
@@ -81,7 +81,7 @@ inline void CommandBufferImpl::setStencilReferenceInternal(FaceSelectionBit face
 
 	if(flags)
 	{
-		ANKI_CMD(vkCmdSetStencilReference(m_handle, flags, ref), ANY_OTHER_COMMAND);
+		ANKI_CMD(vkCmdSetStencilReference(m_handle, flags, ref), kAnyOtherCommand);
 	}
 }
 
@@ -105,7 +105,7 @@ inline void CommandBufferImpl::setImageBarrier(VkPipelineStageFlags srcStage, Vk
 	inf.subresourceRange = range;
 
 #if ANKI_BATCH_COMMANDS
-	flushBatches(CommandBufferCommandType::SET_BARRIER);
+	flushBatches(CommandBufferCommandType::kSetBarrier);
 
 	if(m_imgBarriers.getSize() <= m_imgBarrierCount)
 	{
@@ -117,7 +117,7 @@ inline void CommandBufferImpl::setImageBarrier(VkPipelineStageFlags srcStage, Vk
 	m_srcStageMask |= srcStage;
 	m_dstStageMask |= dstStage;
 #else
-	ANKI_CMD(vkCmdPipelineBarrier(m_handle, srcStage, dstStage, 0, 0, nullptr, 0, nullptr, 1, &inf), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdPipelineBarrier(m_handle, srcStage, dstStage, 0, 0, nullptr, 0, nullptr, 1, &inf), kAnyOtherCommand);
 	ANKI_TRACE_INC_COUNTER(VK_PIPELINE_BARRIERS, 1);
 #endif
 }
@@ -223,7 +223,7 @@ inline void CommandBufferImpl::setBufferBarrierInternal(VkPipelineStageFlags src
 	b.size = size;
 
 #if ANKI_BATCH_COMMANDS
-	flushBatches(CommandBufferCommandType::SET_BARRIER);
+	flushBatches(CommandBufferCommandType::kSetBarrier);
 
 	if(m_buffBarriers.getSize() <= m_buffBarrierCount)
 	{
@@ -235,7 +235,7 @@ inline void CommandBufferImpl::setBufferBarrierInternal(VkPipelineStageFlags src
 	m_srcStageMask |= srcStage;
 	m_dstStageMask |= dstStage;
 #else
-	ANKI_CMD(vkCmdPipelineBarrier(m_handle, srcStage, dstStage, 0, 0, nullptr, 1, &b, 0, nullptr), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdPipelineBarrier(m_handle, srcStage, dstStage, 0, 0, nullptr, 1, &b, 0, nullptr), kAnyOtherCommand);
 	ANKI_TRACE_INC_COUNTER(VK_PIPELINE_BARRIERS, 1);
 #endif
 }
@@ -270,7 +270,7 @@ CommandBufferImpl::setAccelerationStructureBarrierInternal([[maybe_unused]] cons
 	AccelerationStructureImpl::computeBarrierInfo(prevUsage, nextUsage, srcStage, srcAccess, dstStage, dstAccess);
 
 #if ANKI_BATCH_COMMANDS
-	flushBatches(CommandBufferCommandType::SET_BARRIER);
+	flushBatches(CommandBufferCommandType::kSetBarrier);
 
 	VkMemoryBarrier memBarrier = {};
 	memBarrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
@@ -298,7 +298,7 @@ inline void CommandBufferImpl::drawArraysInternal(PrimitiveTopology topology, U3
 {
 	m_state.setPrimitiveTopology(topology);
 	drawcallCommon();
-	ANKI_CMD(vkCmdDraw(m_handle, count, instanceCount, first, baseInstance), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdDraw(m_handle, count, instanceCount, first, baseInstance), kAnyOtherCommand);
 }
 
 inline void CommandBufferImpl::drawElementsInternal(PrimitiveTopology topology, U32 count, U32 instanceCount,
@@ -306,7 +306,7 @@ inline void CommandBufferImpl::drawElementsInternal(PrimitiveTopology topology,
 {
 	m_state.setPrimitiveTopology(topology);
 	drawcallCommon();
-	ANKI_CMD(vkCmdDrawIndexed(m_handle, count, instanceCount, firstIndex, baseVertex, baseInstance), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdDrawIndexed(m_handle, count, instanceCount, firstIndex, baseVertex, baseInstance), kAnyOtherCommand);
 }
 
 inline void CommandBufferImpl::drawArraysIndirectInternal(PrimitiveTopology topology, U32 drawCount, PtrSize offset,
@@ -320,7 +320,7 @@ inline void CommandBufferImpl::drawArraysIndirectInternal(PrimitiveTopology topo
 	ANKI_ASSERT((offset + sizeof(DrawArraysIndirectInfo) * drawCount) <= impl.getSize());
 
 	ANKI_CMD(vkCmdDrawIndirect(m_handle, impl.getHandle(), offset, drawCount, sizeof(DrawArraysIndirectInfo)),
-			 ANY_OTHER_COMMAND);
+			 kAnyOtherCommand);
 }
 
 inline void CommandBufferImpl::drawElementsIndirectInternal(PrimitiveTopology topology, U32 drawCount, PtrSize offset,
@@ -334,7 +334,7 @@ inline void CommandBufferImpl::drawElementsIndirectInternal(PrimitiveTopology to
 	ANKI_ASSERT((offset + sizeof(DrawElementsIndirectInfo) * drawCount) <= impl.getSize());
 
 	ANKI_CMD(vkCmdDrawIndexedIndirect(m_handle, impl.getHandle(), offset, drawCount, sizeof(DrawElementsIndirectInfo)),
-			 ANY_OTHER_COMMAND);
+			 kAnyOtherCommand);
 }
 
 inline void CommandBufferImpl::dispatchComputeInternal(U32 groupCountX, U32 groupCountY, U32 groupCountZ)
@@ -345,18 +345,18 @@ inline void CommandBufferImpl::dispatchComputeInternal(U32 groupCountX, U32 grou
 
 	commandCommon();
 
-	flushBatches(CommandBufferCommandType::ANY_OTHER_COMMAND); // Do that before setting the markers
+	flushBatches(CommandBufferCommandType::kAnyOtherCommand); // Do that before setting the markers
 
 	getGrManagerImpl().beginMarker(m_handle, m_computeProg->getName(), Vec3(1.0f, 1.0f, 0.0f));
 
 	// Bind descriptors
-	for(U32 i = 0; i < MAX_DESCRIPTOR_SETS; ++i)
+	for(U32 i = 0; i < kMaxDescriptorSets; ++i)
 	{
 		if(m_computeProg->getReflectionInfo().m_descriptorSetMask.get(i))
 		{
 			DescriptorSet dset;
 			Bool dirty;
-			Array<PtrSize, MAX_BINDINGS_PER_DESCRIPTOR_SET> dynamicOffsetsPtrSize;
+			Array<PtrSize, kMaxBindingsPerDescriptorSet> dynamicOffsetsPtrSize;
 			U32 dynamicOffsetCount;
 			if(getGrManagerImpl().getDescriptorSetFactory().newDescriptorSet(m_alloc, m_dsetState[i], dset, dirty,
 																			 dynamicOffsetsPtrSize, dynamicOffsetCount))
@@ -367,7 +367,7 @@ inline void CommandBufferImpl::dispatchComputeInternal(U32 groupCountX, U32 grou
 			if(dirty)
 			{
 				// Vulkan should have had the dynamic offsets as VkDeviceSize and not U32. Workaround that.
-				Array<U32, MAX_BINDINGS_PER_DESCRIPTOR_SET> dynamicOffsets;
+				Array<U32, kMaxBindingsPerDescriptorSet> dynamicOffsets;
 				for(U32 i = 0; i < dynamicOffsetCount; ++i)
 				{
 					dynamicOffsets[i] = U32(dynamicOffsetsPtrSize[i]);
@@ -378,7 +378,7 @@ inline void CommandBufferImpl::dispatchComputeInternal(U32 groupCountX, U32 grou
 				ANKI_CMD(vkCmdBindDescriptorSets(m_handle, VK_PIPELINE_BIND_POINT_COMPUTE,
 												 m_computeProg->getPipelineLayout().getHandle(), i, 1, &dsHandle,
 												 dynamicOffsetCount, &dynamicOffsets[0]),
-						 ANY_OTHER_COMMAND);
+						 kAnyOtherCommand);
 			}
 		}
 	}
@@ -409,18 +409,18 @@ inline void CommandBufferImpl::traceRaysInternal(const BufferPtr& sbtBuffer, Ptr
 
 	commandCommon();
 
-	flushBatches(CommandBufferCommandType::ANY_OTHER_COMMAND); // Do that before setting the markers
+	flushBatches(CommandBufferCommandType::kAnyOtherCommand); // Do that before setting the markers
 
 	getGrManagerImpl().beginMarker(m_handle, m_rtProg->getName(), Vec3(0.0f, 0.0f, 1.0f));
 
 	// Bind descriptors
-	for(U32 i = 0; i < MAX_DESCRIPTOR_SETS; ++i)
+	for(U32 i = 0; i < kMaxDescriptorSets; ++i)
 	{
 		if(sprog.getReflectionInfo().m_descriptorSetMask.get(i))
 		{
 			DescriptorSet dset;
 			Bool dirty;
-			Array<PtrSize, MAX_BINDINGS_PER_DESCRIPTOR_SET> dynamicOffsetsPtrSize;
+			Array<PtrSize, kMaxBindingsPerDescriptorSet> dynamicOffsetsPtrSize;
 			U32 dynamicOffsetCount;
 			if(getGrManagerImpl().getDescriptorSetFactory().newDescriptorSet(m_alloc, m_dsetState[i], dset, dirty,
 																			 dynamicOffsetsPtrSize, dynamicOffsetCount))
@@ -431,7 +431,7 @@ inline void CommandBufferImpl::traceRaysInternal(const BufferPtr& sbtBuffer, Ptr
 			if(dirty)
 			{
 				// Vulkan should have had the dynamic offsets as VkDeviceSize and not U32. Workaround that.
-				Array<U32, MAX_BINDINGS_PER_DESCRIPTOR_SET> dynamicOffsets;
+				Array<U32, kMaxBindingsPerDescriptorSet> dynamicOffsets;
 				for(U32 i = 0; i < dynamicOffsetCount; ++i)
 				{
 					dynamicOffsets[i] = U32(dynamicOffsetsPtrSize[i]);
@@ -442,7 +442,7 @@ inline void CommandBufferImpl::traceRaysInternal(const BufferPtr& sbtBuffer, Ptr
 				ANKI_CMD(vkCmdBindDescriptorSets(m_handle, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR,
 												 sprog.getPipelineLayout().getHandle(), i, 1, &dsHandle,
 												 dynamicOffsetCount, &dynamicOffsets[0]),
-						 ANY_OTHER_COMMAND);
+						 kAnyOtherCommand);
 			}
 		}
 	}
@@ -483,14 +483,14 @@ inline void CommandBufferImpl::resetOcclusionQueryInternal(const OcclusionQueryP
 	ANKI_ASSERT(handle);
 
 #if ANKI_BATCH_COMMANDS
-	flushBatches(CommandBufferCommandType::RESET_QUERY);
+	flushBatches(CommandBufferCommandType::kResetQuery);
 
 	QueryResetAtom atom;
 	atom.m_pool = handle;
 	atom.m_queryIdx = idx;
 	m_queryResetAtoms.emplaceBack(m_alloc, atom);
 #else
-	ANKI_CMD(vkCmdResetQueryPool(m_handle, handle, idx, 1), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdResetQueryPool(m_handle, handle, idx, 1), kAnyOtherCommand);
 #endif
 
 	m_microCmdb->pushObjectRef(query);
@@ -504,7 +504,7 @@ inline void CommandBufferImpl::beginOcclusionQueryInternal(const OcclusionQueryP
 	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);
+	ANKI_CMD(vkCmdBeginQuery(m_handle, handle, idx, 0), kAnyOtherCommand);
 
 	m_microCmdb->pushObjectRef(query);
 }
@@ -517,7 +517,7 @@ inline void CommandBufferImpl::endOcclusionQueryInternal(const OcclusionQueryPtr
 	const U32 idx = static_cast<const OcclusionQueryImpl&>(*query).m_handle.getQueryIndex();
 	ANKI_ASSERT(handle);
 
-	ANKI_CMD(vkCmdEndQuery(m_handle, handle, idx), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdEndQuery(m_handle, handle, idx), kAnyOtherCommand);
 
 	m_microCmdb->pushObjectRef(query);
 }
@@ -531,14 +531,14 @@ inline void CommandBufferImpl::resetTimestampQueryInternal(const TimestampQueryP
 	ANKI_ASSERT(handle);
 
 #if ANKI_BATCH_COMMANDS
-	flushBatches(CommandBufferCommandType::RESET_QUERY);
+	flushBatches(CommandBufferCommandType::kResetQuery);
 
 	QueryResetAtom atom;
 	atom.m_pool = handle;
 	atom.m_queryIdx = idx;
 	m_queryResetAtoms.emplaceBack(m_alloc, atom);
 #else
-	ANKI_CMD(vkCmdResetQueryPool(m_handle, handle, idx, 1), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdResetQueryPool(m_handle, handle, idx, 1), kAnyOtherCommand);
 #endif
 
 	m_microCmdb->pushObjectRef(query);
@@ -551,7 +551,7 @@ inline void CommandBufferImpl::writeTimestampInternal(const TimestampQueryPtr& q
 	const VkQueryPool handle = static_cast<const TimestampQueryImpl&>(*query).m_handle.getQueryPool();
 	const U32 idx = static_cast<const TimestampQueryImpl&>(*query).m_handle.getQueryIndex();
 
-	ANKI_CMD(vkCmdWriteTimestamp(m_handle, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, handle, idx), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdWriteTimestamp(m_handle, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, handle, idx), kAnyOtherCommand);
 
 	m_microCmdb->pushObjectRef(query);
 }
@@ -572,7 +572,7 @@ inline void CommandBufferImpl::clearTextureViewInternal(const TextureViewPtr& te
 		VkImageSubresourceRange vkRange = view.getVkImageSubresourceRange();
 		ANKI_CMD(vkCmdClearColorImage(m_handle, tex.m_imageHandle, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &vclear, 1,
 									  &vkRange),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 	}
 	else
 	{
@@ -599,7 +599,7 @@ inline void CommandBufferImpl::pushSecondLevelCommandBufferInternal(const Comman
 	}
 
 #if ANKI_BATCH_COMMANDS
-	flushBatches(CommandBufferCommandType::PUSH_SECOND_LEVEL);
+	flushBatches(CommandBufferCommandType::kPushSecondLevel);
 
 	if(m_secondLevelAtoms.getSize() <= m_secondLevelAtomCount)
 	{
@@ -609,7 +609,7 @@ inline void CommandBufferImpl::pushSecondLevelCommandBufferInternal(const Comman
 	m_secondLevelAtoms[m_secondLevelAtomCount++] = static_cast<const CommandBufferImpl&>(*cmdb).m_handle;
 #else
 	ANKI_CMD(vkCmdExecuteCommands(m_handle, 1, &static_cast<const CommandBufferImpl&>(*cmdb).m_handle),
-			 ANY_OTHER_COMMAND);
+			 kAnyOtherCommand);
 #endif
 
 	++m_rpCommandCount;
@@ -642,17 +642,17 @@ inline void CommandBufferImpl::drawcallCommon()
 
 	if(stateDirty)
 	{
-		ANKI_CMD(vkCmdBindPipeline(m_handle, VK_PIPELINE_BIND_POINT_GRAPHICS, ppline.getHandle()), ANY_OTHER_COMMAND);
+		ANKI_CMD(vkCmdBindPipeline(m_handle, VK_PIPELINE_BIND_POINT_GRAPHICS, ppline.getHandle()), kAnyOtherCommand);
 	}
 
 	// Bind dsets
-	for(U32 i = 0; i < MAX_DESCRIPTOR_SETS; ++i)
+	for(U32 i = 0; i < kMaxDescriptorSets; ++i)
 	{
 		if(m_graphicsProg->getReflectionInfo().m_descriptorSetMask.get(i))
 		{
 			DescriptorSet dset;
 			Bool dirty;
-			Array<PtrSize, MAX_BINDINGS_PER_DESCRIPTOR_SET> dynamicOffsetsPtrSize;
+			Array<PtrSize, kMaxBindingsPerDescriptorSet> dynamicOffsetsPtrSize;
 			U32 dynamicOffsetCount;
 			if(getGrManagerImpl().getDescriptorSetFactory().newDescriptorSet(m_alloc, m_dsetState[i], dset, dirty,
 																			 dynamicOffsetsPtrSize, dynamicOffsetCount))
@@ -663,7 +663,7 @@ inline void CommandBufferImpl::drawcallCommon()
 			if(dirty)
 			{
 				// Vulkan should have had the dynamic offsets as VkDeviceSize and not U32. Workaround that.
-				Array<U32, MAX_BINDINGS_PER_DESCRIPTOR_SET> dynamicOffsets;
+				Array<U32, kMaxBindingsPerDescriptorSet> dynamicOffsets;
 				for(U32 i = 0; i < dynamicOffsetCount; ++i)
 				{
 					dynamicOffsets[i] = U32(dynamicOffsetsPtrSize[i]);
@@ -674,7 +674,7 @@ inline void CommandBufferImpl::drawcallCommon()
 				ANKI_CMD(vkCmdBindDescriptorSets(m_handle, VK_PIPELINE_BIND_POINT_GRAPHICS,
 												 m_graphicsProg->getPipelineLayout().getHandle(), i, 1, &dsHandle,
 												 dynamicOffsetCount, &dynamicOffsets[0]),
-						 ANY_OTHER_COMMAND);
+						 kAnyOtherCommand);
 			}
 		}
 	}
@@ -692,7 +692,7 @@ inline void CommandBufferImpl::drawcallCommon()
 		// Additional optimization
 		if(memcmp(&vp, &m_lastViewport, sizeof(vp)) != 0)
 		{
-			ANKI_CMD(vkCmdSetViewport(m_handle, 0, 1, &vp), ANY_OTHER_COMMAND);
+			ANKI_CMD(vkCmdSetViewport(m_handle, 0, 1, &vp), kAnyOtherCommand);
 			m_lastViewport = vp;
 		}
 
@@ -712,7 +712,7 @@ inline void CommandBufferImpl::drawcallCommon()
 		// Additional optimization
 		if(memcmp(&scissor, &m_lastScissor, sizeof(scissor)) != 0)
 		{
-			ANKI_CMD(vkCmdSetScissor(m_handle, 0, 1, &scissor), ANY_OTHER_COMMAND);
+			ANKI_CMD(vkCmdSetScissor(m_handle, 0, 1, &scissor), kAnyOtherCommand);
 			m_lastScissor = scissor;
 		}
 
@@ -771,21 +771,21 @@ inline void CommandBufferImpl::flushBatches(CommandBufferCommandType type)
 	{
 		switch(m_lastCmdType)
 		{
-		case CommandBufferCommandType::SET_BARRIER:
+		case CommandBufferCommandType::kSetBarrier:
 			flushBarriers();
 			break;
-		case CommandBufferCommandType::RESET_QUERY:
+		case CommandBufferCommandType::kResetQuery:
 			flushQueryResets();
 			break;
-		case CommandBufferCommandType::WRITE_QUERY_RESULT:
+		case CommandBufferCommandType::kWriteQueryResult:
 			flushWriteQueryResults();
 			break;
-		case CommandBufferCommandType::PUSH_SECOND_LEVEL:
+		case CommandBufferCommandType::kPushSecondLevel:
 			ANKI_ASSERT(m_secondLevelAtomCount > 0);
 			vkCmdExecuteCommands(m_handle, m_secondLevelAtomCount, &m_secondLevelAtoms[0]);
 			m_secondLevelAtomCount = 0;
 			break;
-		case CommandBufferCommandType::ANY_OTHER_COMMAND:
+		case CommandBufferCommandType::kAnyOtherCommand:
 			break;
 		default:
 			ANKI_ASSERT(0);
@@ -810,7 +810,7 @@ inline void CommandBufferImpl::fillBufferInternal(const BufferPtr& buff, PtrSize
 	ANKI_ASSERT(offset + size <= impl.getActualSize());
 	ANKI_ASSERT((size % 4) == 0 && "Should be multiple of 4");
 
-	ANKI_CMD(vkCmdFillBuffer(m_handle, impl.getHandle(), offset, size, value), ANY_OTHER_COMMAND);
+	ANKI_CMD(vkCmdFillBuffer(m_handle, impl.getHandle(), offset, size, value), kAnyOtherCommand);
 
 	m_microCmdb->pushObjectRef(buff);
 }
@@ -829,7 +829,7 @@ inline void CommandBufferImpl::writeOcclusionQueryResultToBufferInternal(const O
 	const OcclusionQueryImpl& q = static_cast<const OcclusionQueryImpl&>(*query);
 
 #if ANKI_BATCH_COMMANDS
-	flushBatches(CommandBufferCommandType::WRITE_QUERY_RESULT);
+	flushBatches(CommandBufferCommandType::kWriteQueryResult);
 
 	WriteQueryAtom atom;
 	atom.m_pool = q.m_handle.getQueryPool();
@@ -841,7 +841,7 @@ inline void CommandBufferImpl::writeOcclusionQueryResultToBufferInternal(const O
 #else
 	ANKI_CMD(vkCmdCopyQueryPoolResults(m_handle, q.m_handle.m_pool, q.m_handle.m_queryIndex, 1, impl.getHandle(),
 									   offset, sizeof(U32), VK_QUERY_RESULT_PARTIAL_BIT),
-			 ANY_OTHER_COMMAND);
+			 kAnyOtherCommand);
 #endif
 
 	m_microCmdb->pushObjectRef(query);
@@ -869,7 +869,7 @@ inline void CommandBufferImpl::bindShaderProgramInternal(const ShaderProgramPtr&
 
 		// Bind the pipeline now
 		ANKI_CMD(vkCmdBindPipeline(m_handle, VK_PIPELINE_BIND_POINT_COMPUTE, impl.getComputePipelineHandle()),
-				 ANY_OTHER_COMMAND);
+				 kAnyOtherCommand);
 	}
 	else
 	{
@@ -881,10 +881,10 @@ inline void CommandBufferImpl::bindShaderProgramInternal(const ShaderProgramPtr&
 		// Bind now
 		ANKI_CMD(
 			vkCmdBindPipeline(m_handle, VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR, impl.getRayTracingPipelineHandle()),
-			ANY_OTHER_COMMAND);
+			kAnyOtherCommand);
 	}
 
-	for(U32 i = 0; i < MAX_DESCRIPTOR_SETS; ++i)
+	for(U32 i = 0; i < kMaxDescriptorSets; ++i)
 	{
 		if(impl.getReflectionInfo().m_descriptorSetMask.get(i))
 		{
@@ -922,7 +922,7 @@ inline void CommandBufferImpl::copyBufferToBufferInternal(const BufferPtr& src,
 
 	ANKI_CMD(vkCmdCopyBuffer(m_handle, static_cast<const BufferImpl&>(*src).getHandle(),
 							 static_cast<const BufferImpl&>(*dst).getHandle(), 1, &region),
-			 ANY_OTHER_COMMAND);
+			 kAnyOtherCommand);
 
 	m_microCmdb->pushObjectRef(src);
 	m_microCmdb->pushObjectRef(dst);
@@ -943,7 +943,7 @@ inline void CommandBufferImpl::setPushConstantsInternal(const void* data, U32 da
 	commandCommon();
 
 	ANKI_CMD(vkCmdPushConstants(m_handle, prog.getPipelineLayout().getHandle(), VK_SHADER_STAGE_ALL, 0, dataSize, data),
-			 ANY_OTHER_COMMAND);
+			 kAnyOtherCommand);
 
 #if ANKI_EXTRA_CHECKS
 	m_setPushConstantsSize = dataSize;
@@ -954,7 +954,7 @@ inline void CommandBufferImpl::setRasterizationOrderInternal(RasterizationOrder
 {
 	commandCommon();
 
-	if(!!(getGrManagerImpl().getExtensions() & VulkanExtensions::AMD_RASTERIZATION_ORDER))
+	if(!!(getGrManagerImpl().getExtensions() & VulkanExtensions::kAMD_rasterization_order))
 	{
 		m_state.setRasterizationOrder(order);
 	}

AnKi/Gr/Vulkan/Common.cpp

@@ -313,12 +313,12 @@ VkBufferUsageFlags convertBufferUsageBit(BufferUsageBit usageMask)
 		out |= VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR;
 	}
 
-	if(!!(usageMask & PrivateBufferUsageBit::ACCELERATION_STRUCTURE_BUILD_SCRATCH))
+	if(!!(usageMask & PrivateBufferUsageBit::kAccelerationStructureBuildScratch))
 	{
 		out |= VK_BUFFER_USAGE_STORAGE_BUFFER_BIT; // Spec says that this will be enough
 	}
 
-	if(!!(usageMask & PrivateBufferUsageBit::ACCELERATION_STRUCTURE))
+	if(!!(usageMask & PrivateBufferUsageBit::kAccelerationStructure))
 	{
 		out |= VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR;
 	}

AnKi/Gr/Vulkan/Common.h

@@ -47,58 +47,58 @@ class GrManagerImpl;
 
 enum class DescriptorType : U8
 {
-	COMBINED_TEXTURE_SAMPLER,
-	TEXTURE,
-	SAMPLER,
-	UNIFORM_BUFFER,
-	STORAGE_BUFFER,
-	IMAGE,
-	READ_TEXTURE_BUFFER,
-	READ_WRITE_TEXTURE_BUFFER,
-	ACCELERATION_STRUCTURE,
-
-	COUNT
+	kCombinedTextureSampler,
+	kTexture,
+	kSampler,
+	kUniformBuffer,
+	kStorageBuffer,
+	kImage,
+	kReadTextureBuffer,
+	kReadWriteTextureBuffer,
+	kAccelerationStructure,
+
+	kCount
 };
 
 enum class VulkanExtensions : U32
 {
-	NONE = 0,
-	KHR_XCB_SURFACE = 1 << 1,
-	KHR_XLIB_SURFACE = 1 << 2,
-	KHR_WIN32_SURFACE = 1 << 3,
-	KHR_ANDROID_SURFACE = 1 << 4,
-	EXT_HEADLESS_SURFACE = 1 << 5,
-	KHR_SWAPCHAIN = 1 << 6,
-	KHR_SURFACE = 1 << 7,
-	EXT_DEBUG_UTILS = 1 << 8,
-	AMD_SHADER_INFO = 1 << 9,
-	AMD_RASTERIZATION_ORDER = 1 << 10,
-	KHR_RAY_TRACING = 1 << 11,
-	KHR_PIPELINE_EXECUTABLE_PROPERTIES = 1 << 12,
-	EXT_DESCRIPTOR_INDEXING = 1 << 13,
-	KHR_BUFFER_DEVICE_ADDRESS = 1 << 14,
-	EXT_SCALAR_BLOCK_LAYOUT = 1 << 15,
-	KHR_TIMELINE_SEMAPHORE = 1 << 16,
-	KHR_SHADER_FLOAT16_INT8 = 1 << 17,
-	KHR_SHADER_ATOMIC_INT64 = 1 << 18,
-	KHR_SPIRV_1_4 = 1 << 19,
-	KHR_SHADER_FLOAT_CONTROLS = 1 << 20,
-	EXT_SAMPLER_FILTER_MIN_MAX = 1 << 21,
-	KHR_CREATE_RENDERPASS_2 = 1 << 22,
-	KHR_FRAGMENT_SHADING_RATE = 1 << 23,
-	EXT_ASTC_DECODE_MODE = 1 << 24,
-	EXT_TEXTURE_COMPRESSION_ASTC_HDR = 1 << 25,
-	NVX_BINARY_IMPORT = 1 << 26,
-	NVX_IMAGE_VIEW_HANDLE = 1 << 27,
-	KHR_PUSH_DESCRIPTOR = 1 << 28,
-	MAINTENANCE_4 = 1 << 29,
+	kNone = 0,
+	kKHR_xcb_surface = 1 << 1,
+	kKHR_xlib_surface = 1 << 2,
+	kKHR_win32_surface = 1 << 3,
+	kKHR_android_surface = 1 << 4,
+	kEXT_headless_surface = 1 << 5,
+	kKHR_swapchain = 1 << 6,
+	kKHR_surface = 1 << 7,
+	kEXT_debug_utils = 1 << 8,
+	kAMD_shader_info = 1 << 9,
+	kAMD_rasterization_order = 1 << 10,
+	kKHR_ray_tracing = 1 << 11,
+	kKHR_pipeline_executable_properties = 1 << 12,
+	kEXT_descriptor_indexing = 1 << 13,
+	kKHR_buffer_device_address = 1 << 14,
+	kEXT_scalar_block_layout = 1 << 15,
+	kKHR_timeline_semaphore = 1 << 16,
+	kKHR_shader_float16_int8 = 1 << 17,
+	kKHR_shader_atomic_int64 = 1 << 18,
+	kKHR_spirv_1_4 = 1 << 19,
+	kKHR_shader_float_controls = 1 << 20,
+	kKHR_sampler_filter_min_max = 1 << 21,
+	kKHR_create_renderpass_2 = 1 << 22,
+	kKHR_fragment_shading_rate = 1 << 23,
+	kEXT_astc_decode_mode = 1 << 24,
+	kEXT_texture_compression_astc_hdr = 1 << 25,
+	kNVX_binary_import = 1 << 26,
+	kNVX_image_view_handle = 1 << 27,
+	kKHR_push_descriptor = 1 << 28,
+	kKHR_maintenance_4 = 1 << 29,
 };
 ANKI_ENUM_ALLOW_NUMERIC_OPERATIONS(VulkanExtensions)
 
 enum class VulkanQueueType : U8
 {
-	GENERAL,
-	COMPUTE,
+	kGeneral,
+	kCompute,
 
 	kCount,
 	kFirst = 0
@@ -109,25 +109,25 @@ using VulkanQueueFamilies = Array<U32, U32(VulkanQueueType::kCount)>;
 
 /// @name Constants
 /// @{
-constexpr U DESCRIPTOR_POOL_INITIAL_SIZE = 64;
-constexpr F32 DESCRIPTOR_POOL_SIZE_SCALE = 2.0f;
-constexpr U DESCRIPTOR_FRAME_BUFFERING = 60 * 5; ///< How many frames worth of descriptors to buffer.
+constexpr U32 kDescriptorPoolInitialSize = 64;
+constexpr F32 kDescriptorPoolSizeScale = 2.0f;
+constexpr U32 kDescriptorBufferedFrameCount = 60 * 5; ///< How many frames worth of descriptors to buffer.
 
 /// There is no need to ask for a fence or a semaphore to be waited for more than 10 seconds. The GPU will timeout
 /// anyway.
-constexpr Second MAX_FENCE_OR_SEMAPHORE_WAIT_TIME = 10.0;
+constexpr Second kMaxFenceOrSemaphoreWaitTime = 10.0;
 /// @}
 
 /// Some internal buffer usage flags.
 class PrivateBufferUsageBit
 {
 public:
-	static constexpr BufferUsageBit ACCELERATION_STRUCTURE_BUILD_SCRATCH = BufferUsageBit(1ull << 29ull);
-	static constexpr BufferUsageBit ACCELERATION_STRUCTURE = static_cast<BufferUsageBit>(1ull << 30ull);
+	static constexpr BufferUsageBit kAccelerationStructureBuildScratch = BufferUsageBit(1ull << 29ull);
+	static constexpr BufferUsageBit kAccelerationStructure = static_cast<BufferUsageBit>(1ull << 30ull);
 
-	static constexpr BufferUsageBit ALL_PRIVATE = ACCELERATION_STRUCTURE_BUILD_SCRATCH | ACCELERATION_STRUCTURE;
+	static constexpr BufferUsageBit kAllPrivate = kAccelerationStructureBuildScratch | kAccelerationStructure;
 };
-static_assert(!(BufferUsageBit::kAll & PrivateBufferUsageBit::ALL_PRIVATE), "Update the bits in PrivateBufferUsageBit");
+static_assert(!(BufferUsageBit::kAll & PrivateBufferUsageBit::kAllPrivate), "Update the bits in PrivateBufferUsageBit");
 
 /// Check if a vulkan function failed. It will abort on failure.
 #define ANKI_VK_CHECKF(x) \
@@ -265,31 +265,31 @@ static_assert(!(BufferUsageBit::kAll & PrivateBufferUsageBit::ALL_PRIVATE), "Upd
 	VkDescriptorType out;
 	switch(ak)
 	{
-	case DescriptorType::COMBINED_TEXTURE_SAMPLER:
+	case DescriptorType::kCombinedTextureSampler:
 		out = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER;
 		break;
-	case DescriptorType::TEXTURE:
+	case DescriptorType::kTexture:
 		out = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
 		break;
-	case DescriptorType::SAMPLER:
+	case DescriptorType::kSampler:
 		out = VK_DESCRIPTOR_TYPE_SAMPLER;
 		break;
-	case DescriptorType::UNIFORM_BUFFER:
+	case DescriptorType::kUniformBuffer:
 		out = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC;
 		break;
-	case DescriptorType::READ_TEXTURE_BUFFER:
+	case DescriptorType::kReadTextureBuffer:
 		out = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
 		break;
-	case DescriptorType::READ_WRITE_TEXTURE_BUFFER:
+	case DescriptorType::kReadWriteTextureBuffer:
 		out = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
 		break;
-	case DescriptorType::STORAGE_BUFFER:
+	case DescriptorType::kStorageBuffer:
 		out = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC;
 		break;
-	case DescriptorType::IMAGE:
+	case DescriptorType::kImage:
 		out = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
 		break;
-	case DescriptorType::ACCELERATION_STRUCTURE:
+	case DescriptorType::kAccelerationStructure:
 		out = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR;
 		break;
 	default:

AnKi/Gr/Vulkan/DescriptorSet.cpp

@@ -102,7 +102,7 @@ public:
 	Error init();
 	Error createNewPool();
 
-	Error getOrCreateSet(U64 hash, const Array<AnyBindingExtended, MAX_BINDINGS_PER_DESCRIPTOR_SET>& bindings,
+	Error getOrCreateSet(U64 hash, const Array<AnyBindingExtended, kMaxBindingsPerDescriptorSet>& bindings,
 						 StackAllocator<U8>& tmpAlloc, const DS*& out)
 	{
 		out = tryFindSet(hash);
@@ -125,9 +125,9 @@ private:
 	HashMap<U64, DS*> m_hashmap;
 
 	[[nodiscard]] const DS* tryFindSet(U64 hash);
-	Error newSet(U64 hash, const Array<AnyBindingExtended, MAX_BINDINGS_PER_DESCRIPTOR_SET>& bindings,
+	Error newSet(U64 hash, const Array<AnyBindingExtended, kMaxBindingsPerDescriptorSet>& bindings,
 				 StackAllocator<U8>& tmpAlloc, const DS*& out);
-	void writeSet(const Array<AnyBindingExtended, MAX_BINDINGS_PER_DESCRIPTOR_SET>& bindings, const DS& set,
+	void writeSet(const Array<AnyBindingExtended, kMaxBindingsPerDescriptorSet>& bindings, const DS& set,
 				  StackAllocator<U8>& tmpAlloc);
 };
 
@@ -145,15 +145,15 @@ public:
 
 	U64 m_hash = 0; ///< Layout hash.
 	VkDescriptorSetLayout m_layoutHandle = {};
-	BitSet<MAX_BINDINGS_PER_DESCRIPTOR_SET, U32> m_activeBindings = {false};
-	Array<U32, MAX_BINDINGS_PER_DESCRIPTOR_SET> m_bindingArraySize = {};
-	Array<DescriptorType, MAX_BINDINGS_PER_DESCRIPTOR_SET> m_bindingType = {};
+	BitSet<kMaxBindingsPerDescriptorSet, U32> m_activeBindings = {false};
+	Array<U32, kMaxBindingsPerDescriptorSet> m_bindingArraySize = {};
+	Array<DescriptorType, kMaxBindingsPerDescriptorSet> m_bindingType = {};
 	U32 m_minBinding = kMaxU32;
 	U32 m_maxBinding = 0;
 	U32 m_index = 0; ///< Index in DescriptorSetFactory::m_caches
 
 	// Cache the create info
-	Array<VkDescriptorPoolSize, U(DescriptorType::COUNT)> m_poolSizesCreateInf = {};
+	Array<VkDescriptorPoolSize, U(DescriptorType::kCount)> m_poolSizesCreateInf = {};
 	VkDescriptorPoolCreateInfo m_poolCreateInf = {};
 
 	DSLayoutCacheEntry(DescriptorSetFactory* factory, U32 index)
@@ -394,12 +394,12 @@ Error DescriptorSetFactory::DSAllocator::init()
 
 Error DescriptorSetFactory::DSAllocator::createNewPool()
 {
-	m_lastPoolDSCount = (m_lastPoolDSCount != 0) ? U32(F32(m_lastPoolDSCount) * DESCRIPTOR_POOL_SIZE_SCALE)
-												 : DESCRIPTOR_POOL_INITIAL_SIZE;
+	m_lastPoolDSCount =
+		(m_lastPoolDSCount != 0) ? U32(F32(m_lastPoolDSCount) * kDescriptorPoolSizeScale) : kDescriptorPoolInitialSize;
 	m_lastPoolFreeDSCount = m_lastPoolDSCount;
 
 	// Set the create info
-	Array<VkDescriptorPoolSize, U(DescriptorType::COUNT)> poolSizes;
+	Array<VkDescriptorPoolSize, U(DescriptorType::kCount)> poolSizes;
 	memcpy(&poolSizes[0], &m_layoutEntry->m_poolSizesCreateInf[0],
 		   sizeof(poolSizes[0]) * m_layoutEntry->m_poolCreateInf.poolSizeCount);
 
@@ -447,9 +447,9 @@ const DS* DescriptorSetFactory::DSAllocator::tryFindSet(U64 hash)
 	}
 }
 
-Error DescriptorSetFactory::DSAllocator::newSet(
-	U64 hash, const Array<AnyBindingExtended, MAX_BINDINGS_PER_DESCRIPTOR_SET>& bindings, StackAllocator<U8>& tmpAlloc,
-	const DS*& out_)
+Error DescriptorSetFactory::DSAllocator::newSet(U64 hash,
+												const Array<AnyBindingExtended, kMaxBindingsPerDescriptorSet>& bindings,
+												StackAllocator<U8>& tmpAlloc, const DS*& out_)
 {
 	DS* out = nullptr;
 
@@ -461,7 +461,7 @@ Error DescriptorSetFactory::DSAllocator::newSet(
 	{
 		DS* set = &(*it);
 		U64 frameDiff = crntFrame - set->m_lastFrameUsed;
-		if(frameDiff > DESCRIPTOR_FRAME_BUFFERING)
+		if(frameDiff > kDescriptorBufferedFrameCount)
 		{
 			// Found something, recycle
 			auto it2 = m_hashmap.find(set->m_hash);
@@ -520,7 +520,7 @@ Error DescriptorSetFactory::DSAllocator::newSet(
 }
 
 void DescriptorSetFactory::DSAllocator::writeSet(
-	const Array<AnyBindingExtended, MAX_BINDINGS_PER_DESCRIPTOR_SET>& bindings, const DS& set,
+	const Array<AnyBindingExtended, kMaxBindingsPerDescriptorSet>& bindings, const DS& set,
 	StackAllocator<U8>& tmpAlloc)
 {
 	DynamicArrayAuto<VkWriteDescriptorSet> writeInfos(tmpAlloc);
@@ -542,7 +542,7 @@ void DescriptorSetFactory::DSAllocator::writeSet(
 
 				switch(b.m_type)
 				{
-				case DescriptorType::COMBINED_TEXTURE_SAMPLER:
+				case DescriptorType::kCombinedTextureSampler:
 				{
 					VkDescriptorImageInfo& info = *texInfos.emplaceBack();
 					info.sampler = b.m_texAndSampler.m_samplerHandle;
@@ -550,7 +550,7 @@ void DescriptorSetFactory::DSAllocator::writeSet(
 					info.imageLayout = b.m_texAndSampler.m_layout;
 					break;
 				}
-				case DescriptorType::TEXTURE:
+				case DescriptorType::kTexture:
 				{
 					VkDescriptorImageInfo& info = *texInfos.emplaceBack();
 					info.sampler = VK_NULL_HANDLE;
@@ -558,7 +558,7 @@ void DescriptorSetFactory::DSAllocator::writeSet(
 					info.imageLayout = b.m_tex.m_layout;
 					break;
 				}
-				case DescriptorType::SAMPLER:
+				case DescriptorType::kSampler:
 				{
 					VkDescriptorImageInfo& info = *texInfos.emplaceBack();
 					info.sampler = b.m_sampler.m_samplerHandle;
@@ -566,8 +566,8 @@ void DescriptorSetFactory::DSAllocator::writeSet(
 					info.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED;
 					break;
 				}
-				case DescriptorType::UNIFORM_BUFFER:
-				case DescriptorType::STORAGE_BUFFER:
+				case DescriptorType::kUniformBuffer:
+				case DescriptorType::kStorageBuffer:
 				{
 					VkDescriptorBufferInfo& info = *buffInfos.emplaceBack();
 					info.buffer = b.m_buff.m_buffHandle;
@@ -575,14 +575,14 @@ void DescriptorSetFactory::DSAllocator::writeSet(
 					info.range = (b.m_buff.m_range == kMaxPtrSize) ? VK_WHOLE_SIZE : b.m_buff.m_range;
 					break;
 				}
-				case DescriptorType::READ_TEXTURE_BUFFER:
-				case DescriptorType::READ_WRITE_TEXTURE_BUFFER:
+				case DescriptorType::kReadTextureBuffer:
+				case DescriptorType::kReadWriteTextureBuffer:
 				{
 					VkBufferView& view = *bufferViews.emplaceBack();
 					view = b.m_textureBuffer.m_buffView;
 					break;
 				}
-				case DescriptorType::IMAGE:
+				case DescriptorType::kImage:
 				{
 					VkDescriptorImageInfo& info = *texInfos.emplaceBack();
 					info.sampler = VK_NULL_HANDLE;
@@ -590,7 +590,7 @@ void DescriptorSetFactory::DSAllocator::writeSet(
 					info.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
 					break;
 				}
-				case DescriptorType::ACCELERATION_STRUCTURE:
+				case DescriptorType::kAccelerationStructure:
 				{
 					VkWriteDescriptorSetAccelerationStructureKHR& info = *asInfos.emplaceBack();
 					info.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR;
@@ -634,21 +634,21 @@ void DescriptorSetFactory::DSAllocator::writeSet(
 
 				switch(b.m_type)
 				{
-				case DescriptorType::COMBINED_TEXTURE_SAMPLER:
-				case DescriptorType::TEXTURE:
-				case DescriptorType::SAMPLER:
-				case DescriptorType::IMAGE:
+				case DescriptorType::kCombinedTextureSampler:
+				case DescriptorType::kTexture:
+				case DescriptorType::kSampler:
+				case DescriptorType::kImage:
 					writeInfo.pImageInfo = &texInfos[texCounter++];
 					break;
-				case DescriptorType::UNIFORM_BUFFER:
-				case DescriptorType::STORAGE_BUFFER:
+				case DescriptorType::kUniformBuffer:
+				case DescriptorType::kStorageBuffer:
 					writeInfo.pBufferInfo = &buffInfos[buffCounter++];
 					break;
-				case DescriptorType::READ_TEXTURE_BUFFER:
-				case DescriptorType::READ_WRITE_TEXTURE_BUFFER:
+				case DescriptorType::kReadTextureBuffer:
+				case DescriptorType::kReadWriteTextureBuffer:
 					writeInfo.pTexelBufferView = &bufferViews[buffViewsCounter++];
 					break;
-				case DescriptorType::ACCELERATION_STRUCTURE:
+				case DescriptorType::kAccelerationStructure:
 					writeInfo.pNext = &asInfos[asCounter++];
 					break;
 				default:
@@ -681,7 +681,7 @@ Error DSLayoutCacheEntry::init(const DescriptorBinding* bindings, U32 bindingCou
 	m_hash = hash;
 
 	// Create the VK layout
-	Array<VkDescriptorSetLayoutBinding, MAX_BINDINGS_PER_DESCRIPTOR_SET> vkBindings;
+	Array<VkDescriptorSetLayoutBinding, kMaxBindingsPerDescriptorSet> vkBindings;
 	VkDescriptorSetLayoutCreateInfo ci = {};
 	ci.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
 
@@ -788,7 +788,7 @@ Error DSLayoutCacheEntry::getOrCreateDSAllocator(DescriptorSetFactory::DSAllocat
 
 AnyBinding& DescriptorSetState::getBindingToPopulate(U32 bindingIdx, U32 arrayIdx)
 {
-	ANKI_ASSERT(bindingIdx < MAX_BINDINGS_PER_DESCRIPTOR_SET);
+	ANKI_ASSERT(bindingIdx < kMaxBindingsPerDescriptorSet);
 
 	AnyBindingExtended& extended = m_bindings[bindingIdx];
 	AnyBinding* out;
@@ -836,7 +836,7 @@ AnyBinding& DescriptorSetState::getBindingToPopulate(U32 bindingIdx, U32 arrayId
 	return *out;
 }
 
-void DescriptorSetState::flush(U64& hash, Array<PtrSize, MAX_BINDINGS_PER_DESCRIPTOR_SET>& dynamicOffsets,
+void DescriptorSetState::flush(U64& hash, Array<PtrSize, kMaxBindingsPerDescriptorSet>& dynamicOffsets,
 							   U32& dynamicOffsetCount, Bool& bindlessDSet)
 {
 	// Set some values
@@ -867,7 +867,7 @@ void DescriptorSetState::flush(U64& hash, Array<PtrSize, MAX_BINDINGS_PER_DESCRI
 		Bool dynamicOffsetsDirty = false;
 
 		// Compute the hash
-		Array<U64, MAX_BINDINGS_PER_DESCRIPTOR_SET * 2 * 2> toHash;
+		Array<U64, kMaxBindingsPerDescriptorSet * 2 * 2> toHash;
 		U toHashCount = 0;
 
 		const U minBinding = entry.m_minBinding;
@@ -899,46 +899,46 @@ void DescriptorSetState::flush(U64& hash, Array<PtrSize, MAX_BINDINGS_PER_DESCRI
 
 					switch(entry.m_bindingType[i])
 					{
-					case DescriptorType::COMBINED_TEXTURE_SAMPLER:
-						ANKI_ASSERT(anyBinding.m_type == DescriptorType::COMBINED_TEXTURE_SAMPLER
+					case DescriptorType::kCombinedTextureSampler:
+						ANKI_ASSERT(anyBinding.m_type == DescriptorType::kCombinedTextureSampler
 									&& "Have bound the wrong type");
 						toHash[toHashCount++] = anyBinding.m_uuids[1];
 						toHash[toHashCount++] = U64(anyBinding.m_texAndSampler.m_layout);
 						break;
-					case DescriptorType::TEXTURE:
-						ANKI_ASSERT(anyBinding.m_type == DescriptorType::TEXTURE && "Have bound the wrong type");
+					case DescriptorType::kTexture:
+						ANKI_ASSERT(anyBinding.m_type == DescriptorType::kTexture && "Have bound the wrong type");
 						toHash[toHashCount++] = U64(anyBinding.m_tex.m_layout);
 						break;
-					case DescriptorType::SAMPLER:
-						ANKI_ASSERT(anyBinding.m_type == DescriptorType::SAMPLER && "Have bound the wrong type");
+					case DescriptorType::kSampler:
+						ANKI_ASSERT(anyBinding.m_type == DescriptorType::kSampler && "Have bound the wrong type");
 						break;
-					case DescriptorType::UNIFORM_BUFFER:
-						ANKI_ASSERT(anyBinding.m_type == DescriptorType::UNIFORM_BUFFER && "Have bound the wrong type");
+					case DescriptorType::kUniformBuffer:
+						ANKI_ASSERT(anyBinding.m_type == DescriptorType::kUniformBuffer && "Have bound the wrong type");
 						toHash[toHashCount++] = anyBinding.m_buff.m_range;
 						dynamicOffsets[dynamicOffsetCount++] = anyBinding.m_buff.m_offset;
 						dynamicOffsetsDirty = dynamicOffsetsDirty || crntBindingDirty;
 						break;
-					case DescriptorType::STORAGE_BUFFER:
-						ANKI_ASSERT(anyBinding.m_type == DescriptorType::STORAGE_BUFFER && "Have bound the wrong type");
+					case DescriptorType::kStorageBuffer:
+						ANKI_ASSERT(anyBinding.m_type == DescriptorType::kStorageBuffer && "Have bound the wrong type");
 						toHash[toHashCount++] = anyBinding.m_buff.m_range;
 						dynamicOffsets[dynamicOffsetCount++] = anyBinding.m_buff.m_offset;
 						dynamicOffsetsDirty = dynamicOffsetsDirty || crntBindingDirty;
 						break;
-					case DescriptorType::READ_TEXTURE_BUFFER:
-						ANKI_ASSERT(anyBinding.m_type == DescriptorType::READ_TEXTURE_BUFFER
+					case DescriptorType::kReadTextureBuffer:
+						ANKI_ASSERT(anyBinding.m_type == DescriptorType::kReadTextureBuffer
 									&& "Have bound the wrong type");
 						toHash[toHashCount++] = anyBinding.m_uuids[1];
 						break;
-					case DescriptorType::READ_WRITE_TEXTURE_BUFFER:
-						ANKI_ASSERT(anyBinding.m_type == DescriptorType::READ_WRITE_TEXTURE_BUFFER
+					case DescriptorType::kReadWriteTextureBuffer:
+						ANKI_ASSERT(anyBinding.m_type == DescriptorType::kReadWriteTextureBuffer
 									&& "Have bound the wrong type");
 						toHash[toHashCount++] = anyBinding.m_uuids[1];
 						break;
-					case DescriptorType::IMAGE:
-						ANKI_ASSERT(anyBinding.m_type == DescriptorType::IMAGE && "Have bound the wrong type");
+					case DescriptorType::kImage:
+						ANKI_ASSERT(anyBinding.m_type == DescriptorType::kImage && "Have bound the wrong type");
 						break;
-					case DescriptorType::ACCELERATION_STRUCTURE:
-						ANKI_ASSERT(anyBinding.m_type == DescriptorType::ACCELERATION_STRUCTURE
+					case DescriptorType::kAccelerationStructure:
+						ANKI_ASSERT(anyBinding.m_type == DescriptorType::kAccelerationStructure
 									&& "Have bound the wrong type");
 						break;
 					default:
@@ -1028,7 +1028,7 @@ void DescriptorSetFactory::destroy()
 Error DescriptorSetFactory::newDescriptorSetLayout(const DescriptorSetLayoutInitInfo& init, DescriptorSetLayout& layout)
 {
 	// Compute the hash for the layout
-	Array<DescriptorBinding, MAX_BINDINGS_PER_DESCRIPTOR_SET> bindings;
+	Array<DescriptorBinding, kMaxBindingsPerDescriptorSet> bindings;
 	const U32 bindingCount = init.m_bindings.getSize();
 	U64 hash;
 
@@ -1056,12 +1056,12 @@ Error DescriptorSetFactory::newDescriptorSetLayout(const DescriptorSetLayoutInit
 		for(U32 i = 0; i < bindingCount; ++i)
 		{
 			const DescriptorBinding& binding = bindings[i];
-			if(binding.m_binding == 0 && binding.m_type == DescriptorType::TEXTURE
+			if(binding.m_binding == 0 && binding.m_type == DescriptorType::kTexture
 			   && binding.m_arraySize == m_bindlessTextureCount)
 			{
 				// All good
 			}
-			else if(binding.m_binding == 1 && binding.m_type == DescriptorType::READ_TEXTURE_BUFFER
+			else if(binding.m_binding == 1 && binding.m_type == DescriptorType::kReadTextureBuffer
 					&& binding.m_arraySize == m_bindlessUniformTexelBufferCount)
 			{
 				// All good
@@ -1113,7 +1113,7 @@ Error DescriptorSetFactory::newDescriptorSetLayout(const DescriptorSetLayoutInit
 
 Error DescriptorSetFactory::newDescriptorSet(StackAllocator<U8>& tmpAlloc, DescriptorSetState& state,
 											 DescriptorSet& set, Bool& dirty,
-											 Array<PtrSize, MAX_BINDINGS_PER_DESCRIPTOR_SET>& dynamicOffsets,
+											 Array<PtrSize, kMaxBindingsPerDescriptorSet>& dynamicOffsets,
 											 U32& dynamicOffsetCount)
 {
 	ANKI_TRACE_SCOPED_EVENT(VK_DESCRIPTOR_SET_GET_OR_CREATE);

AnKi/Gr/Vulkan/DescriptorSet.h

@@ -27,7 +27,7 @@ class alignas(8) DescriptorBinding
 public:
 	U32 m_arraySize = 0;
 	ShaderTypeBit m_stageMask = ShaderTypeBit::kNone;
-	DescriptorType m_type = DescriptorType::COUNT;
+	DescriptorType m_type = DescriptorType::kCount;
 	U8 m_binding = kMaxU8;
 };
 static_assert(sizeof(DescriptorBinding) == 8, "Should be packed because it will be hashed");
@@ -201,7 +201,7 @@ public:
 
 		AnyBinding& b = getBindingToPopulate(binding, arrayIdx);
 		b = {};
-		b.m_type = DescriptorType::COMBINED_TEXTURE_SAMPLER;
+		b.m_type = DescriptorType::kCombinedTextureSampler;
 		b.m_uuids[0] = viewImpl.getHash();
 		b.m_uuids[1] = ptrToNumber(static_cast<const SamplerImpl*>(sampler)->m_sampler->getHandle());
 
@@ -220,7 +220,7 @@ public:
 
 		AnyBinding& b = getBindingToPopulate(binding, arrayIdx);
 		b = {};
-		b.m_type = DescriptorType::TEXTURE;
+		b.m_type = DescriptorType::kTexture;
 		b.m_uuids[0] = b.m_uuids[1] = viewImpl.getHash();
 
 		b.m_tex.m_imgViewHandle = viewImpl.getHandle();
@@ -234,7 +234,7 @@ public:
 	{
 		AnyBinding& b = getBindingToPopulate(binding, arrayIdx);
 		b = {};
-		b.m_type = DescriptorType::SAMPLER;
+		b.m_type = DescriptorType::kSampler;
 		b.m_uuids[0] = b.m_uuids[1] = ptrToNumber(static_cast<const SamplerImpl*>(sampler)->m_sampler->getHandle());
 		b.m_sampler.m_samplerHandle = static_cast<const SamplerImpl*>(sampler)->m_sampler->getHandle();
 
@@ -246,7 +246,7 @@ public:
 	{
 		AnyBinding& b = getBindingToPopulate(binding, arrayIdx);
 		b = {};
-		b.m_type = DescriptorType::UNIFORM_BUFFER;
+		b.m_type = DescriptorType::kUniformBuffer;
 		b.m_uuids[0] = b.m_uuids[1] = buff->getUuid();
 
 		b.m_buff.m_buffHandle = static_cast<const BufferImpl*>(buff)->getHandle();
@@ -261,7 +261,7 @@ public:
 	{
 		AnyBinding& b = getBindingToPopulate(binding, arrayIdx);
 		b = {};
-		b.m_type = DescriptorType::STORAGE_BUFFER;
+		b.m_type = DescriptorType::kStorageBuffer;
 		b.m_uuids[0] = b.m_uuids[1] = buff->getUuid();
 
 		b.m_buff.m_buffHandle = static_cast<const BufferImpl*>(buff)->getHandle();
@@ -278,7 +278,7 @@ public:
 		const VkBufferView view = static_cast<const BufferImpl*>(buff)->getOrCreateBufferView(fmt, offset, range);
 		AnyBinding& b = getBindingToPopulate(binding, arrayIdx);
 		b = {};
-		b.m_type = DescriptorType::READ_TEXTURE_BUFFER;
+		b.m_type = DescriptorType::kReadTextureBuffer;
 		b.m_uuids[0] = ptrToNumber(view);
 		b.m_uuids[1] = buff->getUuid();
 
@@ -296,7 +296,7 @@ public:
 
 		AnyBinding& b = getBindingToPopulate(binding, arrayIdx);
 		b = {};
-		b.m_type = DescriptorType::IMAGE;
+		b.m_type = DescriptorType::kImage;
 		ANKI_ASSERT(impl->getHash());
 		b.m_uuids[0] = b.m_uuids[1] = impl->getHash();
 		b.m_image.m_imgViewHandle = impl->getHandle();
@@ -309,7 +309,7 @@ public:
 	{
 		AnyBinding& b = getBindingToPopulate(binding, arrayIdx);
 		b = {};
-		b.m_type = DescriptorType::ACCELERATION_STRUCTURE;
+		b.m_type = DescriptorType::kAccelerationStructure;
 		b.m_uuids[0] = b.m_uuids[1] = as->getUuid();
 		b.m_accelerationStructure.m_accelerationStructureHandle =
 			static_cast<const AccelerationStructureImpl*>(as)->getHandle();
@@ -329,19 +329,19 @@ private:
 	StackAllocator<U8> m_alloc;
 	DescriptorSetLayout m_layout;
 
-	Array<AnyBindingExtended, MAX_BINDINGS_PER_DESCRIPTOR_SET> m_bindings;
+	Array<AnyBindingExtended, kMaxBindingsPerDescriptorSet> m_bindings;
 
 	U64 m_lastHash = 0;
 
-	BitSet<MAX_BINDINGS_PER_DESCRIPTOR_SET, U32> m_dirtyBindings = {true};
-	BitSet<MAX_BINDINGS_PER_DESCRIPTOR_SET, U32> m_bindingSet = {false};
+	BitSet<kMaxBindingsPerDescriptorSet, U32> m_dirtyBindings = {true};
+	BitSet<kMaxBindingsPerDescriptorSet, U32> m_bindingSet = {false};
 	Bool m_layoutDirty = true;
 	Bool m_bindlessDSetDirty = true;
 	Bool m_bindlessDSetBound = false;
 
 	/// Only DescriptorSetFactory should call this.
 	/// @param hash If hash is zero then the DS doesn't need rebind.
-	void flush(U64& hash, Array<PtrSize, MAX_BINDINGS_PER_DESCRIPTOR_SET>& dynamicOffsets, U32& dynamicOffsetCount,
+	void flush(U64& hash, Array<PtrSize, kMaxBindingsPerDescriptorSet>& dynamicOffsets, U32& dynamicOffsetCount,
 			   Bool& bindlessDSet);
 
 	void unbindBindlessDSet()
@@ -370,7 +370,7 @@ public:
 
 	/// @note It's thread-safe.
 	Error newDescriptorSet(StackAllocator<U8>& tmpAlloc, DescriptorSetState& state, DescriptorSet& set, Bool& dirty,
-						   Array<PtrSize, MAX_BINDINGS_PER_DESCRIPTOR_SET>& dynamicOffsets, U32& dynamicOffsetCount);
+						   Array<PtrSize, kMaxBindingsPerDescriptorSet>& dynamicOffsets, U32& dynamicOffsetCount);
 
 	void endFrame()
 	{

AnKi/Gr/Vulkan/FenceFactory.inl.h

@@ -51,7 +51,7 @@ inline Bool MicroFence::clientWait(Second seconds)
 	}
 	else
 	{
-		seconds = min(seconds, MAX_FENCE_OR_SEMAPHORE_WAIT_TIME);
+		seconds = min(seconds, kMaxFenceOrSemaphoreWaitTime);
 
 		const F64 nsf = 1e+9 * seconds;
 		const U64 ns = U64(nsf);

AnKi/Gr/Vulkan/FramebufferImpl.cpp

@@ -272,7 +272,7 @@ void FramebufferImpl::initRpassCreateInfo(const FramebufferInitInfo& init)
 	m_rpassCi.pSubpasses = &m_subpassDescr;
 }
 
-VkRenderPass FramebufferImpl::getRenderPassHandle(const Array<VkImageLayout, MAX_COLOR_ATTACHMENTS>& colorLayouts,
+VkRenderPass FramebufferImpl::getRenderPassHandle(const Array<VkImageLayout, kMaxColorRenderTargets>& colorLayouts,
 												  VkImageLayout dsLayout, VkImageLayout shadingRateImageLayout)
 {
 	VkRenderPass out = VK_NULL_HANDLE;

AnKi/Gr/Vulkan/FramebufferImpl.h

@@ -40,7 +40,7 @@ public:
 	}
 
 	/// Use it for binding. It's thread-safe
-	VkRenderPass getRenderPassHandle(const Array<VkImageLayout, MAX_COLOR_ATTACHMENTS>& colorLayouts,
+	VkRenderPass getRenderPassHandle(const Array<VkImageLayout, kMaxColorRenderTargets>& colorLayouts,
 									 VkImageLayout dsLayout, VkImageLayout shadingRateImageLayout);
 
 	VkFramebuffer getFramebufferHandle() const
@@ -49,7 +49,7 @@ public:
 		return m_fbHandle;
 	}
 
-	void getAttachmentInfo(BitSet<MAX_COLOR_ATTACHMENTS, U8>& colorAttachments, Bool& depth, Bool& stencil) const
+	void getAttachmentInfo(BitSet<kMaxColorRenderTargets, U8>& colorAttachments, Bool& depth, Bool& stencil) const
 	{
 		colorAttachments = m_colorAttachmentMask;
 		depth = !!(m_aspect & DepthStencilAspectBit::kDepth);
@@ -109,9 +109,9 @@ public:
 	}
 
 private:
-	static constexpr U32 kMaxAttachments = MAX_COLOR_ATTACHMENTS + 2; ///< Color + depth/stencil + SRI
+	static constexpr U32 kMaxAttachments = kMaxColorRenderTargets + 2; ///< Color + depth/stencil + SRI
 
-	BitSet<MAX_COLOR_ATTACHMENTS, U8> m_colorAttachmentMask = {false};
+	BitSet<kMaxColorRenderTargets, U8> m_colorAttachmentMask = {false};
 	DepthStencilAspectBit m_aspect = DepthStencilAspectBit::kNone;
 
 	U8 m_colorAttCount = 0;
@@ -125,7 +125,7 @@ private:
 	class
 	{
 	public:
-		Array<TextureViewPtr, MAX_COLOR_ATTACHMENTS> m_color;
+		Array<TextureViewPtr, kMaxColorRenderTargets> m_color;
 		TextureViewPtr m_depthStencil;
 		TextureViewPtr m_sri;
 	} m_viewRefs;

AnKi/Gr/Vulkan/GrManagerImpl.cpp

@@ -195,8 +195,7 @@ Error GrManagerImpl::initInternal(const GrManagerInitInfo& init)
 		}
 	}
 
-	ANKI_CHECK(
-		m_descrFactory.init(getAllocator(), m_device, MAX_BINDLESS_TEXTURES, MAX_BINDLESS_READONLY_TEXTURE_BUFFERS));
+	ANKI_CHECK(m_descrFactory.init(getAllocator(), m_device, kMaxBindlessTextures, kMaxBindlessReadonlyTextureBuffers));
 	m_pplineLayoutFactory.init(getAllocator(), m_device);
 
 	m_frameGarbageCollector.init(this);
@@ -318,30 +317,30 @@ Error GrManagerImpl::initInstance()
 #if ANKI_WINDOWING_SYSTEM_HEADLESS
 			if(extensionName == VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::EXT_HEADLESS_SURFACE;
+				m_extensions |= VulkanExtensions::kEXT_headless_surface;
 				instExtensions[instExtensionCount++] = VK_EXT_HEADLESS_SURFACE_EXTENSION_NAME;
 			}
 #elif ANKI_OS_LINUX
 			if(extensionName == VK_KHR_XCB_SURFACE_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_XCB_SURFACE;
+				m_extensions |= VulkanExtensions::kKHR_xcb_surface;
 				instExtensions[instExtensionCount++] = VK_KHR_XCB_SURFACE_EXTENSION_NAME;
 			}
 			else if(extensionName == VK_KHR_XLIB_SURFACE_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_XLIB_SURFACE;
+				m_extensions |= VulkanExtensions::kKHR_xlib_surface;
 				instExtensions[instExtensionCount++] = VK_KHR_XLIB_SURFACE_EXTENSION_NAME;
 			}
 #elif ANKI_OS_WINDOWS
 			if(extensionName == VK_KHR_WIN32_SURFACE_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_WIN32_SURFACE;
+				m_extensions |= VulkanExtensions::kKHR_win32_surface;
 				instExtensions[instExtensionCount++] = VK_KHR_WIN32_SURFACE_EXTENSION_NAME;
 			}
 #elif ANKI_OS_ANDROID
 			if(extensionName == VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_ANDROID_SURFACE;
+				m_extensions |= VulkanExtensions::kKHR_android_surface;
 				instExtensions[instExtensionCount++] = VK_KHR_ANDROID_SURFACE_EXTENSION_NAME;
 			}
 #else
@@ -349,21 +348,21 @@ Error GrManagerImpl::initInstance()
 #endif
 			else if(extensionName == VK_KHR_SURFACE_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_SURFACE;
+				m_extensions |= VulkanExtensions::kKHR_surface;
 				instExtensions[instExtensionCount++] = VK_KHR_SURFACE_EXTENSION_NAME;
 			}
 			else if(extensionName == VK_EXT_DEBUG_UTILS_EXTENSION_NAME
 					&& (m_config->getGrDebugMarkers() || m_config->getGrValidation() || m_config->getGrDebugPrintf()))
 			{
-				m_extensions |= VulkanExtensions::EXT_DEBUG_UTILS;
+				m_extensions |= VulkanExtensions::kEXT_debug_utils;
 				instExtensions[instExtensionCount++] = VK_EXT_DEBUG_UTILS_EXTENSION_NAME;
 			}
 		}
 
 		if(!(m_extensions
-			 & (VulkanExtensions::EXT_HEADLESS_SURFACE | VulkanExtensions::KHR_XCB_SURFACE
-				| VulkanExtensions::KHR_XLIB_SURFACE | VulkanExtensions::KHR_WIN32_SURFACE
-				| VulkanExtensions::KHR_ANDROID_SURFACE)))
+			 & (VulkanExtensions::kEXT_headless_surface | VulkanExtensions::kKHR_xcb_surface
+				| VulkanExtensions::kKHR_xlib_surface | VulkanExtensions::kKHR_win32_surface
+				| VulkanExtensions::kKHR_android_surface)))
 		{
 			ANKI_VK_LOGE("Couldn't find suitable surface extension");
 			return Error::kFunctionFailed;
@@ -401,7 +400,7 @@ Error GrManagerImpl::initInstance()
 	volkLoadInstance(m_instance);
 
 	// Set debug callbacks
-	if(!!(m_extensions & VulkanExtensions::EXT_DEBUG_UTILS))
+	if(!!(m_extensions & VulkanExtensions::kEXT_debug_utils))
 	{
 		VkDebugUtilsMessengerCreateInfoEXT info = {};
 		info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_MESSENGER_CREATE_INFO_EXT;
@@ -514,7 +513,7 @@ Error GrManagerImpl::initInstance()
 		m_capabilities.m_maxSubgroupSize = 8;
 	}
 	ANKI_VK_LOGI("GPU is %s. Vendor identified as %s", m_devProps.properties.deviceName,
-				 &GPU_VENDOR_STR[m_capabilities.m_gpuVendor][0]);
+				 &kGPUVendorStrings[m_capabilities.m_gpuVendor][0]);
 
 	// Set limits
 	m_capabilities.m_uniformBufferBindOffsetAlignment =
@@ -569,18 +568,18 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 		{
 			if((queueInfos[i].queueFlags & GENERAL_QUEUE_FLAGS) == GENERAL_QUEUE_FLAGS)
 			{
-				m_queueFamilyIndices[VulkanQueueType::GENERAL] = i;
+				m_queueFamilyIndices[VulkanQueueType::kGeneral] = i;
 			}
 			else if((queueInfos[i].queueFlags & VK_QUEUE_COMPUTE_BIT)
 					&& !(queueInfos[i].queueFlags & VK_QUEUE_GRAPHICS_BIT))
 			{
 				// This must be the async compute
-				m_queueFamilyIndices[VulkanQueueType::COMPUTE] = i;
+				m_queueFamilyIndices[VulkanQueueType::kCompute] = i;
 			}
 		}
 	}
 
-	if(m_queueFamilyIndices[VulkanQueueType::GENERAL] == kMaxU32)
+	if(m_queueFamilyIndices[VulkanQueueType::kGeneral] == kMaxU32)
 	{
 		ANKI_VK_LOGE("Couldn't find a queue family with graphics+compute+transfer+present. "
 					 "Something is wrong");
@@ -589,10 +588,10 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 
 	if(!m_config->getGrAsyncCompute())
 	{
-		m_queueFamilyIndices[VulkanQueueType::COMPUTE] = kMaxU32;
+		m_queueFamilyIndices[VulkanQueueType::kCompute] = kMaxU32;
 	}
 
-	if(m_queueFamilyIndices[VulkanQueueType::COMPUTE] == kMaxU32)
+	if(m_queueFamilyIndices[VulkanQueueType::kCompute] == kMaxU32)
 	{
 		ANKI_VK_LOGW("Couldn't find an async compute queue. Will try to use the general queue instead");
 	}
@@ -646,22 +645,22 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 
 			if(extensionName == VK_KHR_SWAPCHAIN_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_SWAPCHAIN;
+				m_extensions |= VulkanExtensions::kKHR_swapchain;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_AMD_SHADER_INFO_EXTENSION_NAME && m_config->getCoreDisplayStats())
 			{
-				m_extensions |= VulkanExtensions::AMD_SHADER_INFO;
+				m_extensions |= VulkanExtensions::kAMD_shader_info;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_AMD_RASTERIZATION_ORDER_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::AMD_RASTERIZATION_ORDER;
+				m_extensions |= VulkanExtensions::kAMD_rasterization_order;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME && init.m_config->getGrRayTracing())
 			{
-				m_extensions |= VulkanExtensions::KHR_RAY_TRACING;
+				m_extensions |= VulkanExtensions::kKHR_ray_tracing;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 				m_capabilities.m_rayTracingEnabled = true;
 			}
@@ -684,7 +683,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 			else if(extensionName == VK_KHR_PIPELINE_EXECUTABLE_PROPERTIES_EXTENSION_NAME
 					&& m_config->getCoreDisplayStats() > 1)
 			{
-				m_extensions |= VulkanExtensions::KHR_PIPELINE_EXECUTABLE_PROPERTIES;
+				m_extensions |= VulkanExtensions::kKHR_pipeline_executable_properties;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_SHADER_NON_SEMANTIC_INFO_EXTENSION_NAME && m_config->getGrDebugPrintf())
@@ -693,88 +692,88 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 			}
 			else if(extensionName == VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::EXT_DESCRIPTOR_INDEXING;
+				m_extensions |= VulkanExtensions::kEXT_descriptor_indexing;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_BUFFER_DEVICE_ADDRESS;
+				m_extensions |= VulkanExtensions::kKHR_buffer_device_address;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::EXT_SCALAR_BLOCK_LAYOUT;
+				m_extensions |= VulkanExtensions::kEXT_scalar_block_layout;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_TIMELINE_SEMAPHORE;
+				m_extensions |= VulkanExtensions::kKHR_timeline_semaphore;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_SHADER_FLOAT16_INT8;
+				m_extensions |= VulkanExtensions::kKHR_shader_float16_int8;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME && m_config->getGr64bitAtomics())
 			{
-				m_extensions |= VulkanExtensions::KHR_SHADER_ATOMIC_INT64;
+				m_extensions |= VulkanExtensions::kKHR_shader_atomic_int64;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_SPIRV_1_4_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_SPIRV_1_4;
+				m_extensions |= VulkanExtensions::kKHR_spirv_1_4;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_SHADER_FLOAT_CONTROLS;
+				m_extensions |= VulkanExtensions::kKHR_shader_float_controls;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_EXT_SAMPLER_FILTER_MINMAX_EXTENSION_NAME
 					&& m_config->getGrSamplerFilterMinMax())
 			{
-				m_extensions |= VulkanExtensions::EXT_SAMPLER_FILTER_MIN_MAX;
+				m_extensions |= VulkanExtensions::kKHR_sampler_filter_min_max;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_CREATE_RENDERPASS_2;
+				m_extensions |= VulkanExtensions::kKHR_create_renderpass_2;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME && m_config->getGrVrs())
 			{
-				m_extensions |= VulkanExtensions::KHR_FRAGMENT_SHADING_RATE;
+				m_extensions |= VulkanExtensions::kKHR_fragment_shading_rate;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_EXT_ASTC_DECODE_MODE_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::EXT_ASTC_DECODE_MODE;
+				m_extensions |= VulkanExtensions::kEXT_astc_decode_mode;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::EXT_TEXTURE_COMPRESSION_ASTC_HDR;
+				m_extensions |= VulkanExtensions::kEXT_texture_compression_astc_hdr;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(m_capabilities.m_dlss && extensionName == VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::KHR_PUSH_DESCRIPTOR;
+				m_extensions |= VulkanExtensions::kKHR_push_descriptor;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(m_capabilities.m_dlss && extensionName == ANKI_VK_NVX_BINARY_IMPORT)
 			{
-				m_extensions |= VulkanExtensions::NVX_BINARY_IMPORT;
+				m_extensions |= VulkanExtensions::kNVX_binary_import;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(m_capabilities.m_dlss && extensionName == VK_NVX_IMAGE_VIEW_HANDLE_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::NVX_IMAGE_VIEW_HANDLE;
+				m_extensions |= VulkanExtensions::kNVX_image_view_handle;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 			else if(extensionName == VK_KHR_MAINTENANCE_4_EXTENSION_NAME)
 			{
-				m_extensions |= VulkanExtensions::MAINTENANCE_4;
+				m_extensions |= VulkanExtensions::kKHR_maintenance_4;
 				extensionsToEnable[extensionsToEnableCount++] = extensionName.cstr();
 			}
 		}
@@ -803,20 +802,20 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 #if ANKI_PLATFORM_MOBILE
-	if(!(m_extensions & VulkanExtensions::EXT_TEXTURE_COMPRESSION_ASTC_HDR))
+	if(!(m_extensions & VulkanExtensions::kEXT_texture_compression_astc_hdr))
 	{
 		ANKI_VK_LOGE(VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME " is not supported");
 		return Error::kFunctionFailed;
 	}
 #endif
 
-	if(!(m_extensions & VulkanExtensions::KHR_CREATE_RENDERPASS_2))
+	if(!(m_extensions & VulkanExtensions::kKHR_create_renderpass_2))
 	{
 		ANKI_VK_LOGE(VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME " is not supported");
 		return Error::kFunctionFailed;
 	}
 
-	if(!!(m_extensions & VulkanExtensions::EXT_SAMPLER_FILTER_MIN_MAX))
+	if(!!(m_extensions & VulkanExtensions::kKHR_sampler_filter_min_max))
 	{
 		m_capabilities.m_samplingFilterMinMax = true;
 	}
@@ -827,7 +826,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 	// Descriptor indexing
-	if(!(m_extensions & VulkanExtensions::EXT_DESCRIPTOR_INDEXING))
+	if(!(m_extensions & VulkanExtensions::kEXT_descriptor_indexing))
 	{
 		ANKI_VK_LOGE(VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME " is not supported");
 		return Error::kFunctionFailed;
@@ -866,7 +865,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 	// Buffer address
-	if(!(m_extensions & VulkanExtensions::KHR_BUFFER_DEVICE_ADDRESS))
+	if(!(m_extensions & VulkanExtensions::kKHR_buffer_device_address))
 	{
 		ANKI_VK_LOGW(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME " is not supported");
 	}
@@ -888,7 +887,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 	// Scalar block layout
-	if(!(m_extensions & VulkanExtensions::EXT_SCALAR_BLOCK_LAYOUT))
+	if(!(m_extensions & VulkanExtensions::kEXT_scalar_block_layout))
 	{
 		ANKI_VK_LOGE(VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME " is not supported");
 		return Error::kFunctionFailed;
@@ -913,7 +912,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 	// Timeline semaphore
-	if(!(m_extensions & VulkanExtensions::KHR_TIMELINE_SEMAPHORE))
+	if(!(m_extensions & VulkanExtensions::kKHR_timeline_semaphore))
 	{
 		ANKI_VK_LOGE(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME " is not supported");
 		return Error::kFunctionFailed;
@@ -938,7 +937,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 	// Set RT features
-	if(!!(m_extensions & VulkanExtensions::KHR_RAY_TRACING))
+	if(!!(m_extensions & VulkanExtensions::kKHR_ray_tracing))
 	{
 		m_rtPipelineFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_PIPELINE_FEATURES_KHR;
 		m_rayQueryFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_QUERY_FEATURES_KHR;
@@ -972,7 +971,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 	// Pipeline features
-	if(!!(m_extensions & VulkanExtensions::KHR_PIPELINE_EXECUTABLE_PROPERTIES))
+	if(!!(m_extensions & VulkanExtensions::kKHR_pipeline_executable_properties))
 	{
 		m_pplineExecutablePropertiesFeatures.sType =
 			VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_EXECUTABLE_PROPERTIES_FEATURES_KHR;
@@ -983,7 +982,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 	// F16 I8
-	if(!(m_extensions & VulkanExtensions::KHR_SHADER_FLOAT16_INT8))
+	if(!(m_extensions & VulkanExtensions::kKHR_shader_float16_int8))
 	{
 		ANKI_VK_LOGE(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME " is not supported");
 		return Error::kFunctionFailed;
@@ -1002,7 +1001,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 	// 64bit atomics
-	if(!(m_extensions & VulkanExtensions::KHR_SHADER_ATOMIC_INT64))
+	if(!(m_extensions & VulkanExtensions::kKHR_shader_atomic_int64))
 	{
 		ANKI_VK_LOGW(VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME " is not supported or disabled");
 		m_capabilities.m_64bitAtomics = false;
@@ -1023,7 +1022,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	}
 
 	// VRS
-	if(!(m_extensions & VulkanExtensions::KHR_FRAGMENT_SHADING_RATE))
+	if(!(m_extensions & VulkanExtensions::kKHR_fragment_shading_rate))
 	{
 		ANKI_VK_LOGI(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME " is not supported or disabled");
 		m_capabilities.m_vrs = false;
@@ -1090,7 +1089,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 
 	VkPhysicalDeviceMaintenance4FeaturesKHR maintenance4Features = {};
 	maintenance4Features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_4_FEATURES_KHR;
-	if(!!(m_extensions & VulkanExtensions::MAINTENANCE_4))
+	if(!!(m_extensions & VulkanExtensions::kKHR_maintenance_4))
 	{
 		maintenance4Features.maintenance4 = true;
 		maintenance4Features.pNext = const_cast<void*>(ci.pNext);
@@ -1100,7 +1099,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	ANKI_VK_CHECK(vkCreateDevice(m_physicalDevice, &ci, nullptr, &m_device));
 
 	// Get VK_AMD_shader_info entry points
-	if(!!(m_extensions & VulkanExtensions::AMD_SHADER_INFO))
+	if(!!(m_extensions & VulkanExtensions::kAMD_shader_info))
 	{
 		m_pfnGetShaderInfoAMD =
 			reinterpret_cast<PFN_vkGetShaderInfoAMD>(vkGetDeviceProcAddr(m_device, "vkGetShaderInfoAMD"));
@@ -1110,13 +1109,13 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 		}
 	}
 
-	if(!(m_extensions & VulkanExtensions::KHR_SPIRV_1_4))
+	if(!(m_extensions & VulkanExtensions::kKHR_spirv_1_4))
 	{
 		ANKI_VK_LOGE(VK_KHR_SPIRV_1_4_EXTENSION_NAME " is not supported");
 		return Error::kFunctionFailed;
 	}
 
-	if(!(m_extensions & VulkanExtensions::KHR_SHADER_FLOAT_CONTROLS))
+	if(!(m_extensions & VulkanExtensions::kKHR_shader_float_controls))
 	{
 		ANKI_VK_LOGE(VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME " is not supported");
 		return Error::kFunctionFailed;
@@ -1143,7 +1142,7 @@ Error GrManagerImpl::initMemory()
 	}
 
 	m_gpuMemManager.init(m_physicalDevice, m_device, getAllocator(),
-						 !!(m_extensions & VulkanExtensions::KHR_BUFFER_DEVICE_ADDRESS));
+						 !!(m_extensions & VulkanExtensions::kKHR_buffer_device_address));
 
 	return Error::kNone;
 }
@@ -1217,7 +1216,7 @@ TexturePtr GrManagerImpl::acquireNextPresentableTexture()
 
 	LockGuard<Mutex> lock(m_globalMtx);
 
-	PerFrame& frame = m_perFrame[m_frame % MAX_FRAMES_IN_FLIGHT];
+	PerFrame& frame = m_perFrame[m_frame % kMaxFramesInFlight];
 
 	// Create sync objects
 	MicroFencePtr fence = m_fenceFactory.newInstance();
@@ -1261,10 +1260,10 @@ void GrManagerImpl::endFrame()
 
 	LockGuard<Mutex> lock(m_globalMtx);
 
-	PerFrame& frame = m_perFrame[m_frame % MAX_FRAMES_IN_FLIGHT];
+	PerFrame& frame = m_perFrame[m_frame % kMaxFramesInFlight];
 
 	// Wait for the fence of N-2 frame
-	const U waitFrameIdx = (m_frame + 1) % MAX_FRAMES_IN_FLIGHT;
+	const U waitFrameIdx = (m_frame + 1) % kMaxFramesInFlight;
 	PerFrame& waitFrame = m_perFrame[waitFrameIdx];
 	if(waitFrame.m_presentFence)
 	{
@@ -1394,7 +1393,7 @@ void GrManagerImpl::flushCommandBuffer(MicroCommandBufferPtr cmdb, Bool cmdbRend
 		LockGuard<Mutex> lock(m_globalMtx);
 
 		// Do some special stuff for the last command buffer
-		PerFrame& frame = m_perFrame[m_frame % MAX_FRAMES_IN_FLIGHT];
+		PerFrame& frame = m_perFrame[m_frame % kMaxFramesInFlight];
 		if(cmdbRenderedToSwapchain)
 		{
 			// Wait semaphore
@@ -1454,7 +1453,7 @@ void GrManagerImpl::finish()
 
 void GrManagerImpl::trySetVulkanHandleName(CString name, VkObjectType type, U64 handle) const
 {
-	if(name && name.getLength() && !!(m_extensions & VulkanExtensions::EXT_DEBUG_UTILS))
+	if(name && name.getLength() && !!(m_extensions & VulkanExtensions::kEXT_debug_utils))
 	{
 		VkDebugUtilsObjectNameInfoEXT info = {};
 		info.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT;
@@ -1582,7 +1581,7 @@ Error GrManagerImpl::printPipelineShaderInfoInternal(VkPipeline ppline, CString
 		ANKI_CHECK(m_shaderStatsFile.flush());
 	}
 
-	if(!!(m_extensions & VulkanExtensions::KHR_PIPELINE_EXECUTABLE_PROPERTIES))
+	if(!!(m_extensions & VulkanExtensions::kKHR_pipeline_executable_properties))
 	{
 		StringListAuto log(m_alloc);
 

AnKi/Gr/Vulkan/GrManagerImpl.h

@@ -49,7 +49,7 @@ public:
 
 	ConstWeakArray<U32> getQueueFamilies() const
 	{
-		const Bool hasAsyncCompute = m_queueFamilyIndices[VulkanQueueType::COMPUTE] != kMaxU32;
+		const Bool hasAsyncCompute = m_queueFamilyIndices[VulkanQueueType::kCompute] != kMaxU32;
 		return (hasAsyncCompute) ? m_queueFamilyIndices : ConstWeakArray<U32>(&m_queueFamilyIndices[0], 1);
 	}
 
@@ -184,7 +184,7 @@ public:
 	void beginMarker(VkCommandBuffer cmdb, CString name, Vec3 color = Vec3(1.0f, 0.0f, 0.0f)) const
 	{
 		ANKI_ASSERT(cmdb);
-		if(!!(m_extensions & VulkanExtensions::EXT_DEBUG_UTILS))
+		if(!!(m_extensions & VulkanExtensions::kEXT_debug_utils))
 		{
 			VkDebugUtilsLabelEXT label = {};
 			label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
@@ -200,7 +200,7 @@ public:
 	void endMarker(VkCommandBuffer cmdb) const
 	{
 		ANKI_ASSERT(cmdb);
-		if(!!(m_extensions & VulkanExtensions::EXT_DEBUG_UTILS))
+		if(!!(m_extensions & VulkanExtensions::kEXT_debug_utils))
 		{
 			vkCmdEndDebugUtilsLabelEXT(cmdb);
 		}
@@ -245,7 +245,7 @@ private:
 
 	VkInstance m_instance = VK_NULL_HANDLE;
 	VkPhysicalDevice m_physicalDevice = VK_NULL_HANDLE;
-	VulkanExtensions m_extensions = VulkanExtensions::NONE;
+	VulkanExtensions m_extensions = VulkanExtensions::kNone;
 	VkDevice m_device = VK_NULL_HANDLE;
 	VulkanQueueFamilies m_queueFamilyIndices = {kMaxU32, kMaxU32};
 	Array<VkQueue, U32(VulkanQueueType::kCount)> m_queues = {};
@@ -295,7 +295,7 @@ private:
 	MicroSwapchainPtr m_crntSwapchain;
 	U8 m_acquiredImageIdx = kMaxU8;
 
-	Array<PerFrame, MAX_FRAMES_IN_FLIGHT> m_perFrame;
+	Array<PerFrame, kMaxFramesInFlight> m_perFrame;
 	/// @}
 
 	/// @name Memory

AnKi/Gr/Vulkan/GrUpscalerImpl.cpp

@@ -22,7 +22,7 @@ namespace anki {
 GrUpscalerImpl::~GrUpscalerImpl()
 {
 #if ANKI_DLSS
-	if(m_upscalerType == GrUpscalerType::DLSS_2)
+	if(m_upscalerType == GrUpscalerType::kDlss2)
 	{
 		destroyDlss();
 	}
@@ -34,7 +34,7 @@ Error GrUpscalerImpl::initInternal(const GrUpscalerInitInfo& initInfo)
 	m_upscalerType = initInfo.m_upscalerType;
 
 #if ANKI_DLSS
-	ANKI_ASSERT(initInfo.m_upscalerType == GrUpscalerType::DLSS_2);
+	ANKI_ASSERT(initInfo.m_upscalerType == GrUpscalerType::kDlss2);
 	ANKI_CHECK(initDlss(initInfo));
 #else
 	ANKI_ASSERT(!"Not supported");
@@ -59,7 +59,7 @@ Error GrUpscalerImpl::initInternal(const GrUpscalerInitInfo& initInfo)
 
 static NVSDK_NGX_PerfQuality_Value getDlssQualityModeToNVQualityMode(GrUpscalerQualityMode mode)
 {
-	static Array<NVSDK_NGX_PerfQuality_Value, U32(GrUpscalerQualityMode::COUNT)> nvQualityModes = {
+	static Array<NVSDK_NGX_PerfQuality_Value, U32(GrUpscalerQualityMode::kCount)> nvQualityModes = {
 		NVSDK_NGX_PerfQuality_Value_MaxPerf, NVSDK_NGX_PerfQuality_Value_Balanced,
 		NVSDK_NGX_PerfQuality_Value_MaxQuality};
 
@@ -79,9 +79,9 @@ Error GrUpscalerImpl::initDlss(const GrUpscalerInitInfo& initInfo)
 	ANKI_NGX_CHECK(NVSDK_NGX_VULKAN_GetCapabilityParameters(&m_ngxParameters));
 	ANKI_ASSERT(m_ngxParameters);
 
-	// Currently, the SDK and this sample are not in sync.  The sample is a bit forward looking,
-	// in this case.  This will likely be resolved very shortly, and therefore, the code below
-	// should be thought of as needed for a smooth user experience.
+	// Currently, the SDK and this sample are not in sync.  The sample is a bit forward looking, in this case. This will
+	// likely be resolved very shortly, and therefore, the code below should be thought of as needed for a smooth user
+	// experience.
 #	if defined(NVSDK_NGX_Parameter_SuperSampling_NeedsUpdatedDriver) \
 		&& defined(NVSDK_NGX_Parameter_SuperSampling_MinDriverVersionMajor) \
 		&& defined(NVSDK_NGX_Parameter_SuperSampling_MinDriverVersionMinor)
@@ -137,7 +137,7 @@ Error GrUpscalerImpl::createDlssFeature(const UVec2& srcRes, const UVec2& dstRes
 
 	// Create the feature with a tmp CmdBuffer
 	CommandBufferInitInfo cmdbinit;
-	cmdbinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+	cmdbinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr cmdb = getManager().newCommandBuffer(cmdbinit);
 	CommandBufferImpl& cmdbImpl = static_cast<CommandBufferImpl&>(*cmdb);
 

AnKi/Gr/Vulkan/Pipeline.cpp

@@ -47,7 +47,7 @@ Bool PipelineStateTracker::updateHashes()
 	// Vertex
 	if(m_dirty.m_attribs.getAny() || m_dirty.m_vertBindings.getAny())
 	{
-		for(U i = 0; i < MAX_VERTEX_ATTRIBUTES; ++i)
+		for(U i = 0; i < kMaxVertexAttributes; ++i)
 		{
 			if(m_shaderAttributeMask.get(i))
 			{
@@ -130,7 +130,7 @@ Bool PipelineStateTracker::updateHashes()
 
 		if(!!(m_dirty.m_colAttachments & m_fbColorAttachmentMask))
 		{
-			for(U i = 0; i < MAX_COLOR_ATTACHMENTS; ++i)
+			for(U i = 0; i < kMaxColorRenderTargets; ++i)
 			{
 				if(m_fbColorAttachmentMask.get(i) && m_dirty.m_colAttachments.get(i))
 				{
@@ -160,7 +160,7 @@ void PipelineStateTracker::updateSuperHash()
 	// Vertex
 	if(!!m_shaderAttributeMask)
 	{
-		for(U i = 0; i < MAX_VERTEX_ATTRIBUTES; ++i)
+		for(U i = 0; i < kMaxVertexAttributes; ++i)
 		{
 			if(m_shaderAttributeMask.get(i))
 			{
@@ -192,7 +192,7 @@ void PipelineStateTracker::updateSuperHash()
 	{
 		buff[count++] = m_hashes.m_color;
 
-		for(U i = 0; i < MAX_COLOR_ATTACHMENTS; ++i)
+		for(U i = 0; i < kMaxColorRenderTargets; ++i)
 		{
 			if(m_shaderColorAttachmentWritemask.get(i))
 			{
@@ -227,8 +227,8 @@ const VkGraphicsPipelineCreateInfo& PipelineStateTracker::updatePipelineCreateIn
 	vertCi.pVertexAttributeDescriptions = &m_ci.m_attribs[0];
 	vertCi.pVertexBindingDescriptions = &m_ci.m_vertBindings[0];
 
-	BitSet<MAX_VERTEX_ATTRIBUTES, U8> bindingSet = {false};
-	for(U32 i = 0; i < MAX_VERTEX_ATTRIBUTES; ++i)
+	BitSet<kMaxVertexAttributes, U8> bindingSet = {false};
+	for(U32 i = 0; i < kMaxVertexAttributes; ++i)
 	{
 		if(m_shaderAttributeMask.get(i))
 		{

AnKi/Gr/Vulkan/Pipeline.h

@@ -59,12 +59,12 @@ static_assert(sizeof(VertexAttributeBindingPipelineState) == 2 * sizeof(PtrSize)
 class VertexPipelineState
 {
 public:
-	Array<VertexBufferBindingPipelineState, MAX_VERTEX_ATTRIBUTES> m_bindings;
-	Array<VertexAttributeBindingPipelineState, MAX_VERTEX_ATTRIBUTES> m_attributes;
+	Array<VertexBufferBindingPipelineState, kMaxVertexAttributes> m_bindings;
+	Array<VertexAttributeBindingPipelineState, kMaxVertexAttributes> m_attributes;
 };
 static_assert(sizeof(VertexPipelineState)
-				  == sizeof(VertexBufferBindingPipelineState) * MAX_VERTEX_ATTRIBUTES
-						 + sizeof(VertexAttributeBindingPipelineState) * MAX_VERTEX_ATTRIBUTES,
+				  == sizeof(VertexBufferBindingPipelineState) * kMaxVertexAttributes
+						 + sizeof(VertexAttributeBindingPipelineState) * kMaxVertexAttributes,
 			  "Packed because it will be hashed");
 
 class InputAssemblerPipelineState
@@ -128,9 +128,9 @@ class ColorPipelineState
 {
 public:
 	Bool m_alphaToCoverageEnabled = false;
-	Array<ColorAttachmentState, MAX_COLOR_ATTACHMENTS> m_attachments;
+	Array<ColorAttachmentState, kMaxColorRenderTargets> m_attachments;
 };
-static_assert(sizeof(ColorPipelineState) == sizeof(ColorAttachmentState) * MAX_COLOR_ATTACHMENTS + sizeof(U8),
+static_assert(sizeof(ColorPipelineState) == sizeof(ColorAttachmentState) * kMaxColorRenderTargets + sizeof(U8),
 			  "Packed because it will be hashed");
 
 class AllPipelineState
@@ -439,10 +439,10 @@ private:
 		Bool m_color : 1;
 
 		// Vertex
-		BitSet<MAX_VERTEX_ATTRIBUTES, U8> m_attribs = {true};
-		BitSet<MAX_VERTEX_ATTRIBUTES, U8> m_vertBindings = {true};
+		BitSet<kMaxVertexAttributes, U8> m_attribs = {true};
+		BitSet<kMaxVertexAttributes, U8> m_vertBindings = {true};
 
-		BitSet<MAX_COLOR_ATTACHMENTS, U8> m_colAttachments = {true};
+		BitSet<kMaxColorRenderTargets, U8> m_colAttachments = {true};
 
 		DirtyBits()
 			: m_prog(true)
@@ -459,32 +459,32 @@ private:
 	class SetBits
 	{
 	public:
-		BitSet<MAX_VERTEX_ATTRIBUTES, U8> m_attribs = {false};
-		BitSet<MAX_VERTEX_ATTRIBUTES, U8> m_vertBindings = {false};
+		BitSet<kMaxVertexAttributes, U8> m_attribs = {false};
+		BitSet<kMaxVertexAttributes, U8> m_vertBindings = {false};
 	} m_set;
 
 	// Shader info
-	BitSet<MAX_VERTEX_ATTRIBUTES, U8> m_shaderAttributeMask = {false};
-	BitSet<MAX_COLOR_ATTACHMENTS, U8> m_shaderColorAttachmentWritemask = {false};
+	BitSet<kMaxVertexAttributes, U8> m_shaderAttributeMask = {false};
+	BitSet<kMaxColorRenderTargets, U8> m_shaderColorAttachmentWritemask = {false};
 
 	// Renderpass info
 	Bool m_fbDepth = false;
 	Bool m_fbStencil = false;
 	Bool m_defaultFb = false;
-	BitSet<MAX_COLOR_ATTACHMENTS, U8> m_fbColorAttachmentMask = {false};
+	BitSet<kMaxColorRenderTargets, U8> m_fbColorAttachmentMask = {false};
 
 	class Hashes
 	{
 	public:
 		U64 m_prog;
 		U64 m_rpass;
-		Array<U64, MAX_VERTEX_ATTRIBUTES> m_vertexAttribs;
+		Array<U64, kMaxVertexAttributes> m_vertexAttribs;
 		U64 m_ia;
 		U64 m_raster;
 		U64 m_depth;
 		U64 m_stencil;
 		U64 m_color;
-		Array<U64, MAX_COLOR_ATTACHMENTS> m_colAttachments;
+		Array<U64, kMaxColorRenderTargets> m_colAttachments;
 
 		U64 m_superHash;
 		U64 m_lastSuperHash;
@@ -499,8 +499,8 @@ private:
 	class CreateInfo
 	{
 	public:
-		Array<VkVertexInputBindingDescription, MAX_VERTEX_ATTRIBUTES> m_vertBindings;
-		Array<VkVertexInputAttributeDescription, MAX_VERTEX_ATTRIBUTES> m_attribs;
+		Array<VkVertexInputBindingDescription, kMaxVertexAttributes> m_vertBindings;
+		Array<VkVertexInputAttributeDescription, kMaxVertexAttributes> m_attribs;
 		VkPipelineVertexInputStateCreateInfo m_vert;
 		VkPipelineInputAssemblyStateCreateInfo m_ia;
 		VkPipelineViewportStateCreateInfo m_vp;
@@ -508,7 +508,7 @@ private:
 		VkPipelineRasterizationStateCreateInfo m_rast;
 		VkPipelineMultisampleStateCreateInfo m_ms;
 		VkPipelineDepthStencilStateCreateInfo m_ds;
-		Array<VkPipelineColorBlendAttachmentState, MAX_COLOR_ATTACHMENTS> m_colAttachments;
+		Array<VkPipelineColorBlendAttachmentState, kMaxColorRenderTargets> m_colAttachments;
 		VkPipelineColorBlendStateCreateInfo m_color;
 		VkPipelineDynamicStateCreateInfo m_dyn;
 		VkGraphicsPipelineCreateInfo m_ppline;

AnKi/Gr/Vulkan/PipelineLayout.cpp

@@ -23,7 +23,7 @@ Error PipelineLayoutFactory::newPipelineLayout(const WeakArray<DescriptorSetLayo
 											   PipelineLayout& layout)
 {
 	U64 hash = computeHash(&pushConstantsSize, sizeof(pushConstantsSize));
-	Array<VkDescriptorSetLayout, MAX_DESCRIPTOR_SETS> vkDsetLayouts;
+	Array<VkDescriptorSetLayout, kMaxDescriptorSets> vkDsetLayouts;
 	U32 dsetLayoutCount = 0;
 	for(const DescriptorSetLayout& dl : dsetLayouts)
 	{

AnKi/Gr/Vulkan/SemaphoreFactory.inl.h

@@ -46,7 +46,7 @@ inline Bool MicroSemaphore::clientWait(Second seconds)
 {
 	ANKI_ASSERT(m_isTimeline);
 
-	seconds = min(seconds, MAX_FENCE_OR_SEMAPHORE_WAIT_TIME);
+	seconds = min(seconds, kMaxFenceOrSemaphoreWaitTime);
 
 	VkSemaphoreWaitInfo waitInfo = {};
 	waitInfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO;

AnKi/Gr/Vulkan/ShaderImpl.cpp

@@ -125,17 +125,17 @@ void ShaderImpl::doReflection(ConstWeakArray<U8> spirv, SpecConstsVector& specCo
 	spirv_cross::ShaderResources rsrc = spvc.get_shader_resources();
 	spirv_cross::ShaderResources rsrcActive = spvc.get_shader_resources(spvc.get_active_interface_variables());
 
-	Array<U32, MAX_DESCRIPTOR_SETS> counts = {};
-	Array2d<DescriptorBinding, MAX_DESCRIPTOR_SETS, MAX_BINDINGS_PER_DESCRIPTOR_SET> descriptors;
+	Array<U32, kMaxDescriptorSets> counts = {};
+	Array2d<DescriptorBinding, kMaxDescriptorSets, kMaxBindingsPerDescriptorSet> descriptors;
 
 	auto func = [&](const spirv_cross::SmallVector<spirv_cross::Resource>& resources, DescriptorType type) -> void {
 		for(const spirv_cross::Resource& r : resources)
 		{
 			const U32 id = r.id;
 			const U32 set = spvc.get_decoration(id, spv::Decoration::DecorationDescriptorSet);
-			ANKI_ASSERT(set < MAX_DESCRIPTOR_SETS);
+			ANKI_ASSERT(set < kMaxDescriptorSets);
 			const U32 binding = spvc.get_decoration(id, spv::Decoration::DecorationBinding);
-			ANKI_ASSERT(binding < MAX_BINDINGS_PER_DESCRIPTOR_SET);
+			ANKI_ASSERT(binding < kMaxBindingsPerDescriptorSet);
 
 			const spirv_cross::SPIRType& typeInfo = spvc.get_type(r.type_id);
 			U32 arraySize = 1;
@@ -150,15 +150,15 @@ void ShaderImpl::doReflection(ConstWeakArray<U8> spirv, SpecConstsVector& specCo
 			m_activeBindingMask[set].set(set);
 
 			// Images are special, they might be texel buffers
-			if(type == DescriptorType::TEXTURE)
+			if(type == DescriptorType::kTexture)
 			{
 				if(typeInfo.image.dim == spv::DimBuffer && typeInfo.image.sampled == 1)
 				{
-					type = DescriptorType::READ_TEXTURE_BUFFER;
+					type = DescriptorType::kReadTextureBuffer;
 				}
 				else if(typeInfo.image.dim == spv::DimBuffer && typeInfo.image.sampled == 2)
 				{
-					type = DescriptorType::READ_WRITE_TEXTURE_BUFFER;
+					type = DescriptorType::kReadWriteTextureBuffer;
 				}
 			}
 
@@ -191,15 +191,15 @@ void ShaderImpl::doReflection(ConstWeakArray<U8> spirv, SpecConstsVector& specCo
 		}
 	};
 
-	func(rsrc.uniform_buffers, DescriptorType::UNIFORM_BUFFER);
-	func(rsrc.sampled_images, DescriptorType::COMBINED_TEXTURE_SAMPLER);
-	func(rsrc.separate_images, DescriptorType::TEXTURE); // This also handles texture buffers
-	func(rsrc.separate_samplers, DescriptorType::SAMPLER);
-	func(rsrc.storage_buffers, DescriptorType::STORAGE_BUFFER);
-	func(rsrc.storage_images, DescriptorType::IMAGE);
-	func(rsrc.acceleration_structures, DescriptorType::ACCELERATION_STRUCTURE);
+	func(rsrc.uniform_buffers, DescriptorType::kUniformBuffer);
+	func(rsrc.sampled_images, DescriptorType::kCombinedTextureSampler);
+	func(rsrc.separate_images, DescriptorType::kTexture); // This also handles texture buffers
+	func(rsrc.separate_samplers, DescriptorType::kSampler);
+	func(rsrc.storage_buffers, DescriptorType::kStorageBuffer);
+	func(rsrc.storage_images, DescriptorType::kImage);
+	func(rsrc.acceleration_structures, DescriptorType::kAccelerationStructure);
 
-	for(U32 set = 0; set < MAX_DESCRIPTOR_SETS; ++set)
+	for(U32 set = 0; set < kMaxDescriptorSets; ++set)
 	{
 		if(counts[set])
 		{

AnKi/Gr/Vulkan/ShaderImpl.h

@@ -21,11 +21,11 @@ class ShaderImpl final : public Shader, public VulkanObject<Shader, ShaderImpl>
 public:
 	VkShaderModule m_handle = VK_NULL_HANDLE;
 
-	Array<DynamicArray<DescriptorBinding>, MAX_DESCRIPTOR_SETS> m_bindings;
-	BitSet<MAX_COLOR_ATTACHMENTS, U8> m_colorAttachmentWritemask = {false};
-	BitSet<MAX_VERTEX_ATTRIBUTES, U8> m_attributeMask = {false};
-	BitSet<MAX_DESCRIPTOR_SETS, U8> m_descriptorSetMask = {false};
-	Array<BitSet<MAX_BINDINGS_PER_DESCRIPTOR_SET, U8>, MAX_DESCRIPTOR_SETS> m_activeBindingMask = {
+	Array<DynamicArray<DescriptorBinding>, kMaxDescriptorSets> m_bindings;
+	BitSet<kMaxColorRenderTargets, U8> m_colorAttachmentWritemask = {false};
+	BitSet<kMaxVertexAttributes, U8> m_attributeMask = {false};
+	BitSet<kMaxDescriptorSets, U8> m_descriptorSetMask = {false};
+	Array<BitSet<kMaxBindingsPerDescriptorSet, U8>, kMaxDescriptorSets> m_activeBindingMask = {
 		{{false}, {false}, {false}}};
 	U32 m_pushConstantsSize = 0;
 

AnKi/Gr/Vulkan/ShaderProgramImpl.cpp

@@ -102,10 +102,10 @@ Error ShaderProgramImpl::init(const ShaderProgramInitInfo& inf)
 
 	// Merge bindings
 	//
-	Array2d<DescriptorBinding, MAX_DESCRIPTOR_SETS, MAX_BINDINGS_PER_DESCRIPTOR_SET> bindings;
-	Array<U32, MAX_DESCRIPTOR_SETS> counts = {};
+	Array2d<DescriptorBinding, kMaxDescriptorSets, kMaxBindingsPerDescriptorSet> bindings;
+	Array<U32, kMaxDescriptorSets> counts = {};
 	U32 descriptorSetCount = 0;
-	for(U32 set = 0; set < MAX_DESCRIPTOR_SETS; ++set)
+	for(U32 set = 0; set < kMaxDescriptorSets; ++set)
 	{
 		for(ShaderPtr& shader : m_shaders)
 		{
@@ -239,7 +239,7 @@ Error ShaderProgramImpl::init(const ShaderProgramInitInfo& inf)
 
 		VkComputePipelineCreateInfo ci = {};
 
-		if(!!(getGrManagerImpl().getExtensions() & VulkanExtensions::KHR_PIPELINE_EXECUTABLE_PROPERTIES))
+		if(!!(getGrManagerImpl().getExtensions() & VulkanExtensions::kKHR_pipeline_executable_properties))
 		{
 			ci.flags |= VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR;
 		}

AnKi/Gr/Vulkan/ShaderProgramImpl.h

@@ -20,10 +20,10 @@ class PipelineFactory;
 class ShaderProgramReflectionInfo
 {
 public:
-	BitSet<MAX_COLOR_ATTACHMENTS, U8> m_colorAttachmentWritemask = {false};
-	BitSet<MAX_VERTEX_ATTRIBUTES, U8> m_attributeMask = {false};
-	BitSet<MAX_DESCRIPTOR_SETS, U8> m_descriptorSetMask = {false};
-	Array<BitSet<MAX_BINDINGS_PER_DESCRIPTOR_SET, U8>, MAX_DESCRIPTOR_SETS> m_activeBindingMask = {
+	BitSet<kMaxColorRenderTargets, U8> m_colorAttachmentWritemask = {false};
+	BitSet<kMaxVertexAttributes, U8> m_attributeMask = {false};
+	BitSet<kMaxDescriptorSets, U8> m_descriptorSetMask = {false};
+	Array<BitSet<kMaxBindingsPerDescriptorSet, U8>, kMaxDescriptorSets> m_activeBindingMask = {
 		{{false}, {false}, {false}}};
 	U32 m_pushConstantsSize = 0;
 };
@@ -111,7 +111,7 @@ private:
 	ShaderTypeBit m_stages = ShaderTypeBit::kNone;
 
 	PipelineLayout m_pplineLayout = {};
-	Array<DescriptorSetLayout, MAX_DESCRIPTOR_SETS> m_descriptorSetLayouts;
+	Array<DescriptorSetLayout, kMaxDescriptorSets> m_descriptorSetLayouts;
 
 	ShaderProgramReflectionInfo m_refl;
 

AnKi/Gr/Vulkan/SwapchainFactory.cpp

@@ -194,7 +194,7 @@ Error MicroSwapchain::initInternal()
 		VkSwapchainCreateInfoKHR ci = {};
 		ci.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
 		ci.surface = m_factory->m_gr->getSurface();
-		ci.minImageCount = MAX_FRAMES_IN_FLIGHT;
+		ci.minImageCount = kMaxFramesInFlight;
 		ci.imageFormat = surfaceFormat;
 		ci.imageColorSpace = colorspace;
 		ci.imageExtent.width = surfaceWidth;
@@ -217,9 +217,9 @@ Error MicroSwapchain::initInternal()
 	{
 		U32 count = 0;
 		ANKI_VK_CHECK(vkGetSwapchainImagesKHR(dev, m_swapchain, &count, nullptr));
-		if(count != MAX_FRAMES_IN_FLIGHT)
+		if(count != kMaxFramesInFlight)
 		{
-			ANKI_VK_LOGI("Requested a swapchain with %u images but got one with %u", MAX_FRAMES_IN_FLIGHT, count);
+			ANKI_VK_LOGI("Requested a swapchain with %u images but got one with %u", kMaxFramesInFlight, count);
 		}
 
 		m_textures.create(getAllocator(), count);

AnKi/Gr/Vulkan/SwapchainFactory.h

@@ -67,7 +67,7 @@ public:
 
 	VkRenderPass getRenderPass(VkAttachmentLoadOp loadOp) const
 	{
-		const U idx = (loadOp == VK_ATTACHMENT_LOAD_OP_DONT_CARE) ? RPASS_LOAD_DONT_CARE : RPASS_LOAD_CLEAR;
+		const U idx = (loadOp == VK_ATTACHMENT_LOAD_OP_DONT_CARE) ? kLoadOpDontCare : kLoadOpClear;
 		return m_rpasses[idx];
 	}
 
@@ -77,12 +77,12 @@ private:
 
 	enum
 	{
-		RPASS_LOAD_CLEAR,
-		RPASS_LOAD_DONT_CARE,
-		RPASS_COUNT
+		kLoadOpClear,
+		kLoadOpDontCare,
+		kLoadOpCount
 	};
 
-	Array<VkRenderPass, RPASS_COUNT> m_rpasses = {};
+	Array<VkRenderPass, kLoadOpCount> m_rpasses = {};
 
 	MicroFencePtr m_fence;
 

AnKi/Gr/Vulkan/TextureImpl.cpp

@@ -169,7 +169,7 @@ Error TextureImpl::initInternal(VkImage externalImage, const TextureInitInfo& in
 	m_viewCreateInfoTemplate.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
 	m_viewCreateInfoTemplate.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
 
-	if(!!(getGrManagerImpl().getExtensions() & VulkanExtensions::EXT_ASTC_DECODE_MODE) && isAstcLdrFormat(m_vkFormat)
+	if(!!(getGrManagerImpl().getExtensions() & VulkanExtensions::kEXT_astc_decode_mode) && isAstcLdrFormat(m_vkFormat)
 	   && !isAstcSrgbFormat(m_vkFormat))
 	{
 		m_astcDecodeMode = {};

AnKi/Renderer/GBuffer.cpp

@@ -191,7 +191,7 @@ void GBuffer::populateRenderGraph(RenderingContext& ctx)
 	}
 
 	// Create RTs
-	Array<RenderTargetHandle, MAX_COLOR_ATTACHMENTS> rts;
+	Array<RenderTargetHandle, kMaxColorRenderTargets> rts;
 	for(U i = 0; i < kGBufferColorRenderTargetCount; ++i)
 	{
 		m_runCtx.m_colorRts[i] = rgraph.newRenderTarget(m_colorRtDescrs[i]);

AnKi/Renderer/ProbeReflections.cpp

@@ -514,7 +514,7 @@ void ProbeReflections::populateRenderGraph(RenderingContext& rctx)
 	// G-buffer pass
 	{
 		// RTs
-		Array<RenderTargetHandle, MAX_COLOR_ATTACHMENTS> rts;
+		Array<RenderTargetHandle, kMaxColorRenderTargets> rts;
 		for(U i = 0; i < kGBufferColorRenderTargetCount; ++i)
 		{
 			m_ctx.m_gbufferColorRts[i] = rgraph.newRenderTarget(m_gbuffer.m_colorRtDescrs[i]);

AnKi/Renderer/Renderer.cpp

@@ -469,10 +469,10 @@ TexturePtr Renderer::createAndClearRenderTarget(const TextureInitInfo& inf, Text
 
 	// Clear all surfaces
 	CommandBufferInitInfo cmdbinit;
-	cmdbinit.m_flags = CommandBufferFlag::GENERAL_WORK;
-	if((inf.m_mipmapCount * faceCount * inf.m_layerCount * 4) < COMMAND_BUFFER_SMALL_BATCH_MAX_COMMANDS)
+	cmdbinit.m_flags = CommandBufferFlag::kGeneralWork;
+	if((inf.m_mipmapCount * faceCount * inf.m_layerCount * 4) < kCommandBufferSmallBatchMaxCommands)
 	{
-		cmdbinit.m_flags |= CommandBufferFlag::SMALL_BATCH;
+		cmdbinit.m_flags |= CommandBufferFlag::kSmallBatch;
 	}
 	CommandBufferPtr cmdb = m_gr->newCommandBuffer(cmdbinit);
 
@@ -487,7 +487,7 @@ TexturePtr Renderer::createAndClearRenderTarget(const TextureInitInfo& inf, Text
 				if(!useCompute)
 				{
 					FramebufferInitInfo fbInit("RendererClearRT");
-					Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS> colUsage = {};
+					Array<TextureUsageBit, kMaxColorRenderTargets> colUsage = {};
 					TextureUsageBit dsUsage = TextureUsageBit::kNone;
 
 					if(getFormatInfo(inf.m_format).isDepthStencil())

AnKi/Renderer/Scale.cpp

@@ -110,7 +110,7 @@ Error Scale::init()
 		GrUpscalerInitInfo inf;
 		inf.m_sourceTextureResolution = m_r->getInternalResolution();
 		inf.m_targetTextureResolution = m_r->getPostProcessResolution();
-		inf.m_upscalerType = GrUpscalerType::DLSS_2;
+		inf.m_upscalerType = GrUpscalerType::kDlss2;
 		inf.m_qualityMode = GrUpscalerQualityMode(dlssQuality - 1);
 
 		m_grUpscaler = getGrManager().newGrUpscaler(inf);

AnKi/Resource/ImageResource.cpp

@@ -209,7 +209,7 @@ Error ImageResource::load(const ResourceFilename& filename, Bool async)
 	// Transition it. TODO remove that eventually
 	{
 		CommandBufferInitInfo cmdbinit;
-		cmdbinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+		cmdbinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = getManager().getGrManager().newCommandBuffer(cmdbinit);
 
 		TextureSubresourceInfo subresource;
@@ -264,7 +264,7 @@ Error ImageResource::load(LoadingContext& ctx)
 		const U32 end = min(copyCount, b + MAX_COPIES_BEFORE_FLUSH);
 
 		CommandBufferInitInfo ci;
-		ci.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+		ci.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = ctx.m_gr->newCommandBuffer(ci);
 
 		// Set the barriers of the batch

AnKi/Resource/MeshResource.cpp

@@ -175,7 +175,7 @@ Error MeshResource::load(const ResourceFilename& filename, Bool async)
 	if(async)
 	{
 		CommandBufferInitInfo cmdbinit;
-		cmdbinit.m_flags = CommandBufferFlag::SMALL_BATCH | CommandBufferFlag::GENERAL_WORK;
+		cmdbinit.m_flags = CommandBufferFlag::kSmallBatch | CommandBufferFlag::kGeneralWork;
 		CommandBufferPtr cmdb = getManager().getGrManager().newCommandBuffer(cmdbinit);
 
 		cmdb->fillBuffer(m_vertexBuffer, m_vertexBuffersOffset, m_vertexBuffersSize, 0);
@@ -276,7 +276,7 @@ Error MeshResource::loadAsync(MeshBinaryLoader& loader) const
 	Array<TransferGpuAllocatorHandle, 2> handles;
 
 	CommandBufferInitInfo cmdbinit;
-	cmdbinit.m_flags = CommandBufferFlag::SMALL_BATCH | CommandBufferFlag::GENERAL_WORK;
+	cmdbinit.m_flags = CommandBufferFlag::kSmallBatch | CommandBufferFlag::kGeneralWork;
 	CommandBufferPtr cmdb = gr.newCommandBuffer(cmdbinit);
 
 	// Set barriers

AnKi/Resource/ModelResource.cpp

@@ -36,7 +36,7 @@ void ModelPatch::getRenderingInfo(const RenderingKey& key, ModelRenderingInfo& i
 	// Vertex attributes & bindings
 	{
 		U32 bufferBindingVisitedMask = 0;
-		Array<U32, MAX_VERTEX_ATTRIBUTES> realBufferBindingToVirtual;
+		Array<U32, kMaxVertexAttributes> realBufferBindingToVirtual;
 
 		inf.m_vertexAttributeCount = 0;
 		inf.m_vertexBufferBindingCount = 0;

AnKi/Resource/ModelResource.h

@@ -64,9 +64,9 @@ class ModelRenderingInfo
 public:
 	ShaderProgramPtr m_program;
 
-	Array<ModelVertexBufferBinding, MAX_VERTEX_ATTRIBUTES> m_vertexBufferBindings;
+	Array<ModelVertexBufferBinding, kMaxVertexAttributes> m_vertexBufferBindings;
 	U32 m_vertexBufferBindingCount;
-	Array<ModelVertexAttribute, MAX_VERTEX_ATTRIBUTES> m_vertexAttributes;
+	Array<ModelVertexAttribute, kMaxVertexAttributes> m_vertexAttributes;
 	U32 m_vertexAttributeCount;
 
 	BufferPtr m_indexBuffer;

AnKi/Resource/ShaderProgramResource.cpp

@@ -375,9 +375,9 @@ ShaderProgramResource::createNewVariant(const ShaderProgramResourceVariantInitIn
 		StringAuto progName(getTempAllocator());
 		getFilepathFilename(getFilename(), progName);
 		char* cprogName = const_cast<char*>(progName.cstr());
-		if(progName.getLength() > MAX_GR_OBJECT_NAME_LENGTH)
+		if(progName.getLength() > kMaxGrObjectNameLength)
 		{
-			cprogName[MAX_GR_OBJECT_NAME_LENGTH] = '\0';
+			cprogName[kMaxGrObjectNameLength] = '\0';
 		}
 
 		ShaderProgramInitInfo progInf(cprogName);

AnKi/ShaderCompiler/ShaderProgramParser.cpp

@@ -64,7 +64,7 @@ inline constexpr char SHADER_HEADER[] = R"(#version 460 core
 #extension GL_EXT_scalar_block_layout : enable
 
 #define ANKI_MAX_BINDLESS_TEXTURES %uu
-#define MAX_BINDLESS_READONLY_TEXTURE_BUFFERS %uu
+#define kMaxBindlessReadonlyTextureBuffers %uu
 
 #if defined(ANKI_RAY_GEN_SHADER) || defined(ANKI_ANY_HIT_SHADER) || defined(ANKI_CLOSEST_HIT_SHADER) || defined(ANKI_MISS_SHADER) || defined(ANKI_INTERSECTION_SHADER) || defined(ANKI_CALLABLE_SHADER)
 #	extension GL_EXT_ray_tracing : enable
@@ -75,7 +75,7 @@ inline constexpr char SHADER_HEADER[] = R"(#version 460 core
 	layout(set = s, binding = 0) uniform itexture2D u_bindlessTextures2dI32[ANKI_MAX_BINDLESS_TEXTURES]; \
 	layout(set = s, binding = 0) uniform texture2D u_bindlessTextures2dF32[ANKI_MAX_BINDLESS_TEXTURES]; \
 	layout(set = s, binding = 0) uniform texture2DArray u_bindlessTextures2dArrayF32[ANKI_MAX_BINDLESS_TEXTURES]; \
-	layout(set = s, binding = 1) uniform textureBuffer u_bindlessTextureBuffers[MAX_BINDLESS_READONLY_TEXTURE_BUFFERS];
+	layout(set = s, binding = 1) uniform textureBuffer u_bindlessTextureBuffers[kMaxBindlessReadonlyTextureBuffers];
 
 #define F32 float
 #define _ANKI_SIZEOF_float 4u
@@ -1196,8 +1196,8 @@ void ShaderProgramParser::generateAnkiShaderHeader(ShaderType shaderType, const
 												   StringAuto& header)
 {
 	header.sprintf(SHADER_HEADER, SHADER_STAGE_NAMES[shaderType].cstr(), compilerOptions.m_mobilePlatform,
-				   compilerOptions.m_forceFullFloatingPointPrecision, MAX_BINDLESS_TEXTURES,
-				   MAX_BINDLESS_READONLY_TEXTURE_BUFFERS);
+				   compilerOptions.m_forceFullFloatingPointPrecision, kMaxBindlessTextures,
+				   kMaxBindlessReadonlyTextureBuffers);
 }
 
 Error ShaderProgramParser::generateVariant(ConstWeakArray<MutatorValue> mutation,

AnKi/ShaderCompiler/ShaderProgramReflection.cpp

@@ -565,7 +565,7 @@ Error SpirvReflector::blockReflection(const spirv_cross::Resource& res, [[maybe_
 	if(!isPushConstant)
 	{
 		newBlock.m_set = get_decoration(res.id, spv::DecorationDescriptorSet);
-		if(newBlock.m_set >= MAX_DESCRIPTOR_SETS)
+		if(newBlock.m_set >= kMaxDescriptorSets)
 		{
 			ANKI_SHADER_COMPILER_LOGE("Too high descriptor set: %u", newBlock.m_set);
 			return Error::kUserData;
@@ -692,7 +692,7 @@ Error SpirvReflector::opaqueReflection(const spirv_cross::Resource& res, Dynamic
 
 	// Set
 	newOpaque.m_set = get_decoration(res.id, spv::DecorationDescriptorSet);
-	if(newOpaque.m_set >= MAX_DESCRIPTOR_SETS)
+	if(newOpaque.m_set >= kMaxDescriptorSets)
 	{
 		ANKI_SHADER_COMPILER_LOGE("Too high descriptor set: %u", newOpaque.m_set);
 		return Error::kUserData;

AnKi/Ui/Font.cpp

@@ -95,7 +95,7 @@ void Font::createTexture(const void* data, U32 width, U32 height)
 	// Do the copy
 	constexpr TextureSurfaceInfo surf(0, 0, 0, 0);
 	CommandBufferInitInfo cmdbInit;
-	cmdbInit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+	cmdbInit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr cmdb = m_manager->getGrManager().newCommandBuffer(cmdbInit);
 
 	TextureViewInitInfo viewInit(m_tex, surf, DepthStencilAspectBit::kNone, "TempFont");

Tests/Gr/Gr.cpp

@@ -418,7 +418,7 @@ ANKI_TEST(Gr, ClearScreen)
 		FramebufferPtr fb = createColorFb(*gr, presentTex);
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		presentBarrierA(cmdb, presentTex);
@@ -457,7 +457,7 @@ ANKI_TEST(Gr, SimpleDrawcall)
 		FramebufferPtr fb = createColorFb(*gr, presentTex);
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		cmdb->setViewport(0, 0, win->getWidth(), win->getHeight());
@@ -518,7 +518,7 @@ ANKI_TEST(Gr, ViewportAndScissor)
 		gr->beginFrame();
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		U idx = (i / 30) % 4;
@@ -621,7 +621,7 @@ ANKI_TEST(Gr, ViewportAndScissorOffscreen)
 		if(i == 0)
 		{
 			CommandBufferInitInfo cinit;
-			cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+			cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 			CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 			cmdb->setViewport(0, 0, RT_WIDTH, RT_HEIGHT);
@@ -635,7 +635,7 @@ ANKI_TEST(Gr, ViewportAndScissorOffscreen)
 		}
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		// Draw offscreen
@@ -739,7 +739,7 @@ ANKI_TEST(Gr, DrawWithUniforms)
 		FramebufferPtr fb = createColorFb(*gr, presentTex);
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		cmdb->setViewport(0, 0, win->getWidth(), win->getHeight());
@@ -823,7 +823,7 @@ ANKI_TEST(Gr, DrawWithVertex)
 		FramebufferPtr fb = createColorFb(*gr, presentTex);
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		cmdb->bindVertexBuffer(0, b, 0, sizeof(Vert));
@@ -947,7 +947,7 @@ ANKI_TEST(Gr, DrawWithTexture)
 								   0,   128, 0,   128, 0,   128, 128, 128, 128, 128, 255, 128, 0,   0,   128, 255}};
 
 	CommandBufferInitInfo cmdbinit;
-	cmdbinit.m_flags = CommandBufferFlag::GENERAL_WORK;
+	cmdbinit.m_flags = CommandBufferFlag::kGeneralWork;
 	CommandBufferPtr cmdb = gr->newCommandBuffer(cmdbinit);
 
 	// Set barriers
@@ -1052,7 +1052,7 @@ void main()
 		FramebufferPtr fb = createColorFb(*gr, presentTex);
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		cmdb->setViewport(0, 0, win->getWidth(), win->getHeight());
@@ -1191,7 +1191,7 @@ static void drawOffscreen(GrManager& gr, Bool useSecondLevel)
 		timer.start();
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork;
 		CommandBufferPtr cmdb = gr.newCommandBuffer(cinit);
 
 		cmdb->setPolygonOffset(0.0, 0.0);
@@ -1212,7 +1212,7 @@ static void drawOffscreen(GrManager& gr, Bool useSecondLevel)
 		else
 		{
 			CommandBufferInitInfo cinit;
-			cinit.m_flags = CommandBufferFlag::SECOND_LEVEL | CommandBufferFlag::GENERAL_WORK;
+			cinit.m_flags = CommandBufferFlag::kSecondLevel | CommandBufferFlag::kGeneralWork;
 			cinit.m_framebuffer = fb;
 			CommandBufferPtr cmdb2 = gr.newCommandBuffer(cinit);
 
@@ -1347,7 +1347,7 @@ ANKI_TEST(Gr, ImageLoadStore)
 
 		CommandBufferInitInfo cinit;
 		cinit.m_flags =
-			CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::COMPUTE_WORK | CommandBufferFlag::SMALL_BATCH;
+			CommandBufferFlag::kGeneralWork | CommandBufferFlag::kComputeWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		// Write image
@@ -1427,7 +1427,7 @@ ANKI_TEST(Gr, 3DTextures)
 	Array<U8, 4> mip1 = {{128, 128, 128, 0}};
 
 	CommandBufferInitInfo cmdbinit;
-	cmdbinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+	cmdbinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr cmdb = gr->newCommandBuffer(cmdbinit);
 
 	cmdb->setTextureVolumeBarrier(a, TextureUsageBit::kNone, TextureUsageBit::kTransferDestination,
@@ -1469,7 +1469,7 @@ ANKI_TEST(Gr, 3DTextures)
 		timer.start();
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		cmdb->setViewport(0, 0, WIDTH, HEIGHT);
@@ -1803,7 +1803,7 @@ void main()
 
 	// Upload data and test them
 	CommandBufferInitInfo cmdbInit;
-	cmdbInit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+	cmdbInit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr cmdb = gr->newCommandBuffer(cmdbInit);
 
 	TextureSubresourceInfo subresource;
@@ -1917,7 +1917,7 @@ void main()
 	// Draw
 
 	CommandBufferInitInfo cinit;
-	cinit.m_flags = CommandBufferFlag::GENERAL_WORK;
+	cinit.m_flags = CommandBufferFlag::kGeneralWork;
 	CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 	cmdb->setViewport(0, 0, WIDTH, HEIGHT);
@@ -2029,7 +2029,7 @@ void main()
 
 	// Draw
 	CommandBufferInitInfo cinit;
-	cinit.m_flags = CommandBufferFlag::GENERAL_WORK;
+	cinit.m_flags = CommandBufferFlag::kGeneralWork;
 	CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 	cmdb->fillBuffer(resultBuff, 0, resultBuff->getSize(), 0);
@@ -2119,7 +2119,7 @@ void main()
 
 	// Run
 	CommandBufferInitInfo cinit;
-	cinit.m_flags = CommandBufferFlag::COMPUTE_WORK | CommandBufferFlag::SMALL_BATCH;
+	cinit.m_flags = CommandBufferFlag::kComputeWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 	for(U32 i = 0; i < uniformBuffers.getSize(); ++i)
@@ -2217,7 +2217,7 @@ void main()
 
 	// Run
 	CommandBufferInitInfo cinit;
-	cinit.m_flags = CommandBufferFlag::COMPUTE_WORK | CommandBufferFlag::SMALL_BATCH;
+	cinit.m_flags = CommandBufferFlag::kComputeWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 	cmdb->setTextureSurfaceBarrier(texA, TextureUsageBit::kNone, TextureUsageBit::kTransferDestination,
@@ -2328,7 +2328,7 @@ void main()
 
 	// Run
 	CommandBufferInitInfo cinit;
-	cinit.m_flags = CommandBufferFlag::COMPUTE_WORK | CommandBufferFlag::SMALL_BATCH;
+	cinit.m_flags = CommandBufferFlag::kComputeWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 	cmdb->bindShaderProgram(prog);
@@ -2548,7 +2548,7 @@ void main()
 	if(useRayTracing)
 	{
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		cmdb->setAccelerationStructureBarrier(blas, AccelerationStructureUsageBit::kNone,
@@ -2578,7 +2578,7 @@ void main()
 		const Mat4 projMat = Mat4::calculatePerspectiveProjectionMatrix(toRad(90.0f), toRad(90.0f), 0.01f, 1000.0f);
 
 		CommandBufferInitInfo cinit;
-		cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+		cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		cmdb->setViewport(0, 0, WIDTH, HEIGHT);
@@ -3400,7 +3400,7 @@ void main()
 
 		CommandBufferInitInfo cinit;
 		cinit.m_flags =
-			CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::COMPUTE_WORK | CommandBufferFlag::SMALL_BATCH;
+			CommandBufferFlag::kGeneralWork | CommandBufferFlag::kComputeWork | CommandBufferFlag::kSmallBatch;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 		if(i == 0)
@@ -3589,21 +3589,21 @@ void main()
 
 	// Create the 1st command buffer
 	CommandBufferInitInfo cinit;
-	cinit.m_flags = CommandBufferFlag::COMPUTE_WORK | CommandBufferFlag::SMALL_BATCH;
+	cinit.m_flags = CommandBufferFlag::kComputeWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr incrementCmdb = gr->newCommandBuffer(cinit);
 	incrementCmdb->bindShaderProgram(incrementProg);
 	incrementCmdb->bindStorageBuffer(0, 0, atomicsBuffer, 0, kMaxPtrSize);
 	incrementCmdb->dispatchCompute(ARRAY_SIZE / 8, 1, 1);
 
 	// Create the 2nd command buffer
-	cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+	cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr checkCmdb = gr->newCommandBuffer(cinit);
 	checkCmdb->bindShaderProgram(checkProg);
 	checkCmdb->bindStorageBuffer(0, 0, atomicsBuffer, 0, kMaxPtrSize);
 	checkCmdb->dispatchCompute(ARRAY_SIZE / 8, 1, 1);
 
 	// Create the 3rd command buffer
-	cinit.m_flags = CommandBufferFlag::COMPUTE_WORK | CommandBufferFlag::SMALL_BATCH;
+	cinit.m_flags = CommandBufferFlag::kComputeWork | CommandBufferFlag::kSmallBatch;
 	CommandBufferPtr incrementCmdb2 = gr->newCommandBuffer(cinit);
 	incrementCmdb2->bindShaderProgram(incrementProg);
 	incrementCmdb2->bindStorageBuffer(0, 0, atomicsBuffer, 0, kMaxPtrSize);

Tests/Gr/GrTextureBuffer.cpp

@@ -56,7 +56,7 @@ void main()
 		BufferPtr storageBuff = gr->newBuffer(buffInit);
 
 		CommandBufferInitInfo cmdbInit;
-		cmdbInit.m_flags = CommandBufferFlag::SMALL_BATCH | CommandBufferFlag::GENERAL_WORK;
+		cmdbInit.m_flags = CommandBufferFlag::kSmallBatch | CommandBufferFlag::kGeneralWork;
 		CommandBufferPtr cmdb = gr->newCommandBuffer(cmdbInit);
 
 		cmdb->bindReadOnlyTextureBuffer(0, 0, texBuff, 0, kMaxPtrSize, Format::kR8G8B8A8_Snorm);

Tests/Ui/Ui.cpp

@@ -122,7 +122,7 @@ ANKI_TEST(Ui, Ui)
 			}
 
 			CommandBufferInitInfo cinit;
-			cinit.m_flags = CommandBufferFlag::GENERAL_WORK | CommandBufferFlag::SMALL_BATCH;
+			cinit.m_flags = CommandBufferFlag::kGeneralWork | CommandBufferFlag::kSmallBatch;
 			CommandBufferPtr cmdb = gr->newCommandBuffer(cinit);
 
 			cmdb->setTextureBarrier(presentTex, TextureUsageBit::kNone, TextureUsageBit::kFramebufferWrite,