Browse Source

Some code style refactoring #2

Panagiotis Christopoulos Charitos 3 years ago
parent
commit
e9859f97ea
100 changed files with 400 additions and 400 deletions
  1. 2 2
      AnKi/Collision/Aabb.cpp
  2. 2 2
      AnKi/Collision/Aabb.h
  3. 2 2
      AnKi/Collision/Cone.h
  4. 1 1
      AnKi/Collision/ConvexHullShape.cpp
  5. 2 2
      AnKi/Collision/FunctionsComputeAabb.cpp
  6. 4 4
      AnKi/Collision/FunctionsTestCollision.cpp
  7. 2 2
      AnKi/Collision/FunctionsTestPlane.cpp
  8. 2 2
      AnKi/Collision/LineSegment.h
  9. 2 2
      AnKi/Collision/Obb.cpp
  10. 6 6
      AnKi/Collision/Obb.h
  11. 3 3
      AnKi/Collision/Plane.h
  12. 2 2
      AnKi/Collision/Ray.h
  13. 3 3
      AnKi/Collision/Sphere.cpp
  14. 1 1
      AnKi/Collision/Sphere.h
  15. 3 3
      AnKi/Core/App.cpp
  16. 1 1
      AnKi/Core/App.h
  17. 5 5
      AnKi/Core/ConfigSet.cpp
  18. 1 1
      AnKi/Core/ConfigVars.defs.h
  19. 5 5
      AnKi/Core/CoreTracer.cpp
  20. 1 1
      AnKi/Core/DeveloperConsole.cpp
  21. 6 6
      AnKi/Core/GpuMemoryPools.cpp
  22. 2 2
      AnKi/Core/GpuMemoryPools.h
  23. 2 2
      AnKi/Core/NativeWindowAndroid.cpp
  24. 1 1
      AnKi/Core/NativeWindowHeadless.cpp
  25. 6 6
      AnKi/Core/NativeWindowSdl.cpp
  26. 1 1
      AnKi/Core/StatsUi.cpp
  27. 2 2
      AnKi/Core/StdinListener.cpp
  28. 3 3
      AnKi/Gr/Buffer.h
  29. 6 6
      AnKi/Gr/CommandBuffer.h
  30. 1 1
      AnKi/Gr/Common.cpp
  31. 6 6
      AnKi/Gr/Common.h
  32. 1 1
      AnKi/Gr/Gl/Buffer.cpp
  33. 3 3
      AnKi/Gr/Gl/BufferImpl.h
  34. 43 43
      AnKi/Gr/Gl/CommandBuffer.cpp
  35. 8 8
      AnKi/Gr/Gl/CommandBufferImpl.cpp
  36. 2 2
      AnKi/Gr/Gl/Fence.cpp
  37. 1 1
      AnKi/Gr/Gl/FenceImpl.cpp
  38. 5 5
      AnKi/Gr/Gl/FramebufferImpl.cpp
  39. 3 3
      AnKi/Gr/Gl/GlObject.cpp
  40. 2 2
      AnKi/Gr/Gl/GlState.cpp
  41. 2 2
      AnKi/Gr/Gl/GlState.h
  42. 1 1
      AnKi/Gr/Gl/GrManagerImpl.cpp
  43. 5 5
      AnKi/Gr/Gl/GrManagerImplSdl.cpp
  44. 1 1
      AnKi/Gr/Gl/OcclusionQuery.cpp
  45. 6 6
      AnKi/Gr/Gl/RenderingThread.cpp
  46. 1 1
      AnKi/Gr/Gl/Sampler.cpp
  47. 2 2
      AnKi/Gr/Gl/ShaderImpl.cpp
  48. 2 2
      AnKi/Gr/Gl/ShaderProgramImpl.cpp
  49. 8 8
      AnKi/Gr/Gl/StateTracker.h
  50. 1 1
      AnKi/Gr/Gl/Texture.cpp
  51. 1 1
      AnKi/Gr/Gl/TextureImpl.cpp
  52. 1 1
      AnKi/Gr/Gl/TextureView.cpp
  53. 3 3
      AnKi/Gr/RenderGraph.cpp
  54. 11 11
      AnKi/Gr/RenderGraph.h
  55. 2 2
      AnKi/Gr/RenderGraph.inl.h
  56. 1 1
      AnKi/Gr/Shader.h
  57. 10 10
      AnKi/Gr/TextureView.h
  58. 3 3
      AnKi/Gr/Utils/FrameGpuAllocator.cpp
  59. 1 1
      AnKi/Gr/Utils/FrameGpuAllocator.h
  60. 3 3
      AnKi/Gr/Vulkan/AccelerationStructureImpl.cpp
  61. 10 10
      AnKi/Gr/Vulkan/BufferImpl.cpp
  62. 1 1
      AnKi/Gr/Vulkan/BufferImpl.h
  63. 7 7
      AnKi/Gr/Vulkan/CommandBufferFactory.cpp
  64. 2 2
      AnKi/Gr/Vulkan/CommandBufferImpl.cpp
  65. 3 3
      AnKi/Gr/Vulkan/CommandBufferImpl.h
  66. 1 1
      AnKi/Gr/Vulkan/CommandBufferImpl.inl.h
  67. 1 1
      AnKi/Gr/Vulkan/Common.h
  68. 16 16
      AnKi/Gr/Vulkan/DescriptorSet.cpp
  69. 3 3
      AnKi/Gr/Vulkan/DescriptorSet.h
  70. 1 1
      AnKi/Gr/Vulkan/FenceFactory.h
  71. 3 3
      AnKi/Gr/Vulkan/FramebufferImpl.cpp
  72. 3 3
      AnKi/Gr/Vulkan/GpuMemoryManager.cpp
  73. 5 5
      AnKi/Gr/Vulkan/GpuMemoryManager.h
  74. 31 31
      AnKi/Gr/Vulkan/GrManagerImpl.cpp
  75. 3 3
      AnKi/Gr/Vulkan/GrManagerImpl.h
  76. 1 1
      AnKi/Gr/Vulkan/GrManagerImplAndroid.cpp
  77. 1 1
      AnKi/Gr/Vulkan/GrManagerImplHeadless.cpp
  78. 2 2
      AnKi/Gr/Vulkan/GrManagerImplSdl.cpp
  79. 6 6
      AnKi/Gr/Vulkan/GrUpscalerImpl.cpp
  80. 3 3
      AnKi/Gr/Vulkan/GrUpscalerImpl.h
  81. 1 1
      AnKi/Gr/Vulkan/MicroObjectRecycler.h
  82. 1 1
      AnKi/Gr/Vulkan/OcclusionQueryImpl.cpp
  83. 1 1
      AnKi/Gr/Vulkan/Pipeline.h
  84. 2 2
      AnKi/Gr/Vulkan/PipelineCache.cpp
  85. 1 1
      AnKi/Gr/Vulkan/PipelineLayout.cpp
  86. 2 2
      AnKi/Gr/Vulkan/QueryFactory.cpp
  87. 2 2
      AnKi/Gr/Vulkan/QueryFactory.h
  88. 2 2
      AnKi/Gr/Vulkan/SamplerFactory.cpp
  89. 3 3
      AnKi/Gr/Vulkan/ShaderImpl.cpp
  90. 1 1
      AnKi/Gr/Vulkan/ShaderProgramImpl.cpp
  91. 8 8
      AnKi/Gr/Vulkan/SwapchainFactory.cpp
  92. 10 10
      AnKi/Gr/Vulkan/TextureImpl.cpp
  93. 3 3
      AnKi/Gr/Vulkan/TextureImpl.h
  94. 2 2
      AnKi/Gr/Vulkan/TextureViewImpl.cpp
  95. 1 1
      AnKi/Gr/Vulkan/TextureViewImpl.h
  96. 1 1
      AnKi/Gr/Vulkan/TimestampQueryImpl.cpp
  97. 28 28
      AnKi/Importer/GltfImporter.cpp
  98. 1 1
      AnKi/Importer/GltfImporter.h
  99. 4 4
      AnKi/Importer/GltfImporterAnimation.cpp
  100. 4 4
      AnKi/Importer/GltfImporterMaterial.cpp

+ 2 - 2
AnKi/Collision/Aabb.cpp

@@ -48,8 +48,8 @@ void Aabb::setFromPointCloud(const Vec3* pointBuffer, U pointCount, PtrSize poin
 	ANKI_ASSERT((pointStride % sizeof(F32)) == 0 && "Weird strides that breaks strict aliasing rules");
 	ANKI_ASSERT(buffSize >= pointStride * pointCount);
 
-	m_min = Vec4(Vec3(MAX_F32), 0.0f);
-	m_max = Vec4(Vec3(MIN_F32), 0.0f);
+	m_min = Vec4(Vec3(kMaxF32), 0.0f);
+	m_max = Vec4(Vec3(kMinF32), 0.0f);
 
 	// Iterate
 	const U8* ptr = reinterpret_cast<const U8*>(pointBuffer);

+ 2 - 2
AnKi/Collision/Aabb.h

@@ -106,13 +106,13 @@ public:
 private:
 	Vec4 m_min
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 
 	Vec4 m_max
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MIN_F32)
+		= Vec4(kMinF32)
 #endif
 		;
 

+ 2 - 2
AnKi/Collision/Cone.h

@@ -107,13 +107,13 @@ public:
 private:
 	Vec4 m_origin
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 
 	Vec4 m_dir
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 

+ 1 - 1
AnKi/Collision/ConvexHullShape.cpp

@@ -32,7 +32,7 @@ Vec4 ConvexHullShape::computeSupport(const Vec4& dir) const
 {
 	check();
 
-	F32 m = MIN_F32;
+	F32 m = kMinF32;
 	U index = 0;
 
 	const Vec4 d = (m_trfIdentity) ? dir : (m_invTrf.getRotation() * dir).xyz0();

+ 2 - 2
AnKi/Collision/FunctionsComputeAabb.cpp

@@ -38,8 +38,8 @@ Aabb computeAabb(const Obb& obb)
 
 Aabb computeAabb(const ConvexHullShape& hull)
 {
-	Vec4 mina(MAX_F32);
-	Vec4 maxa(MIN_F32);
+	Vec4 mina(kMaxF32);
+	Vec4 maxa(kMinF32);
 
 	for(const Vec4& point : hull.getPoints())
 	{

+ 4 - 4
AnKi/Collision/FunctionsTestCollision.cpp

@@ -112,8 +112,8 @@ Bool testCollision(const Aabb& aabb, const ConvexHullShape& hull)
 
 Bool testCollision(const Aabb& aabb, const LineSegment& ls)
 {
-	F32 maxS = MIN_F32;
-	F32 minT = MAX_F32;
+	F32 maxS = kMinF32;
+	F32 minT = kMaxF32;
 
 	// do tests against three sets of planes
 	for(U i = 0; i < 3; ++i)
@@ -235,8 +235,8 @@ Bool testCollision(const Obb& obb, const ConvexHullShape& hull)
 
 Bool testCollision(const Obb& obb, const LineSegment& ls)
 {
-	F32 maxS = MIN_F32;
-	F32 minT = MAX_F32;
+	F32 maxS = kMinF32;
+	F32 minT = kMaxF32;
 
 	// compute difference vector
 	const Vec4 diff = obb.getCenter() - ls.getOrigin();

+ 2 - 2
AnKi/Collision/FunctionsTestPlane.cpp

@@ -119,8 +119,8 @@ F32 testPlane(const Plane& plane, const ConvexHullShape& hull)
 	// Compute the invert transformation of the plane instead
 	const Plane pa = (hull.isTransformIdentity()) ? plane : plane.getTransformed(hull.getInvertTransform());
 
-	F32 minDist = MAX_F32;
-	F32 maxDist = MIN_F32;
+	F32 minDist = kMaxF32;
+	F32 maxDist = kMinF32;
 
 	ConstWeakArray<Vec4> points = hull.getPoints();
 	for(const Vec4& point : points)

+ 2 - 2
AnKi/Collision/LineSegment.h

@@ -78,13 +78,13 @@ public:
 private:
 	Vec4 m_origin ///< P0
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 
 	Vec4 m_dir ///< P1 = origin+dir so dir = P1-origin
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 

+ 2 - 2
AnKi/Collision/Obb.cpp

@@ -83,8 +83,8 @@ void Obb::setFromPointCloud(const Vec3* pointBuffer, U pointCount, PtrSize point
 	ANKI_ASSERT(pointStride >= sizeof(Vec3));
 	ANKI_ASSERT(buffSize >= pointStride * pointCount);
 
-	Vec4 min = Vec4(Vec3(MAX_F32), 0.0);
-	Vec4 max = Vec4(Vec3(MIN_F32), 0.0);
+	Vec4 min = Vec4(Vec3(kMaxF32), 0.0);
+	Vec4 max = Vec4(Vec3(kMinF32), 0.0);
 
 	// Iterate
 	const U8* ptr = reinterpret_cast<const U8*>(pointBuffer);

+ 6 - 6
AnKi/Collision/Obb.h

@@ -110,27 +110,27 @@ public:
 private:
 	Vec4 m_center
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 
 	Vec4 m_extend /// With identity rotation this points to max (front, right, top in our case)
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 
 	Mat3x4 m_rotation
 #if ANKI_ENABLE_ASSERTIONS
-		= Mat3x4(MAX_F32)
+		= Mat3x4(kMaxF32)
 #endif
 		;
 
 	void check() const
 	{
-		ANKI_ASSERT(m_center != Vec4(MAX_F32));
-		ANKI_ASSERT(m_extend != Vec4(MAX_F32));
-		ANKI_ASSERT(m_rotation != Mat3x4(MAX_F32));
+		ANKI_ASSERT(m_center != Vec4(kMaxF32));
+		ANKI_ASSERT(m_extend != Vec4(kMaxF32));
+		ANKI_ASSERT(m_rotation != Mat3x4(kMaxF32));
 		ANKI_ASSERT(m_center.w() == 0.0f && m_extend.w() == 0.0f);
 	}
 };

+ 3 - 3
AnKi/Collision/Plane.h

@@ -91,20 +91,20 @@ public:
 private:
 	Vec4 m_normal
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 
 	F32 m_offset
 #if ANKI_ENABLE_ASSERTIONS
-		= MAX_F32
+		= kMaxF32
 #endif
 		;
 
 	void check() const
 	{
 		ANKI_ASSERT(m_normal.w() == 0.0f);
-		ANKI_ASSERT(m_offset != MAX_F32);
+		ANKI_ASSERT(m_offset != kMaxF32);
 	}
 };
 /// @}

+ 2 - 2
AnKi/Collision/Ray.h

@@ -96,13 +96,13 @@ public:
 private:
 	Vec4 m_origin
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 
 	Vec4 m_dir
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 

+ 3 - 3
AnKi/Collision/Sphere.cpp

@@ -36,8 +36,8 @@ void Sphere::setFromPointCloud(const Vec3* pointBuffer, U pointCount, PtrSize po
 {
 	// Calc center
 	{
-		Vec4 min(Vec3(MAX_F32), 0.0f);
-		Vec4 max(Vec3(MIN_F32), 0.0f);
+		Vec4 min(Vec3(kMaxF32), 0.0f);
+		Vec4 max(Vec3(kMinF32), 0.0f);
 
 		// Iterate
 		const U8* ptr = reinterpret_cast<const U8*>(pointBuffer);
@@ -57,7 +57,7 @@ void Sphere::setFromPointCloud(const Vec3* pointBuffer, U pointCount, PtrSize po
 
 	// Calc radius
 	{
-		F32 maxDist = MIN_F32;
+		F32 maxDist = kMinF32;
 
 		const U8* ptr = reinterpret_cast<const U8*>(pointBuffer);
 		while(pointCount-- != 0)

+ 1 - 1
AnKi/Collision/Sphere.h

@@ -112,7 +112,7 @@ public:
 private:
 	Vec4 m_center
 #if ANKI_ENABLE_ASSERTIONS
-		= Vec4(MAX_F32)
+		= Vec4(kMaxF32)
 #endif
 		;
 

+ 3 - 3
AnKi/Core/App.cpp

@@ -371,7 +371,7 @@ Error App::initInternal(AllocAlignedCallback allocCb, void* allocCbUserData)
 
 	ANKI_CORE_LOGI("Application initialized");
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error App::initDirs()
@@ -412,7 +412,7 @@ Error App::initDirs()
 		ANKI_CHECK(createDirectory(m_cacheDir.toCString()));
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error App::mainLoop()
@@ -541,7 +541,7 @@ Error App::mainLoop()
 #endif
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void App::injectUiElements(DynamicArrayAuto<UiQueueElement>& newUiElementArr, RenderQueue& rqueue)

+ 1 - 1
AnKi/Core/App.h

@@ -86,7 +86,7 @@ public:
 	virtual Error userMainLoop([[maybe_unused]] Bool& quit, [[maybe_unused]] Second elapsedTime)
 	{
 		// Do nothing
-		return Error::NONE;
+		return Error::kNone;
 	}
 
 	const ConfigSet& getConfig() const

+ 5 - 5
AnKi/Core/ConfigSet.cpp

@@ -143,7 +143,7 @@ Error ConfigSet::loadFromFile(CString filename)
 		else \
 		{ \
 			ANKI_CORE_LOGE("Wrong value for %s", m_##name.m_name.cstr()); \
-			return Error::USER_DATA; \
+			return Error::kUserData; \
 		} \
 	}
 
@@ -159,7 +159,7 @@ Error ConfigSet::loadFromFile(CString filename)
 #include <AnKi/Core/AllConfigVars.defs.h>
 #undef ANKI_NUMERIC
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error ConfigSet::saveToFile(CString filename) const
@@ -192,7 +192,7 @@ Error ConfigSet::saveToFile(CString filename) const
 #undef ANKI_NUMERIC_UINT
 
 	ANKI_CHECK(file.writeText("</config>\n"));
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error ConfigSet::setFromCommandLineArguments(U32 cmdLineArgsCount, char* cmdLineArgs[])
@@ -209,7 +209,7 @@ Error ConfigSet::setFromCommandLineArguments(U32 cmdLineArgsCount, char* cmdLine
 		if(i >= cmdLineArgsCount)
 		{
 			ANKI_CORE_LOGE("Expecting a command line argument after %s", varName.cstr());
-			return Error::USER_DATA;
+			return Error::kUserData;
 		}
 
 		ANKI_ASSERT(cmdLineArgs[i]);
@@ -254,7 +254,7 @@ Error ConfigSet::setFromCommandLineArguments(U32 cmdLineArgsCount, char* cmdLine
 		}
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 1 - 1
AnKi/Core/ConfigVars.defs.h

@@ -17,7 +17,7 @@ ANKI_CONFIG_VAR_U32(Width, 1920, 16, 16 * 1024, "Width")
 ANKI_CONFIG_VAR_U32(Height, 1080, 16, 16 * 1024, "Height")
 ANKI_CONFIG_VAR_U32(WindowFullscreen, 1, 0, 2, "0: windowed, 1: borderless fullscreen, 2: exclusive fullscreen")
 
-ANKI_CONFIG_VAR_U32(CoreTargetFps, 60u, 30u, MAX_U32, "Target FPS")
+ANKI_CONFIG_VAR_U32(CoreTargetFps, 60u, 30u, kMaxU32, "Target FPS")
 ANKI_CONFIG_VAR_U32(CoreJobThreadCount, max(2u, getCpuCoresCount() / 2u), 2u, 1024u, "Number of job thread")
 ANKI_CONFIG_VAR_U32(CoreDisplayStats, 0, 0, 2, "Display stats, 0: None, 1: Simple, 2: Detailed")
 ANKI_CONFIG_VAR_BOOL(CoreClearCaches, false, "Clear all caches")

+ 5 - 5
AnKi/Core/CoreTracer.cpp

@@ -126,12 +126,12 @@ Error CoreTracer::init(GenericMemoryPoolAllocator<U8> alloc, CString directory)
 
 	ANKI_CHECK(m_countersCsvFile.open(StringAuto(alloc).sprintf("%scounters.csv", fname.cstr()), FileOpenFlag::WRITE));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error CoreTracer::threadWorker()
 {
-	Error err = Error::NONE;
+	Error err = Error::kNone;
 	Bool quit = false;
 
 	while(!err && !quit)
@@ -200,7 +200,7 @@ Error CoreTracer::writeEvents(ThreadWorkItem& item)
 	// Store counters
 	// TODO
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void CoreTracer::gatherCounters(ThreadWorkItem& item)
@@ -334,7 +334,7 @@ Error CoreTracer::writeCountersForReal()
 {
 	if(!m_countersCsvFile.isOpen() || m_frameCounters.getSize() == 0)
 	{
-		return Error::NONE;
+		return Error::kNone;
 	}
 
 	// Write the header
@@ -385,7 +385,7 @@ Error CoreTracer::writeCountersForReal()
 		ANKI_CHECK(m_countersCsvFile.writeText("\n"));
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 1 - 1
AnKi/Core/DeveloperConsole.cpp

@@ -32,7 +32,7 @@ Error DeveloperConsole::init(AllocAlignedCallback allocCb, void* allocCbUserData
 
 	ANKI_CHECK(m_scriptEnv.init(scriptManager));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void DeveloperConsole::build(CanvasPtr ctx)

+ 6 - 6
AnKi/Core/GpuMemoryPools.cpp

@@ -25,7 +25,7 @@ Error VertexGpuMemoryPool::init(GenericMemoryPoolAllocator<U8> alloc, GrManager*
 	if(!isPowerOfTwo(bufferInit.m_size))
 	{
 		ANKI_CORE_LOGE("core_globalVertexMemorySize should be a power of two (because of the buddy allocator");
-		return Error::USER_DATA;
+		return Error::kUserData;
 	}
 
 	bufferInit.m_usage = BufferUsageBit::VERTEX | BufferUsageBit::INDEX | BufferUsageBit::TRANSFER_DESTINATION;
@@ -39,7 +39,7 @@ Error VertexGpuMemoryPool::init(GenericMemoryPoolAllocator<U8> alloc, GrManager*
 	// Init the rest
 	m_buddyAllocator.init(alloc, __builtin_ctzll(bufferInit.m_size));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error VertexGpuMemoryPool::allocate(PtrSize size, PtrSize& offset)
@@ -53,12 +53,12 @@ Error VertexGpuMemoryPool::allocate(PtrSize size, PtrSize& offset)
 		ANKI_CORE_LOGE("Failed to allocate vertex memory of size %zu. The allocator has %zu (user requested %zu) out "
 					   "%zu allocated",
 					   size, stats.m_realAllocatedSize, stats.m_userAllocatedSize, m_vertBuffer->getSize());
-		return Error::OUT_OF_MEMORY;
+		return Error::kOutOfMemory;
 	}
 
 	offset = offset32;
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void VertexGpuMemoryPool::free(PtrSize size, PtrSize offset)
@@ -95,12 +95,12 @@ Error StagingGpuMemoryPool::init(GrManager* gr, const ConfigSet& cfg)
 			   gr->getDeviceCapabilities().m_storageBufferMaxRange, BufferUsageBit::ALL_STORAGE | BufferUsageBit::SBT,
 			   *gr);
 
-	initBuffer(StagingGpuMemoryType::VERTEX, 16, MAX_U32, BufferUsageBit::VERTEX | BufferUsageBit::INDEX, *gr);
+	initBuffer(StagingGpuMemoryType::VERTEX, 16, kMaxU32, BufferUsageBit::VERTEX | BufferUsageBit::INDEX, *gr);
 
 	initBuffer(StagingGpuMemoryType::TEXTURE, gr->getDeviceCapabilities().m_textureBufferBindOffsetAlignment,
 			   gr->getDeviceCapabilities().m_textureBufferMaxRange, BufferUsageBit::ALL_TEXTURE, *gr);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void StagingGpuMemoryPool::initBuffer(StagingGpuMemoryType type, U32 alignment, PtrSize maxAllocSize,

+ 2 - 2
AnKi/Core/GpuMemoryPools.h

@@ -82,12 +82,12 @@ public:
 
 	void markUnused()
 	{
-		m_offset = m_range = MAX_U32;
+		m_offset = m_range = kMaxU32;
 	}
 
 	Bool isUnused() const
 	{
-		return m_offset == MAX_U32 && m_range == MAX_U32;
+		return m_offset == kMaxU32 && m_range == kMaxU32;
 	}
 };
 

+ 2 - 2
AnKi/Core/NativeWindowAndroid.cpp

@@ -24,7 +24,7 @@ Error NativeWindow::newInstance(const NativeWindowInitInfo& initInfo, NativeWind
 	else
 	{
 		nativeWindow = andwin;
-		return Error::NONE;
+		return Error::kNone;
 	}
 }
 
@@ -94,7 +94,7 @@ Error NativeWindowAndroid::init([[maybe_unused]] const NativeWindowInitInfo& ini
 	m_width = ANativeWindow_getWidth(g_androidApp->window);
 	m_height = ANativeWindow_getHeight(g_androidApp->window);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 1 - 1
AnKi/Core/NativeWindowHeadless.cpp

@@ -16,7 +16,7 @@ Error NativeWindow::newInstance(const NativeWindowInitInfo& initInfo, NativeWind
 	hwin->m_height = initInfo.m_height;
 
 	nativeWindow = hwin;
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void NativeWindow::deleteInstance(NativeWindow* window)

+ 6 - 6
AnKi/Core/NativeWindowSdl.cpp

@@ -28,7 +28,7 @@ Error NativeWindow::newInstance(const NativeWindowInitInfo& initInfo, NativeWind
 	else
 	{
 		nativeWindow = sdlwin;
-		return Error::NONE;
+		return Error::kNone;
 	}
 }
 
@@ -64,14 +64,14 @@ Error NativeWindowSdl::init(const NativeWindowInitInfo& init)
 	if(SDL_Init(INIT_SUBSYSTEMS) != 0)
 	{
 		ANKI_CORE_LOGE("SDL_Init() failed: %s", SDL_GetError());
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 #if ANKI_GR_BACKEND_VULKAN
 	if(SDL_Vulkan_LoadLibrary(nullptr))
 	{
 		ANKI_CORE_LOGE("SDL_Vulkan_LoadLibrary() failed: %s", SDL_GetError());
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 #endif
 
@@ -110,7 +110,7 @@ Error NativeWindowSdl::init(const NativeWindowInitInfo& init)
 		if(SDL_GetDesktopDisplayMode(0, &mode))
 		{
 			ANKI_CORE_LOGE("SDL_GetDesktopDisplayMode() failed: %s", SDL_GetError());
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		m_width = mode.w;
@@ -128,7 +128,7 @@ Error NativeWindowSdl::init(const NativeWindowInitInfo& init)
 	if(m_window == nullptr)
 	{
 		ANKI_CORE_LOGE("SDL_CreateWindow() failed");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	// Final check
@@ -139,7 +139,7 @@ Error NativeWindowSdl::init(const NativeWindowInitInfo& init)
 	}
 
 	ANKI_CORE_LOGI("SDL window created");
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 1 - 1
AnKi/Core/StatsUi.cpp

@@ -18,7 +18,7 @@ Error StatsUi::init()
 {
 	ANKI_CHECK(m_manager->newInstance(m_font, "EngineAssets/UbuntuMonoRegular.ttf", Array<U32, 1>{24}));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void StatsUi::labelBytes(PtrSize val, CString name) const

+ 2 - 2
AnKi/Core/StdinListener.cpp

@@ -32,7 +32,7 @@ Error StdinListener::create(HeapAllocator<String>& alloc)
 	m_alloc = alloc;
 	m_thrd.start(this, workingFunc);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error StdinListener::workingFunc(ThreadCallbackInfo& info)
@@ -52,7 +52,7 @@ Error StdinListener::workingFunc(ThreadCallbackInfo& info)
 		self.m_q.getBack().create(alloc, &buff[0]);
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 String StdinListener::getLine()

+ 3 - 3
AnKi/Gr/Buffer.h

@@ -71,18 +71,18 @@ public:
 
 	/// Map the buffer.
 	/// @param offset The starting offset.
-	/// @param range The range to map or MAX_PTR_SIZE to map until the end.
+	/// @param range The range to map or kMaxPtrSize to map until the end.
 	/// @param access The access to the buffer.
 	void* map(PtrSize offset, PtrSize range, BufferMapAccessBit access);
 
 	/// Flush the buffer from the CPU caches. Call it to make the buffer memory available to the GPU.
 	/// @param offset The starting offset.
-	/// @param range The range to map or MAX_PTR_SIZE to map until the end.
+	/// @param range The range to map or kMaxPtrSize to map until the end.
 	void flush(PtrSize offset, PtrSize range) const;
 
 	/// Invalidate the buffer from the CPU caches. Call it to ready the buffer to see GPU updates.
 	/// @param offset The starting offset.
-	/// @param range The range to map or MAX_PTR_SIZE to map until the end.
+	/// @param range The range to map or kMaxPtrSize to map until the end.
 	void invalidate(PtrSize offset, PtrSize range) const;
 
 	/// Convenience map method.

+ 6 - 6
AnKi/Gr/CommandBuffer.h

@@ -179,7 +179,7 @@ public:
 	/// @param binding The binding to bind to.
 	/// @param[in,out] buff The buffer to bind.
 	/// @param offset The base of the binding.
-	/// @param range The bytes to bind starting from the offset. If it's MAX_PTR_SIZE then map from offset to the end
+	/// @param range The bytes to bind starting from the offset. If it's kMaxPtrSize then map from offset to the end
 	///              of the buffer.
 	/// @param arrayIdx The array index if the binding is an array.
 	void bindUniformBuffer(U32 set, U32 binding, const BufferPtr& buff, PtrSize offset, PtrSize range,
@@ -190,7 +190,7 @@ public:
 	/// @param binding The binding to bind to.
 	/// @param[in,out] buff The buffer to bind.
 	/// @param offset The base of the binding.
-	/// @param range The bytes to bind starting from the offset. If it's MAX_PTR_SIZE then map from offset to the end
+	/// @param range The bytes to bind starting from the offset. If it's kMaxPtrSize then map from offset to the end
 	///              of the buffer.
 	/// @param arrayIdx The array index if the binding is an array.
 	void bindStorageBuffer(U32 set, U32 binding, const BufferPtr& buff, PtrSize offset, PtrSize range,
@@ -208,7 +208,7 @@ public:
 	/// @param binding The binding to bind to.
 	/// @param[in,out] buff The buffer to bind.
 	/// @param offset The base of the binding.
-	/// @param range The bytes to bind starting from the offset. If it's MAX_PTR_SIZE then map from offset to the end
+	/// @param range The bytes to bind starting from the offset. If it's kMaxPtrSize then map from offset to the end
 	///              of the buffer.
 	/// @param fmt The format of the buffer.
 	/// @param arrayIdx The array index if the binding is an array.
@@ -236,8 +236,8 @@ public:
 	/// bigger than the render area the results are undefined.
 	void beginRenderPass(const FramebufferPtr& fb,
 						 const Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS>& colorAttachmentUsages,
-						 TextureUsageBit depthStencilAttachmentUsage, U32 minx = 0, U32 miny = 0, U32 width = MAX_U32,
-						 U32 height = MAX_U32);
+						 TextureUsageBit depthStencilAttachmentUsage, U32 minx = 0, U32 miny = 0, U32 width = kMaxU32,
+						 U32 height = kMaxU32);
 
 	/// End renderpass.
 	void endRenderPass();
@@ -321,7 +321,7 @@ public:
 	/// Fill a buffer with some value.
 	/// @param[in,out] buff The buffer to fill.
 	/// @param offset From where to start filling. Must be multiple of 4.
-	/// @param size The bytes to fill. Must be multiple of 4 or MAX_PTR_SIZE to indicate the whole buffer.
+	/// @param size The bytes to fill. Must be multiple of 4 or kMaxPtrSize to indicate the whole buffer.
 	/// @param value The value to fill the buffer with.
 	void fillBuffer(const BufferPtr& buff, PtrSize offset, PtrSize size, U32 value);
 

+ 1 - 1
AnKi/Gr/Common.cpp

@@ -12,7 +12,7 @@ namespace anki {
 inline constexpr ShaderVariableDataTypeInfo SVD_INFOS[] = {
 #define ANKI_SVDT_MACRO(capital, type, baseType, rowCount, columnCount, isIntagralType) \
 	{ANKI_STRINGIZE(type), sizeof(type), false, isIntagralType},
-#define ANKI_SVDT_MACRO_OPAQUE(capital, type) {ANKI_STRINGIZE(type), MAX_U32, true, false},
+#define ANKI_SVDT_MACRO_OPAQUE(capital, type) {ANKI_STRINGIZE(type), kMaxU32, true, false},
 #include <AnKi/Gr/ShaderVariableDataType.defs.h>
 #undef ANKI_SVDT_MACRO
 #undef ANKI_SVDT_MACRO_OPAQUE

+ 6 - 6
AnKi/Gr/Common.h

@@ -121,19 +121,19 @@ class GpuDeviceCapabilities
 {
 public:
 	/// The alignment of offsets when bounding uniform buffers.
-	U32 m_uniformBufferBindOffsetAlignment = MAX_U32;
+	U32 m_uniformBufferBindOffsetAlignment = kMaxU32;
 
 	/// The max visible range of uniform buffers inside the shaders.
 	PtrSize m_uniformBufferMaxRange = 0;
 
 	/// The alignment of offsets when bounding storage buffers.
-	U32 m_storageBufferBindOffsetAlignment = MAX_U32;
+	U32 m_storageBufferBindOffsetAlignment = kMaxU32;
 
 	/// The max visible range of storage buffers inside the shaders.
 	PtrSize m_storageBufferMaxRange = 0;
 
 	/// The alignment of offsets when bounding texture buffers.
-	U32 m_textureBufferBindOffsetAlignment = MAX_U32;
+	U32 m_textureBufferBindOffsetAlignment = kMaxU32;
 
 	/// The max visible range of texture buffers inside the shaders.
 	PtrSize m_textureBufferMaxRange = 0;
@@ -145,7 +145,7 @@ public:
 	PtrSize m_computeSharedMemorySize = 16_KB;
 
 	/// Each SBT record should be a multiple of this.
-	U32 m_sbtRecordAlignment = MAX_U32;
+	U32 m_sbtRecordAlignment = kMaxU32;
 
 	/// The size of a shader group handle that will be placed inside an SBT record.
 	U32 m_shaderGroupHandleSize = 0;
@@ -780,7 +780,7 @@ ANKI_ENUM_ALLOW_NUMERIC_OPERATIONS(VrsRate)
 class DrawElementsIndirectInfo
 {
 public:
-	U32 m_count = MAX_U32;
+	U32 m_count = kMaxU32;
 	U32 m_instanceCount = 1;
 	U32 m_firstIndex = 0;
 	U32 m_baseVertex = 0;
@@ -815,7 +815,7 @@ public:
 class DrawArraysIndirectInfo
 {
 public:
-	U32 m_count = MAX_U32;
+	U32 m_count = kMaxU32;
 	U32 m_instanceCount = 1;
 	U32 m_first = 0;
 	U32 m_baseInstance = 0;

+ 1 - 1
AnKi/Gr/Gl/Buffer.cpp

@@ -32,7 +32,7 @@ Buffer* Buffer::newInstance(GrManager* manager, const BufferInitInfo& inf)
 			(void)oldState;
 			ANKI_ASSERT(oldState == GlObject::State::TO_BE_CREATED);
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 3 - 3
AnKi/Gr/Gl/BufferImpl.h

@@ -41,7 +41,7 @@ public:
 	{
 		ANKI_ASSERT(isCreated());
 
-		range = (range == MAX_PTR_SIZE) ? (m_size - offset) : range;
+		range = (range == kMaxPtrSize) ? (m_size - offset) : range;
 		ANKI_ASSERT(range > 0);
 		ANKI_ASSERT(offset + range <= m_size);
 
@@ -50,7 +50,7 @@ public:
 
 	void bind(GLenum target, U32 binding, PtrSize offset) const
 	{
-		bind(target, binding, offset, MAX_PTR_SIZE);
+		bind(target, binding, offset, kMaxPtrSize);
 	}
 
 	void write(GLuint pbo, U32 pboOffset, U32 offset, U32 size) const
@@ -67,7 +67,7 @@ public:
 		ANKI_ASSERT(offset < m_size);
 		ANKI_ASSERT((offset % 4) == 0 && "Should be multiple of 4");
 
-		size = (size == MAX_PTR_SIZE) ? (m_realSize - offset) : size;
+		size = (size == kMaxPtrSize) ? (m_realSize - offset) : size;
 		ANKI_ASSERT(offset + size <= m_realSize);
 		ANKI_ASSERT((size % 4) == 0 && "Should be multiple of 4");
 

+ 43 - 43
AnKi/Gr/Gl/CommandBuffer.cpp

@@ -75,7 +75,7 @@ void CommandBuffer::bindVertexBuffer(U32 binding, BufferPtr buff, PtrSize offset
 		{
 			glBindVertexBuffer(m_binding, static_cast<const BufferImpl&>(*m_buff).getGlName(), m_offset, m_stride);
 			glVertexBindingDivisor(m_binding, (m_instanced) ? 1 : 0);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -115,7 +115,7 @@ void CommandBuffer::setVertexAttribute(U32 location, U32 buffBinding, Format fmt
 		{
 			glVertexAttribFormat(m_location, m_compSize, m_fmt, m_normalized, m_relativeOffset);
 			glVertexAttribBinding(m_location, m_buffBinding);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -148,7 +148,7 @@ void CommandBuffer::bindIndexBuffer(BufferPtr buff, PtrSize offset, IndexType ty
 		Error operator()(GlState& state)
 		{
 			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, static_cast<const BufferImpl&>(*m_buff).getGlName());
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -184,7 +184,7 @@ void CommandBuffer::setPrimitiveRestart(Bool enable)
 				glDisable(GL_PRIMITIVE_RESTART);
 			}
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -210,7 +210,7 @@ void CommandBuffer::setViewport(U32 minx, U32 miny, U32 width, U32 height)
 		Error operator()(GlState& state)
 		{
 			glViewport(m_value[0], m_value[1], m_value[2], m_value[3]);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -223,7 +223,7 @@ void CommandBuffer::setViewport(U32 minx, U32 miny, U32 width, U32 height)
 
 void CommandBuffer::setScissor(U32 minx, U32 miny, U32 width, U32 height)
 {
-	ANKI_ASSERT(minx < MAX_U32 && miny < MAX_U32);
+	ANKI_ASSERT(minx < kMaxU32 && miny < kMaxU32);
 	ANKI_ASSERT(width > 0 && height > 0);
 
 	class ScissorCommand final : public GlCommand
@@ -244,13 +244,13 @@ void CommandBuffer::setScissor(U32 minx, U32 miny, U32 width, U32 height)
 				state.m_scissor = m_value;
 				glScissor(m_value[0], m_value[1], m_value[2], m_value[3]);
 			}
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
 	// Limit the width and height to GLsizei
-	const GLsizei iwidth = (width == MAX_U32) ? MAX_I32 : width;
-	const GLsizei iheight = (height == MAX_U32) ? MAX_I32 : height;
+	const GLsizei iwidth = (width == kMaxU32) ? kMaxI32 : width;
+	const GLsizei iheight = (height == kMaxU32) ? kMaxI32 : height;
 	const GLsizei iminx = minx;
 	const GLsizei iminy = miny;
 
@@ -276,7 +276,7 @@ void CommandBuffer::setFillMode(FillMode mode)
 		Error operator()(GlState& state)
 		{
 			glPolygonMode(GL_FRONT_AND_BACK, m_fillMode);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -302,7 +302,7 @@ void CommandBuffer::setCullMode(FaceSelectionBit mode)
 		Error operator()(GlState& state)
 		{
 			glCullFace(m_mode);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -339,7 +339,7 @@ void CommandBuffer::setPolygonOffset(F32 factor, F32 units)
 				glPolygonOffset(m_factor, m_units);
 			}
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -372,7 +372,7 @@ void CommandBuffer::setStencilOperations(FaceSelectionBit face, StencilOperation
 		Error operator()(GlState& state)
 		{
 			glStencilOpSeparate(m_face, m_stencilFail, m_stencilPassDepthFail, m_stencilPassDepthPass);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -429,7 +429,7 @@ void CommandBuffer::setStencilWriteMask(FaceSelectionBit face, U32 mask)
 				state.m_stencilWriteMask[0] = state.m_stencilWriteMask[1] = m_mask;
 			}
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -462,7 +462,7 @@ void CommandBuffer::setDepthWrite(Bool enable)
 		{
 			glDepthMask(m_enable);
 			state.m_depthWriteMask = m_enable;
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -488,7 +488,7 @@ void CommandBuffer::setDepthCompareOperation(CompareOperation op)
 		Error operator()(GlState& state)
 		{
 			glDepthFunc(m_op);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -529,7 +529,7 @@ void CommandBuffer::setColorChannelWriteMask(U32 attachment, ColorBit mask)
 
 			state.m_colorWriteMasks[m_attachment] = {{r, g, b, a}};
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -564,7 +564,7 @@ void CommandBuffer::setBlendFactors(U32 attachment, BlendFactor srcRgb, BlendFac
 		Error operator()(GlState&)
 		{
 			glBlendFuncSeparatei(m_attachment, m_srcRgb, m_dstRgb, m_srcA, m_dstA);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -595,7 +595,7 @@ void CommandBuffer::setBlendOperation(U32 attachment, BlendOperation funcRgb, Bl
 		Error operator()(GlState&)
 		{
 			glBlendEquationSeparatei(m_attachment, m_funcRgb, m_funcA);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -627,7 +627,7 @@ void CommandBuffer::bindTextureAndSampler(U32 set, U32 binding, TextureViewPtr t
 		{
 			glBindTextureUnit(m_unit, static_cast<const TextureViewImpl&>(*m_texView).m_view.m_glName);
 			glBindSampler(m_unit, static_cast<const SamplerImpl&>(*m_sampler).getGlName());
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -663,7 +663,7 @@ void CommandBuffer::bindUniformBuffer(U32 set, U32 binding, BufferPtr buff, PtrS
 		Error operator()(GlState&)
 		{
 			static_cast<const BufferImpl&>(*m_buff).bind(GL_UNIFORM_BUFFER, m_binding, m_offset, m_range);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -699,7 +699,7 @@ void CommandBuffer::bindStorageBuffer(U32 set, U32 binding, BufferPtr buff, PtrS
 		Error operator()(GlState&)
 		{
 			static_cast<const BufferImpl&>(*m_buff).bind(GL_SHADER_STORAGE_BUFFER, m_binding, m_offset, m_range);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -734,7 +734,7 @@ void CommandBuffer::bindImage(U32 set, U32 binding, TextureViewPtr img)
 
 			glBindImageTexture(m_unit, view.m_view.m_glName, 0, GL_TRUE, 0, GL_READ_WRITE,
 							   static_cast<const TextureImpl&>(*view.m_tex).m_internalFormat);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -779,7 +779,7 @@ void CommandBuffer::bindTextureBuffer(U32 set, U32 binding, BufferPtr buff, PtrS
 			const GLuint tex = state.m_texBuffTextures[m_set][m_binding];
 			glTextureBufferRange(tex, m_fmt, static_cast<const BufferImpl&>(*m_buff).getGlName(), m_offset, m_range);
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -814,7 +814,7 @@ void CommandBuffer::bindShaderProgram(ShaderProgramPtr prog)
 		{
 			state.m_crntProg = m_prog;
 			glUseProgram(static_cast<const ShaderProgramImpl&>(*m_prog).getGlName());
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -852,7 +852,7 @@ void CommandBuffer::beginRenderPass(FramebufferPtr fb,
 		{
 			static_cast<const FramebufferImpl&>(*m_fb).bind(state, m_renderArea[0], m_renderArea[1], m_renderArea[2],
 															m_renderArea[3]);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -879,7 +879,7 @@ void CommandBuffer::endRenderPass()
 		Error operator()(GlState&)
 		{
 			m_fb->endRenderPass();
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -913,7 +913,7 @@ void CommandBuffer::drawElements(PrimitiveTopology topology, U32 count, U32 inst
 
 			ANKI_TRACE_INC_COUNTER(GR_DRAWCALLS, 1);
 			ANKI_TRACE_INC_COUNTER(GR_VERTICES, m_info.m_instanceCount * m_info.m_count);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -960,7 +960,7 @@ void CommandBuffer::drawArrays(PrimitiveTopology topology, U32 count, U32 instan
 
 			ANKI_TRACE_INC_COUNTER(GR_DRAWCALLS, 1);
 			ANKI_TRACE_INC_COUNTER(GR_VERTICES, m_info.m_instanceCount * m_info.m_count);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1008,7 +1008,7 @@ void CommandBuffer::drawElementsIndirect(PrimitiveTopology topology, U32 drawCou
 										sizeof(DrawElementsIndirectInfo));
 
 			glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1053,7 +1053,7 @@ void CommandBuffer::drawArraysIndirect(PrimitiveTopology topology, U32 drawCount
 									  sizeof(DrawArraysIndirectInfo));
 
 			glBindBuffer(GL_DRAW_INDIRECT_BUFFER, 0);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1079,7 +1079,7 @@ void CommandBuffer::dispatchCompute(U32 groupCountX, U32 groupCountY, U32 groupC
 		Error operator()(GlState&)
 		{
 			glDispatchCompute(m_size[0], m_size[1], m_size[2]);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1110,7 +1110,7 @@ void CommandBuffer::beginOcclusionQuery(OcclusionQueryPtr query)
 		Error operator()(GlState&)
 		{
 			static_cast<OcclusionQueryImpl&>(*m_handle).begin();
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1133,7 +1133,7 @@ void CommandBuffer::endOcclusionQuery(OcclusionQueryPtr query)
 		Error operator()(GlState&)
 		{
 			static_cast<OcclusionQueryImpl&>(*m_handle).end();
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1166,7 +1166,7 @@ void CommandBuffer::copyBufferToTextureView(BufferPtr buff, PtrSize offset, PtrS
 
 			texImpl.copyFromBuffer(viewImpl.getSubresource(), static_cast<const BufferImpl&>(*m_buff).getGlName(),
 								   m_offset, m_range);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1204,7 +1204,7 @@ void CommandBuffer::copyBufferToBuffer(BufferPtr src, PtrSize srcOffset, BufferP
 		{
 			static_cast<BufferImpl&>(*m_dst).write(static_cast<const BufferImpl&>(*m_src).getGlName(), m_srcOffset,
 												   m_dstOffset, m_range);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1235,7 +1235,7 @@ void CommandBuffer::generateMipmaps2d(TextureViewPtr texView)
 			const TextureImpl& texImpl = static_cast<TextureImpl&>(*viewImpl.m_tex);
 
 			texImpl.generateMipmaps2d(viewImpl);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1300,7 +1300,7 @@ void CommandBuffer::setBufferBarrier(BufferPtr buff, BufferUsageBit prevUsage, B
 		Error operator()(GlState&)
 		{
 			glMemoryBarrier(m_barrier);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1378,7 +1378,7 @@ void CommandBuffer::setTextureBarrier(TexturePtr tex, TextureUsageBit prevUsage,
 		Error operator()(GlState&)
 		{
 			glMemoryBarrier(m_barrier);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1443,7 +1443,7 @@ void CommandBuffer::clearTextureView(TextureViewPtr texView, const ClearValue& c
 			const TextureImpl& texImpl = static_cast<TextureImpl&>(*viewImpl.m_tex);
 
 			texImpl.clear(viewImpl.getSubresource(), m_val);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1473,7 +1473,7 @@ void CommandBuffer::fillBuffer(BufferPtr buff, PtrSize offset, PtrSize size, U32
 		Error operator()(GlState&)
 		{
 			static_cast<BufferImpl&>(*m_buff).fill(m_offset, m_size, m_value);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1509,7 +1509,7 @@ void CommandBuffer::writeOcclusionQueryResultToBuffer(OcclusionQueryPtr query, P
 								numberToPtr<GLuint*>(m_offset));
 			glBindBuffer(GL_QUERY_BUFFER, 0);
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -1573,7 +1573,7 @@ void CommandBuffer::setPushConstants(const void* data, U32 dataSize)
 				}
 			}
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 8 - 8
AnKi/Gr/Gl/CommandBufferImpl.cpp

@@ -73,7 +73,7 @@ Error CommandBufferImpl::executeAllCommands()
 	m_executed = true;
 #endif
 
-	Error err = Error::NONE;
+	Error err = Error::kNone;
 	GlState& state = static_cast<GrManagerImpl&>(getManager()).getState();
 
 	GlCommand* command = m_firstCommand;
@@ -136,12 +136,12 @@ void CommandBufferImpl::flushDrawcall(CommandBuffer& cmdb)
 
 			if(m_state.m_stencilCompareMask[i] == StateTracker::DUMMY_STENCIL_MASK)
 			{
-				cmdb.setStencilCompareMask(face, MAX_U32);
+				cmdb.setStencilCompareMask(face, kMaxU32);
 			}
 
 			if(m_state.m_stencilWriteMask[i] == StateTracker::DUMMY_STENCIL_MASK)
 			{
-				cmdb.setStencilWriteMask(face, MAX_U32);
+				cmdb.setStencilWriteMask(face, kMaxU32);
 			}
 
 			if(m_state.m_stencilRef[i] == StateTracker::DUMMY_STENCIL_MASK)
@@ -181,7 +181,7 @@ void CommandBufferImpl::flushDrawcall(CommandBuffer& cmdb)
 
 		if(!m_state.m_scissorSet)
 		{
-			cmdb.setScissor(0, 0, MAX_U32, MAX_U32);
+			cmdb.setScissor(0, 0, kMaxU32, kMaxU32);
 		}
 	}
 
@@ -207,7 +207,7 @@ void CommandBufferImpl::flushDrawcall(CommandBuffer& cmdb)
 		Error operator()(GlState&)
 		{
 			glStencilFuncSeparate(m_face, m_func, m_ref, m_compareMask);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -242,7 +242,7 @@ void CommandBufferImpl::flushDrawcall(CommandBuffer& cmdb)
 			{
 				glDisable(GL_DEPTH_TEST);
 			}
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -271,7 +271,7 @@ void CommandBufferImpl::flushDrawcall(CommandBuffer& cmdb)
 			{
 				glDisable(GL_STENCIL_TEST);
 			}
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 
@@ -305,7 +305,7 @@ void CommandBufferImpl::flushDrawcall(CommandBuffer& cmdb)
 					glDisablei(GL_BLEND, i);
 				}
 			}
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 2 - 2
AnKi/Gr/Gl/Fence.cpp

@@ -64,7 +64,7 @@ Bool Fence::clientWait(Second seconds)
 			else
 			{
 				ANKI_ASSERT(out == GL_WAIT_FAILED);
-				return Error::FUNCTION_FAILED;
+				return Error::kFunctionFailed;
 			}
 
 			if(m_barrier)
@@ -72,7 +72,7 @@ Bool Fence::clientWait(Second seconds)
 				m_barrier->wait();
 			}
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 1 - 1
AnKi/Gr/Gl/FenceImpl.cpp

@@ -27,7 +27,7 @@ FenceImpl::~FenceImpl()
 		Error operator()(GlState&)
 		{
 			glDeleteSync(m_fence);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 5 - 5
AnKi/Gr/Gl/FramebufferImpl.cpp

@@ -107,11 +107,11 @@ Error FramebufferImpl::init(const FramebufferInitInfo& init)
 	if(status != GL_FRAMEBUFFER_COMPLETE)
 	{
 		ANKI_GL_LOGE("FBO is incomplete. Status: 0x%x", status);
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void FramebufferImpl::attachTextureInternal(GLenum attachment, const TextureViewImpl& view,
@@ -231,15 +231,15 @@ void FramebufferImpl::bind(const GlState& state, U32 minx, U32 miny, U32 width,
 		// Enable write mask in case a pipeline changed it (else no clear will happen) and then restore state
 		// From the spec: The clear operation always uses the front stencil write mask when clearing the stencil
 		// buffer
-		if(state.m_stencilWriteMask[0] != MAX_U32)
+		if(state.m_stencilWriteMask[0] != kMaxU32)
 		{
-			glStencilMaskSeparate(GL_FRONT, MAX_U32);
+			glStencilMaskSeparate(GL_FRONT, kMaxU32);
 		}
 
 		GLint clearVal = m_in.m_depthStencilAttachment.m_clearValue.m_depthStencil.m_stencil;
 		glClearBufferiv(GL_STENCIL, 0, &clearVal);
 
-		if(state.m_stencilWriteMask[0] != MAX_U32)
+		if(state.m_stencilWriteMask[0] != kMaxU32)
 		{
 			glStencilMaskSeparate(GL_FRONT, state.m_stencilWriteMask[0]);
 		}

+ 3 - 3
AnKi/Gr/Gl/GlObject.cpp

@@ -20,7 +20,7 @@ GlObject::GlObject()
 
 Error GlObject::serializeRenderingThread(GrManager& manager)
 {
-	Error err = Error::NONE;
+	Error err = Error::kNone;
 	State state = State(m_state.load());
 	ANKI_ASSERT(state != State::NEW);
 
@@ -33,7 +33,7 @@ Error GlObject::serializeRenderingThread(GrManager& manager)
 
 		if(state == State::ERROR)
 		{
-			err = Error::UNKNOWN;
+			err = Error::kUnknown;
 		}
 	}
 
@@ -59,7 +59,7 @@ void GlObject::destroyDeferred(GrManager& manager, GlDeleteFunction deleteCallba
 		Error operator()(GlState&)
 		{
 			m_callback(1, &m_glName);
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 2 - 2
AnKi/Gr/Gl/GlState.cpp

@@ -134,7 +134,7 @@ void GlState::initRenderThread()
 	glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS);
 	glEnable(GL_CULL_FACE);
 	glEnable(GL_SCISSOR_TEST);
-	glScissor(0, 0, MAX_I16, MAX_I16);
+	glScissor(0, 0, kMaxI16, kMaxI16);
 	glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE);
 
 	// Create default VAO
@@ -163,7 +163,7 @@ void GlState::initRenderThread()
 	glGetInteger64v(GL_MAX_SHADER_STORAGE_BLOCK_SIZE, &val);
 	m_storageBlockMaxSize = val;
 
-	m_tboMaxRange = MAX_U32;
+	m_tboMaxRange = kMaxU32;
 
 	// Texture buffer textures
 	glGenTextures(MAX_DESCRIPTOR_SETS * MAX_TEXTURE_BUFFER_BINDINGS, &m_texBuffTextures[0][0]);

+ 2 - 2
AnKi/Gr/Gl/GlState.h

@@ -49,12 +49,12 @@ public:
 
 	Bool m_depthWriteMask = true;
 
-	Array<U32, 2> m_stencilWriteMask = {{MAX_U32, MAX_U32}};
+	Array<U32, 2> m_stencilWriteMask = {{kMaxU32, kMaxU32}};
 	/// @}
 
 	Array2d<GLuint, MAX_DESCRIPTOR_SETS, MAX_TEXTURE_BUFFER_BINDINGS> m_texBuffTextures = {};
 
-	Array<GLsizei, 4> m_scissor = {{0, 0, MAX_I32, MAX_I32}};
+	Array<GLsizei, 4> m_scissor = {{0, 0, kMaxI32, kMaxI32}};
 
 	GlState(GrManager* manager)
 		: m_manager(manager)

+ 1 - 1
AnKi/Gr/Gl/GrManagerImpl.cpp

@@ -70,7 +70,7 @@ Error GrManagerImpl::init(GrManagerInitInfo& init, GrAllocator<U8> alloc)
 
 	initFakeDefaultFb(init);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void GrManagerImpl::initFakeDefaultFb(GrManagerInitInfo& init)

+ 5 - 5
AnKi/Gr/Gl/GrManagerImplSdl.cpp

@@ -42,7 +42,7 @@ public:
 			if(SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG))
 			{
 				ANKI_GL_LOGE("SDL_GL_SetAttribute() failed");
-				return Error::FUNCTION_FAILED;
+				return Error::kFunctionFailed;
 			}
 		}
 
@@ -51,7 +51,7 @@ public:
 		   || SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE))
 		{
 			ANKI_GL_LOGE("SDL_GL_SetAttribute() failed");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		// Create context
@@ -59,7 +59,7 @@ public:
 		if(m_context == nullptr)
 		{
 			ANKI_GL_LOGE("SDL_GL_CreateContext() failed: %s", SDL_GetError());
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		// GLEW
@@ -67,11 +67,11 @@ public:
 		if(glewInit() != GLEW_OK)
 		{
 			ANKI_GL_LOGE("GLEW initialization failed");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 		glGetError();
 
-		return Error::NONE;
+		return Error::kNone;
 	}
 
 	void pinContextToCurrentThread(Bool pin)

+ 1 - 1
AnKi/Gr/Gl/OcclusionQuery.cpp

@@ -33,7 +33,7 @@ OcclusionQuery* OcclusionQuery::newInstance(GrManager* manager)
 			(void)oldState;
 			ANKI_ASSERT(oldState == GlObject::State::TO_BE_CREATED);
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 6 - 6
AnKi/Gr/Gl/RenderingThread.cpp

@@ -33,7 +33,7 @@ public:
 		glFlush();
 		glFinish();
 		m_renderingThread->m_syncBarrier.wait();
-		return Error::NONE;
+		return Error::kNone;
 	}
 };
 
@@ -60,7 +60,7 @@ public:
 
 		// Swap buffers
 		m_renderingThread->swapBuffersInternal();
-		return Error::NONE;
+		return Error::kNone;
 	}
 };
 
@@ -70,7 +70,7 @@ class EmptyCommand final : public GlCommand
 public:
 	ANKI_USE_RESULT Error operator()(GlState&)
 	{
-		return Error::NONE;
+		return Error::kNone;
 	}
 };
 
@@ -111,7 +111,7 @@ void RenderingThread::flushCommandBuffer(CommandBufferPtr cmdb, FencePtr* fence)
 			Error operator()(GlState&)
 			{
 				static_cast<FenceImpl&>(*m_fence).m_fence = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
-				return Error::NONE;
+				return Error::kNone;
 			}
 		};
 
@@ -222,7 +222,7 @@ Error RenderingThread::threadCallback(ThreadCallbackInfo& info)
 {
 	RenderingThread* thread = static_cast<RenderingThread*>(info.m_userData);
 	thread->threadLoop();
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void RenderingThread::threadLoop()
@@ -256,7 +256,7 @@ void RenderingThread::threadLoop()
 			++m_head;
 		}
 
-		Error err = Error::NONE;
+		Error err = Error::kNone;
 		{
 			ANKI_TRACE_SCOPED_EVENT(GL_THREAD);
 			err = static_cast<CommandBufferImpl&>(*cmd).executeAllCommands();

+ 1 - 1
AnKi/Gr/Gl/Sampler.cpp

@@ -34,7 +34,7 @@ Sampler* Sampler::newInstance(GrManager* manager, const SamplerInitInfo& init)
 			(void)oldState;
 			ANKI_ASSERT(oldState == GlObject::State::TO_BE_CREATED);
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 2 - 2
AnKi/Gr/Gl/ShaderImpl.cpp

@@ -144,10 +144,10 @@ Error ShaderImpl::init(CString source, ConstWeakArray<ShaderSpecializationConstV
 		ShaderCompiler::logShaderErrorCode(compilerLog.toCString(), source, alloc);
 
 		// Compilation failed, set error anyway
-		return Error::USER_DATA;
+		return Error::kUserData;
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 2 - 2
AnKi/Gr/Gl/ShaderProgramImpl.cpp

@@ -67,7 +67,7 @@ Error ShaderProgramImpl::initCompute(ShaderPtr comp)
 
 Error ShaderProgramImpl::link(GLuint vert, GLuint frag)
 {
-	Error err = Error::NONE;
+	Error err = Error::kNone;
 
 	glLinkProgram(m_glName);
 	GLint status = 0;
@@ -87,7 +87,7 @@ Error ShaderProgramImpl::link(GLuint vert, GLuint frag)
 
 		ANKI_GL_LOGE("Link error log follows (vs:%u, fs:%u):\n%s", vert, frag, &infoLogTxt[0]);
 
-		err = Error::USER_DATA;
+		err = Error::kUserData;
 	}
 
 	return err;

+ 8 - 8
AnKi/Gr/Gl/StateTracker.h

@@ -42,9 +42,9 @@ public:
 	class VertexAttribute
 	{
 	public:
-		U32 m_buffBinding = MAX_U32;
+		U32 m_buffBinding = kMaxU32;
 		Format m_fmt = Format::kNone;
-		PtrSize m_relativeOffset = MAX_PTR_SIZE;
+		PtrSize m_relativeOffset = kMaxPtrSize;
 	};
 
 	Array<VertexAttribute, MAX_VERTEX_ATTRIBUTES> m_attribs;
@@ -88,7 +88,7 @@ public:
 	{
 	public:
 		BufferImpl* m_buff = nullptr;
-		PtrSize m_offset = MAX_PTR_SIZE;
+		PtrSize m_offset = kMaxPtrSize;
 		GLenum m_indexType = 0;
 	} m_idx;
 
@@ -118,11 +118,11 @@ public:
 
 	/// @name viewport_state
 	/// @{
-	Array<U32, 4> m_viewport = {{MAX_U32, MAX_U32, MAX_U32, MAX_U32}};
+	Array<U32, 4> m_viewport = {{kMaxU32, kMaxU32, kMaxU32, kMaxU32}};
 
 	Bool setViewport(U32 minx, U32 miny, U32 width, U32 height)
 	{
-		ANKI_ASSERT(minx != MAX_U32 && miny != MAX_U32 && width != MAX_U32 && height != MAX_U32);
+		ANKI_ASSERT(minx != kMaxU32 && miny != kMaxU32 && width != kMaxU32 && height != kMaxU32);
 		if(m_viewport[0] != minx || m_viewport[1] != miny || m_viewport[2] != width || m_viewport[3] != height)
 		{
 			m_viewport = {{minx, miny, width, height}};
@@ -134,7 +134,7 @@ public:
 
 	/// @name scissor_state
 	/// @{
-	Array<GLsizei, 4> m_scissor = {{0, 0, MAX_I32, MAX_I32}};
+	Array<GLsizei, 4> m_scissor = {{0, 0, kMaxI32, kMaxI32}};
 	Bool m_scissorSet = false;
 
 	Bool setScissor(GLsizei minx, GLsizei miny, GLsizei width, GLsizei height)
@@ -365,7 +365,7 @@ public:
 
 	/// @name color
 	/// @{
-	static const ColorBit INVALID_COLOR_MASK = static_cast<ColorBit>(MAX_U8);
+	static const ColorBit INVALID_COLOR_MASK = static_cast<ColorBit>(kMaxU8);
 
 	class ColorAttachment
 	{
@@ -573,7 +573,7 @@ public:
 
 	void checkDrawcall() const
 	{
-		ANKI_ASSERT(m_viewport[1] != MAX_U16 && "Forgot to set the viewport");
+		ANKI_ASSERT(m_viewport[1] != kMaxU16 && "Forgot to set the viewport");
 		ANKI_ASSERT(m_prog && "Forgot to bound a program");
 		ANKI_ASSERT((insideRenderPass() || m_secondLevel) && "Forgot to begin a render pass");
 	}

+ 1 - 1
AnKi/Gr/Gl/Texture.cpp

@@ -34,7 +34,7 @@ Texture* Texture::newInstance(GrManager* manager, const TextureInitInfo& init)
 			ANKI_ASSERT(oldState == GlObject::State::TO_BE_CREATED);
 			(void)oldState;
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 1 - 1
AnKi/Gr/Gl/TextureImpl.cpp

@@ -79,7 +79,7 @@ public:
 			glDeleteTextures(1, &m_tex);
 		}
 
-		return Error::NONE;
+		return Error::kNone;
 	}
 };
 

+ 1 - 1
AnKi/Gr/Gl/TextureView.cpp

@@ -32,7 +32,7 @@ TextureView* TextureView::newInstance(GrManager* manager, const TextureViewInitI
 			ANKI_ASSERT(oldState == GlObject::State::TO_BE_CREATED);
 			(void)oldState;
 
-			return Error::NONE;
+			return Error::kNone;
 		}
 	};
 

+ 3 - 3
AnKi/Gr/RenderGraph.cpp

@@ -119,7 +119,7 @@ public:
 	Array<TextureUsageBit, MAX_COLOR_ATTACHMENTS> m_colorUsages = {}; ///< For beginRender pass
 	TextureUsageBit m_dsUsage = TextureUsageBit::kNone; ///< For beginRender pass
 
-	U32 m_batchIdx ANKI_DEBUG_CODE(= MAX_U32);
+	U32 m_batchIdx ANKI_DEBUG_CODE(= kMaxU32);
 	Bool m_drawsToPresentable = false;
 
 	FramebufferPtr& fb()
@@ -750,7 +750,7 @@ RenderGraph::BakeContext* RenderGraph::newContext(const RenderGraphDescription&
 			}
 		}
 
-		outRt.m_lastBatchThatTransitionedIt.create(alloc, surfOrVolumeCount, MAX_U16);
+		outRt.m_lastBatchThatTransitionedIt.create(alloc, surfOrVolumeCount, kMaxU16);
 		outRt.m_imported = imported;
 	}
 
@@ -1733,7 +1733,7 @@ Error RenderGraph::dumpDependencyDotFile(const RenderGraphDescription& descr, co
 		ANKI_CHECK(file.writeText("%s", &s[0]));
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 #endif
 

+ 11 - 11
AnKi/Gr/RenderGraph.h

@@ -57,11 +57,11 @@ public:
 
 	Bool isValid() const
 	{
-		return m_idx != MAX_U32;
+		return m_idx != kMaxU32;
 	}
 
 private:
-	U32 m_idx = MAX_U32;
+	U32 m_idx = kMaxU32;
 };
 
 /// Render target (TexturePtr) handle.
@@ -208,7 +208,7 @@ public:
 	{
 		BufferPtr buff;
 		getBufferState(handle, buff);
-		m_commandBuffer->bindStorageBuffer(set, binding, buff, 0, MAX_PTR_SIZE);
+		m_commandBuffer->bindStorageBuffer(set, binding, buff, 0, kMaxPtrSize);
 	}
 
 	/// Convenience method.
@@ -216,7 +216,7 @@ public:
 	{
 		BufferPtr buff;
 		getBufferState(handle, buff);
-		m_commandBuffer->bindUniformBuffer(set, binding, buff, 0, MAX_PTR_SIZE);
+		m_commandBuffer->bindUniformBuffer(set, binding, buff, 0, kMaxPtrSize);
 	}
 
 	/// Convenience method.
@@ -224,8 +224,8 @@ public:
 
 private:
 	const RenderGraph* m_rgraph ANKI_DEBUG_CODE(= nullptr);
-	U32 m_passIdx ANKI_DEBUG_CODE(= MAX_U32);
-	U32 m_batchIdx ANKI_DEBUG_CODE(= MAX_U32);
+	U32 m_passIdx ANKI_DEBUG_CODE(= kMaxU32);
+	U32 m_batchIdx ANKI_DEBUG_CODE(= kMaxU32);
 
 	TexturePtr getTexture(RenderTargetHandle handle) const;
 };
@@ -253,7 +253,7 @@ public:
 		, m_type(Type::TEXTURE)
 	{
 		ANKI_ASSERT(handle.isValid());
-		m_texture.m_subresource.m_mipmapCount = MAX_U32; // Mark it as "whole texture"
+		m_texture.m_subresource.m_mipmapCount = kMaxU32; // Mark it as "whole texture"
 		m_texture.m_subresource.m_depthStencilAspect = aspect;
 	}
 
@@ -446,13 +446,13 @@ public:
 							ConstWeakArray<RenderTargetHandle> colorRenderTargetHandles,
 							RenderTargetHandle depthStencilRenderTargetHandle = {},
 							RenderTargetHandle shadingRateRenderTargetHandle = {}, U32 minx = 0, U32 miny = 0,
-							U32 maxx = MAX_U32, U32 maxy = MAX_U32);
+							U32 maxx = kMaxU32, U32 maxy = kMaxU32);
 
 	void setFramebufferInfo(const FramebufferDescription& fbInfo,
 							std::initializer_list<RenderTargetHandle> colorRenderTargetHandles,
 							RenderTargetHandle depthStencilRenderTargetHandle = {},
 							RenderTargetHandle shadingRateRenderTargetHandle = {}, U32 minx = 0, U32 miny = 0,
-							U32 maxx = MAX_U32, U32 maxy = MAX_U32);
+							U32 maxx = kMaxU32, U32 maxy = kMaxU32);
 
 private:
 	Array<RenderTargetHandle, MAX_COLOR_ATTACHMENTS + 2> m_rtHandles;
@@ -518,7 +518,7 @@ public:
 	RenderTargetHandle newRenderTarget(const RenderTargetDescription& initInf);
 
 	/// Import a buffer.
-	BufferHandle importBuffer(BufferPtr buff, BufferUsageBit usage, PtrSize offset = 0, PtrSize range = MAX_PTR_SIZE);
+	BufferHandle importBuffer(BufferPtr buff, BufferUsageBit usage, PtrSize offset = 0, PtrSize range = kMaxPtrSize);
 
 	/// Import an AS.
 	AccelerationStructureHandle importAccelerationStructure(AccelerationStructurePtr as,
@@ -583,7 +583,7 @@ private:
 	static Bool bufferRangeOverlaps(PtrSize offsetA, PtrSize rangeA, PtrSize offsetB, PtrSize rangeB)
 	{
 		ANKI_ASSERT(rangeA > 0 && rangeB > 0);
-		if(rangeA == MAX_PTR_SIZE || rangeB == MAX_PTR_SIZE)
+		if(rangeA == kMaxPtrSize || rangeB == kMaxPtrSize)
 		{
 			return true;
 		}

+ 2 - 2
AnKi/Gr/RenderGraph.inl.h

@@ -36,7 +36,7 @@ inline void RenderPassDescriptionBase::fixSubresource(RenderPassDependency& dep)
 	ANKI_ASSERT(dep.m_type == RenderPassDependency::Type::TEXTURE);
 
 	TextureSubresourceInfo& subresource = dep.m_texture.m_subresource;
-	const Bool wholeTexture = subresource.m_mipmapCount == MAX_U32;
+	const Bool wholeTexture = subresource.m_mipmapCount == kMaxU32;
 	const RenderGraphDescription::RT& rt = m_descr->m_renderTargets[dep.m_texture.m_handle.m_idx];
 	if(wholeTexture)
 	{
@@ -296,7 +296,7 @@ inline BufferHandle RenderGraphDescription::importBuffer(BufferPtr buff, BufferU
 														 PtrSize range)
 {
 	// Checks
-	if(range == MAX_PTR_SIZE)
+	if(range == kMaxPtrSize)
 	{
 		ANKI_ASSERT(offset < buff->getSize());
 	}

+ 1 - 1
AnKi/Gr/Shader.h

@@ -24,7 +24,7 @@ public:
 		U32 m_uint;
 	};
 
-	U32 m_constantId = MAX_U32;
+	U32 m_constantId = kMaxU32;
 	ShaderVariableDataType m_dataType;
 
 	ShaderSpecializationConstValue()

+ 10 - 10
AnKi/Gr/TextureView.h

@@ -102,14 +102,14 @@ protected:
 	{
 		m_subresource.m_depthStencilAspect = DepthStencilAspectBit::kNone;
 
-		m_subresource.m_firstMipmap = MAX_U32;
-		m_subresource.m_mipmapCount = MAX_U32;
+		m_subresource.m_firstMipmap = kMaxU32;
+		m_subresource.m_mipmapCount = kMaxU32;
 
-		m_subresource.m_firstLayer = MAX_U32;
-		m_subresource.m_layerCount = MAX_U32;
+		m_subresource.m_firstLayer = kMaxU32;
+		m_subresource.m_layerCount = kMaxU32;
 
-		m_subresource.m_firstFace = MAX_U8;
-		m_subresource.m_faceCount = MAX_U8;
+		m_subresource.m_firstFace = kMaxU8;
+		m_subresource.m_faceCount = kMaxU8;
 	}
 
 	/// Destroy.
@@ -119,10 +119,10 @@ protected:
 
 	Bool initialized() const
 	{
-		return m_texType != TextureType::kCount && m_subresource.m_firstMipmap < MAX_U32
-			   && m_subresource.m_mipmapCount < MAX_U32 && m_subresource.m_firstLayer < MAX_U32
-			   && m_subresource.m_layerCount < MAX_U32 && m_subresource.m_firstFace < MAX_U8
-			   && m_subresource.m_faceCount < MAX_U8;
+		return m_texType != TextureType::kCount && m_subresource.m_firstMipmap < kMaxU32
+			   && m_subresource.m_mipmapCount < kMaxU32 && m_subresource.m_firstLayer < kMaxU32
+			   && m_subresource.m_layerCount < kMaxU32 && m_subresource.m_firstFace < kMaxU8
+			   && m_subresource.m_faceCount < kMaxU8;
 	}
 
 private:

+ 3 - 3
AnKi/Gr/Utils/FrameGpuAllocator.cpp

@@ -44,7 +44,7 @@ Error FrameGpuAllocator::allocate(PtrSize originalSize, PtrSize& outOffset)
 {
 	ANKI_ASSERT(isCreated());
 	ANKI_ASSERT(originalSize > 0);
-	Error err = Error::NONE;
+	Error err = Error::kNone;
 
 	// Align size
 	PtrSize size = getAlignedRoundUp(m_alignment, originalSize);
@@ -70,8 +70,8 @@ Error FrameGpuAllocator::allocate(PtrSize originalSize, PtrSize& outOffset)
 	}
 	else
 	{
-		outOffset = MAX_PTR_SIZE;
-		err = Error::OUT_OF_MEMORY;
+		outOffset = kMaxPtrSize;
+		err = Error::kOutOfMemory;
 	}
 
 	return err;

+ 1 - 1
AnKi/Gr/Utils/FrameGpuAllocator.h

@@ -34,7 +34,7 @@ public:
 	/// @param size The size of the GPU buffer.
 	/// @param alignment The working alignment.
 	/// @param maxAllocationSize The size in @a allocate cannot exceed maxAllocationSize.
-	void init(PtrSize size, U32 alignment, PtrSize maxAllocationSize = MAX_PTR_SIZE);
+	void init(PtrSize size, U32 alignment, PtrSize maxAllocationSize = kMaxPtrSize);
 
 	/// Allocate memory for a dynamic buffer.
 	Error allocate(PtrSize size, PtrSize& outOffset);

+ 3 - 3
AnKi/Gr/Vulkan/AccelerationStructureImpl.cpp

@@ -99,7 +99,7 @@ Error AccelerationStructureImpl::init(const AccelerationStructureInitInfo& inf)
 		m_topLevelInfo.m_instancesBuffer = getManager().newBuffer(buffInit);
 
 		VkAccelerationStructureInstanceKHR* instances = static_cast<VkAccelerationStructureInstanceKHR*>(
-			m_topLevelInfo.m_instancesBuffer->map(0, MAX_PTR_SIZE, BufferMapAccessBit::WRITE));
+			m_topLevelInfo.m_instancesBuffer->map(0, kMaxPtrSize, BufferMapAccessBit::WRITE));
 		for(U32 i = 0; i < inf.m_topLevel.m_instances.getSize(); ++i)
 		{
 			VkAccelerationStructureInstanceKHR& outInst = instances[i];
@@ -119,7 +119,7 @@ Error AccelerationStructureImpl::init(const AccelerationStructureInitInfo& inf)
 			m_topLevelInfo.m_blas.emplaceBack(getAllocator(), inf.m_topLevel.m_instances[i].m_bottomLevel);
 		}
 
-		m_topLevelInfo.m_instancesBuffer->flush(0, MAX_PTR_SIZE);
+		m_topLevelInfo.m_instancesBuffer->flush(0, kMaxPtrSize);
 		m_topLevelInfo.m_instancesBuffer->unmap();
 
 		// Geom
@@ -171,7 +171,7 @@ Error AccelerationStructureImpl::init(const AccelerationStructureInitInfo& inf)
 		m_rangeInfo.primitiveCount = inf.m_topLevel.m_instances.getSize();
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void AccelerationStructureImpl::computeBarrierInfo(AccelerationStructureUsageBit before,

+ 10 - 10
AnKi/Gr/Vulkan/BufferImpl.cpp

@@ -84,7 +84,7 @@ Error BufferImpl::init(const BufferInitInfo& inf)
 	// Get mem requirements
 	VkMemoryRequirements req;
 	vkGetBufferMemoryRequirements(getDevice(), m_handle, &req);
-	U32 memIdx = MAX_U32;
+	U32 memIdx = kMaxU32;
 	const Bool isDiscreteGpu = getGrManagerImpl().getDeviceCapabilities().m_discreteGpu;
 
 	if(access == BufferMapAccessBit::WRITE)
@@ -112,7 +112,7 @@ Error BufferImpl::init(const BufferInitInfo& inf)
 		memIdx = getGrManagerImpl().getGpuMemoryManager().findMemoryType(req.memoryTypeBits, prefer, avoid);
 
 		// 2nd try: host & coherent
-		if(memIdx == MAX_U32)
+		if(memIdx == kMaxU32)
 		{
 			prefer = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
 			avoid = 0;
@@ -143,7 +143,7 @@ Error BufferImpl::init(const BufferInitInfo& inf)
 																		 0);
 
 		// Fallback: Just cached
-		if(memIdx == MAX_U32)
+		if(memIdx == kMaxU32)
 		{
 			if(isDiscreteGpu)
 			{
@@ -165,17 +165,17 @@ Error BufferImpl::init(const BufferInitInfo& inf)
 			req.memoryTypeBits, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
 
 		// Fallback: Device with anything else
-		if(memIdx == MAX_U32)
+		if(memIdx == kMaxU32)
 		{
 			memIdx = getGrManagerImpl().getGpuMemoryManager().findMemoryType(req.memoryTypeBits,
 																			 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0);
 		}
 	}
 
-	if(memIdx == MAX_U32)
+	if(memIdx == kMaxU32)
 	{
 		ANKI_VK_LOGE("Failed to find appropriate memory type for buffer: %s", getName().cstr());
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	const VkPhysicalDeviceMemoryProperties& props = getGrManagerImpl().getMemoryProperties();
@@ -212,7 +212,7 @@ Error BufferImpl::init(const BufferInitInfo& inf)
 		if(m_gpuAddress == 0)
 		{
 			ANKI_VK_LOGE("vkGetBufferDeviceAddressKHR() failed");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 	}
 
@@ -220,7 +220,7 @@ Error BufferImpl::init(const BufferInitInfo& inf)
 	m_size = inf.m_size;
 	m_actualSize = size;
 	m_usage = usage;
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void* BufferImpl::map(PtrSize offset, PtrSize range, [[maybe_unused]] BufferMapAccessBit access)
@@ -230,7 +230,7 @@ void* BufferImpl::map(PtrSize offset, PtrSize range, [[maybe_unused]] BufferMapA
 	ANKI_ASSERT((access & m_access) != BufferMapAccessBit::NONE);
 	ANKI_ASSERT(!m_mapped);
 	ANKI_ASSERT(offset < m_size);
-	if(range == MAX_PTR_SIZE)
+	if(range == kMaxPtrSize)
 	{
 		range = m_size - offset;
 	}
@@ -379,7 +379,7 @@ void BufferImpl::computeBarrierInfo(BufferUsageBit before, BufferUsageBit after,
 
 VkBufferView BufferImpl::getOrCreateBufferView(Format fmt, PtrSize offset, PtrSize range) const
 {
-	if(range == MAX_PTR_SIZE)
+	if(range == kMaxPtrSize)
 	{
 		ANKI_ASSERT(m_size >= offset);
 		range = m_size - offset;

+ 1 - 1
AnKi/Gr/Vulkan/BufferImpl.h

@@ -126,7 +126,7 @@ private:
 		alignRoundDown(m_mappedMemoryRangeAlignment, offset);
 
 		// And the range
-		range = (range == MAX_PTR_SIZE) ? m_actualSize : range;
+		range = (range == kMaxPtrSize) ? m_actualSize : range;
 		alignRoundUp(m_mappedMemoryRangeAlignment, range);
 		ANKI_ASSERT(offset + range <= m_memHandle.m_offset + m_actualSize);
 

+ 7 - 7
AnKi/Gr/Vulkan/CommandBufferFactory.cpp

@@ -12,13 +12,13 @@ static VulkanQueueType getQueueTypeFromCommandBufferFlags(CommandBufferFlag flag
 														  const VulkanQueueFamilies& queueFamilies)
 {
 	ANKI_ASSERT(!!(flags & CommandBufferFlag::GENERAL_WORK) ^ !!(flags & CommandBufferFlag::COMPUTE_WORK));
-	if(!(flags & CommandBufferFlag::GENERAL_WORK) && queueFamilies[VulkanQueueType::COMPUTE] != MAX_U32)
+	if(!(flags & CommandBufferFlag::GENERAL_WORK) && queueFamilies[VulkanQueueType::COMPUTE] != kMaxU32)
 	{
 		return VulkanQueueType::COMPUTE;
 	}
 	else
 	{
-		ANKI_ASSERT(queueFamilies[VulkanQueueType::GENERAL] != MAX_U32);
+		ANKI_ASSERT(queueFamilies[VulkanQueueType::GENERAL] != kMaxU32);
 		return VulkanQueueType::GENERAL;
 	}
 }
@@ -56,7 +56,7 @@ Error CommandBufferThreadAllocator::init()
 {
 	for(VulkanQueueType qtype : EnumIterable<VulkanQueueType>())
 	{
-		if(m_factory->m_queueFamilies[qtype] == MAX_U32)
+		if(m_factory->m_queueFamilies[qtype] == kMaxU32)
 		{
 			continue;
 		}
@@ -82,7 +82,7 @@ Error CommandBufferThreadAllocator::init()
 		}
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void CommandBufferThreadAllocator::destroy()
@@ -159,7 +159,7 @@ Error CommandBufferThreadAllocator::newCommandBuffer(CommandBufferFlag cmdbFlags
 	ANKI_ASSERT(out && out->m_refcount.load() == 0);
 	ANKI_ASSERT(out->m_flags == cmdbFlags);
 	outPtr.reset(out);
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void CommandBufferThreadAllocator::deleteCommandBuffer(MicroCommandBuffer* ptr)
@@ -179,7 +179,7 @@ Error CommandBufferFactory::init(GrAllocator<U8> alloc, VkDevice dev, const Vulk
 	m_alloc = alloc;
 	m_dev = dev;
 	m_queueFamilies = queueFamilies;
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void CommandBufferFactory::destroy()
@@ -266,7 +266,7 @@ Error CommandBufferFactory::newCommandBuffer(ThreadId tid, CommandBufferFlag cmd
 	ANKI_ASSERT(alloc->m_tid == tid);
 	ANKI_CHECK(alloc->newCommandBuffer(cmdbFlags, ptr));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 2 - 2
AnKi/Gr/Vulkan/CommandBufferImpl.cpp

@@ -67,7 +67,7 @@ Error CommandBufferImpl::init(const CommandBufferInitInfo& init)
 		state.init(m_alloc);
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void CommandBufferImpl::beginRecording()
@@ -971,7 +971,7 @@ void CommandBufferImpl::setPipelineBarrierInternal(
 		ANKI_ASSERT(barrier.m_offset < impl.getSize());
 		inf.offset = barrier.m_offset;
 
-		if(barrier.m_size == MAX_PTR_SIZE)
+		if(barrier.m_size == kMaxPtrSize)
 		{
 			inf.size = VK_WHOLE_SIZE;
 		}

+ 3 - 3
AnKi/Gr/Vulkan/CommandBufferImpl.h

@@ -431,7 +431,7 @@ private:
 #endif
 
 	FramebufferPtr m_activeFb;
-	Array<U32, 4> m_renderArea = {0, 0, MAX_U32, MAX_U32};
+	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 = {};
@@ -452,11 +452,11 @@ private:
 	/// @name state_opts
 	/// @{
 	Array<U32, 4> m_viewport = {0, 0, 0, 0};
-	Array<U32, 4> m_scissor = {0, 0, MAX_U32, MAX_U32};
+	Array<U32, 4> m_scissor = {0, 0, kMaxU32, kMaxU32};
 	VkViewport m_lastViewport = {};
 	Bool m_viewportDirty = true;
 	Bool m_scissorDirty = true;
-	VkRect2D m_lastScissor = {{-1, -1}, {MAX_U32, MAX_U32}};
+	VkRect2D m_lastScissor = {{-1, -1}, {kMaxU32, kMaxU32}};
 	Array<U32, 2> m_stencilCompareMasks = {0x5A5A5A5A, 0x5A5A5A5A}; ///< Use a stupid number to initialize.
 	Array<U32, 2> m_stencilWriteMasks = {0x5A5A5A5A, 0x5A5A5A5A};
 	Array<U32, 2> m_stencilReferenceMasks = {0x5A5A5A5A, 0x5A5A5A5A};

+ 1 - 1
AnKi/Gr/Vulkan/CommandBufferImpl.inl.h

@@ -805,7 +805,7 @@ inline void CommandBufferImpl::fillBufferInternal(const BufferPtr& buff, PtrSize
 	ANKI_ASSERT(offset < impl.getSize());
 	ANKI_ASSERT((offset % 4) == 0 && "Should be multiple of 4");
 
-	size = (size == MAX_PTR_SIZE) ? (impl.getActualSize() - offset) : size;
+	size = (size == kMaxPtrSize) ? (impl.getActualSize() - offset) : size;
 	alignRoundUp(4, size); // Needs to be multiple of 4
 	ANKI_ASSERT(offset + size <= impl.getActualSize());
 	ANKI_ASSERT((size % 4) == 0 && "Should be multiple of 4");

+ 1 - 1
AnKi/Gr/Vulkan/Common.h

@@ -148,7 +148,7 @@ static_assert(!(BufferUsageBit::ALL & PrivateBufferUsageBit::ALL_PRIVATE), "Upda
 		if(ANKI_UNLIKELY((rez = (x)) < 0)) \
 		{ \
 			ANKI_VK_LOGE("Vulkan function failed (VkResult: %s): %s", vkResultToString(rez), #x); \
-			return Error::FUNCTION_FAILED; \
+			return Error::kFunctionFailed; \
 		} \
 	} while(0)
 

+ 16 - 16
AnKi/Gr/Vulkan/DescriptorSet.cpp

@@ -68,8 +68,8 @@ private:
 	DynamicArray<U16> m_freeTexIndices;
 	DynamicArray<U16> m_freeTexelBufferIndices;
 
-	U16 m_freeTexIndexCount = MAX_U16;
-	U16 m_freeTexelBufferIndexCount = MAX_U16;
+	U16 m_freeTexIndexCount = kMaxU16;
+	U16 m_freeTexelBufferIndexCount = kMaxU16;
 
 	void unbindCommon(U32 idx, DynamicArray<U16>& freeIndices, U16& freeIndexCount);
 };
@@ -79,7 +79,7 @@ class DS : public IntrusiveListEnabled<DS>
 {
 public:
 	VkDescriptorSet m_handle = {};
-	U64 m_lastFrameUsed = MAX_U64;
+	U64 m_lastFrameUsed = kMaxU64;
 	U64 m_hash;
 };
 
@@ -111,7 +111,7 @@ public:
 			ANKI_CHECK(newSet(hash, bindings, tmpAlloc, out));
 		}
 
-		return Error::NONE;
+		return Error::kNone;
 	}
 
 private:
@@ -148,7 +148,7 @@ public:
 	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 = {};
-	U32 m_minBinding = MAX_U32;
+	U32 m_minBinding = kMaxU32;
 	U32 m_maxBinding = 0;
 	U32 m_index = 0; ///< Index in DescriptorSetFactory::m_caches
 
@@ -281,7 +281,7 @@ Error DescriptorSetFactory::BindlessDescriptorSet::init(const GrAllocator<U8>& a
 		}
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 U32 DescriptorSetFactory::BindlessDescriptorSet::bindTexture(const VkImageView view, const VkImageLayout layout)
@@ -389,7 +389,7 @@ DescriptorSetFactory::DSAllocator::~DSAllocator()
 Error DescriptorSetFactory::DSAllocator::init()
 {
 	ANKI_CHECK(createNewPool());
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error DescriptorSetFactory::DSAllocator::createNewPool()
@@ -422,7 +422,7 @@ Error DescriptorSetFactory::DSAllocator::createNewPool()
 	m_pools.resize(m_layoutEntry->m_factory->m_alloc, m_pools.getSize() + 1);
 	m_pools[m_pools.getSize() - 1] = pool;
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 const DS* DescriptorSetFactory::DSAllocator::tryFindSet(U64 hash)
@@ -516,7 +516,7 @@ Error DescriptorSetFactory::DSAllocator::newSet(
 	writeSet(bindings, *out, tmpAlloc);
 
 	out_ = out;
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void DescriptorSetFactory::DSAllocator::writeSet(
@@ -572,7 +572,7 @@ void DescriptorSetFactory::DSAllocator::writeSet(
 					VkDescriptorBufferInfo& info = *buffInfos.emplaceBack();
 					info.buffer = b.m_buff.m_buffHandle;
 					info.offset = 0;
-					info.range = (b.m_buff.m_range == MAX_PTR_SIZE) ? VK_WHOLE_SIZE : b.m_buff.m_range;
+					info.range = (b.m_buff.m_range == kMaxPtrSize) ? VK_WHOLE_SIZE : b.m_buff.m_range;
 					break;
 				}
 				case DescriptorType::READ_TEXTURE_BUFFER:
@@ -745,7 +745,7 @@ Error DSLayoutCacheEntry::init(const DescriptorBinding* bindings, U32 bindingCou
 	m_poolCreateInf.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
 	m_poolCreateInf.poolSizeCount = poolSizeCount;
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error DSLayoutCacheEntry::getOrCreateDSAllocator(DescriptorSetFactory::DSAllocator*& alloc)
@@ -783,7 +783,7 @@ Error DSLayoutCacheEntry::getOrCreateDSAllocator(DescriptorSetFactory::DSAllocat
 	}
 
 	ANKI_ASSERT(alloc);
-	return Error::NONE;
+	return Error::kNone;
 }
 
 AnyBinding& DescriptorSetState::getBindingToPopulate(U32 bindingIdx, U32 arrayIdx)
@@ -994,7 +994,7 @@ Error DescriptorSetFactory::init(const GrAllocator<U8>& alloc, VkDevice dev, U32
 	m_bindlessTextureCount = bindlessTextureCount;
 	m_bindlessUniformTexelBufferCount = bindlessTextureBuffers;
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void DescriptorSetFactory::destroy()
@@ -1108,7 +1108,7 @@ Error DescriptorSetFactory::newDescriptorSetLayout(const DescriptorSetLayoutInit
 		layout.m_entry = cache;
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error DescriptorSetFactory::newDescriptorSet(StackAllocator<U8>& tmpAlloc, DescriptorSetState& state,
@@ -1125,7 +1125,7 @@ Error DescriptorSetFactory::newDescriptorSet(StackAllocator<U8>& tmpAlloc, Descr
 	if(hash == 0)
 	{
 		dirty = false;
-		return Error::NONE;
+		return Error::kNone;
 	}
 	else
 	{
@@ -1152,7 +1152,7 @@ Error DescriptorSetFactory::newDescriptorSet(StackAllocator<U8>& tmpAlloc, Descr
 		}
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 U32 DescriptorSetFactory::bindBindlessTexture(const VkImageView view, const VkImageLayout layout)

+ 3 - 3
AnKi/Gr/Vulkan/DescriptorSet.h

@@ -28,7 +28,7 @@ public:
 	U32 m_arraySize = 0;
 	ShaderTypeBit m_stageMask = ShaderTypeBit::kNone;
 	DescriptorType m_type = DescriptorType::COUNT;
-	U8 m_binding = MAX_U8;
+	U8 m_binding = kMaxU8;
 };
 static_assert(sizeof(DescriptorBinding) == 8, "Should be packed because it will be hashed");
 
@@ -408,8 +408,8 @@ private:
 	SpinLock m_cachesMtx; ///< Not a mutex because after a while there will be no reason to lock
 
 	BindlessDescriptorSet* m_bindless = nullptr;
-	U32 m_bindlessTextureCount = MAX_U32;
-	U32 m_bindlessUniformTexelBufferCount = MAX_U32;
+	U32 m_bindlessTextureCount = kMaxU32;
+	U32 m_bindlessUniformTexelBufferCount = kMaxU32;
 };
 /// @}
 

+ 1 - 1
AnKi/Gr/Vulkan/FenceFactory.h

@@ -50,7 +50,7 @@ public:
 
 	void wait()
 	{
-		const Bool timeout = !clientWait(MAX_SECOND);
+		const Bool timeout = !clientWait(kMaxSecond);
 		if(ANKI_UNLIKELY(timeout))
 		{
 			ANKI_VK_LOGF("Waiting for a fence timed out");

+ 3 - 3
AnKi/Gr/Vulkan/FramebufferImpl.cpp

@@ -60,7 +60,7 @@ Error FramebufferImpl::init(const FramebufferInitInfo& init)
 	// Create the FB
 	ANKI_CHECK(initFbs(init));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void FramebufferImpl::initClearValues(const FramebufferInitInfo& init)
@@ -178,7 +178,7 @@ Error FramebufferImpl::initFbs(const FramebufferInitInfo& init)
 	ANKI_VK_CHECK(vkCreateFramebuffer(getDevice(), &ci, nullptr, &m_fbHandle));
 	getGrManagerImpl().trySetVulkanHandleName(init.getName(), VK_OBJECT_TYPE_FRAMEBUFFER, m_fbHandle);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void FramebufferImpl::setupAttachmentDescriptor(const FramebufferAttachmentInfo& att, VkAttachmentDescription2& desc,
@@ -221,7 +221,7 @@ void FramebufferImpl::initRpassCreateInfo(const FramebufferInitInfo& init)
 		ref.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
 	}
 
-	U32 sriAttachmentIdx = MAX_U32;
+	U32 sriAttachmentIdx = kMaxU32;
 	if(init.m_shadingRateImage.m_textureView)
 	{
 		ANKI_ASSERT(getGrManagerImpl().getDeviceCapabilities().m_vrs && "This requires VRS to be enabled");

+ 3 - 3
AnKi/Gr/Vulkan/GpuMemoryManager.cpp

@@ -46,7 +46,7 @@ Error GpuMemoryManagerInterface::allocateChunk(U32 classIdx, GpuMemoryManagerChu
 
 	m_allocatedMemory += m_classInfos[classIdx].m_chunkSize;
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void GpuMemoryManagerInterface::freeChunk(GpuMemoryManagerChunk* chunk)
@@ -244,7 +244,7 @@ void* GpuMemoryManager::getMappedAddress(GpuMemoryHandle& handle)
 U32 GpuMemoryManager::findMemoryType(U32 resourceMemTypeBits, VkMemoryPropertyFlags preferFlags,
 									 VkMemoryPropertyFlags avoidFlags) const
 {
-	U32 prefered = MAX_U32;
+	U32 prefered = kMaxU32;
 
 	// Iterate all mem types
 	for(U32 i = 0; i < m_memoryProperties.memoryTypeCount; i++)
@@ -257,7 +257,7 @@ U32 GpuMemoryManager::findMemoryType(U32 resourceMemTypeBits, VkMemoryPropertyFl
 			{
 				// It's the candidate we want
 
-				if(prefered == MAX_U32)
+				if(prefered == kMaxU32)
 				{
 					prefered = i;
 				}

+ 5 - 5
AnKi/Gr/Vulkan/GpuMemoryManager.h

@@ -51,7 +51,7 @@ class GpuMemoryManagerInterface
 public:
 	GpuMemoryManager* m_parent = nullptr;
 
-	U8 m_memTypeIdx = MAX_U8;
+	U8 m_memTypeIdx = kMaxU8;
 	Bool m_exposesBufferGpuAddress = false;
 
 	Bool m_isDeviceMemory = false;
@@ -86,17 +86,17 @@ class GpuMemoryHandle
 
 public:
 	VkDeviceMemory m_memory = VK_NULL_HANDLE;
-	PtrSize m_offset = MAX_PTR_SIZE;
+	PtrSize m_offset = kMaxPtrSize;
 
 	explicit operator Bool() const
 	{
-		return m_memory != VK_NULL_HANDLE && m_offset < MAX_PTR_SIZE && m_memTypeIdx < MAX_U8;
+		return m_memory != VK_NULL_HANDLE && m_offset < kMaxPtrSize && m_memTypeIdx < kMaxU8;
 	}
 
 private:
 	GpuMemoryManagerChunk* m_chunk = nullptr;
-	PtrSize m_size = MAX_PTR_SIZE;
-	U8 m_memTypeIdx = MAX_U8;
+	PtrSize m_size = kMaxPtrSize;
+	U8 m_memTypeIdx = kMaxU8;
 
 	Bool isDedicated() const
 	{

+ 31 - 31
AnKi/Gr/Vulkan/GrManagerImpl.cpp

@@ -109,10 +109,10 @@ Error GrManagerImpl::init(const GrManagerInitInfo& init)
 	if(err)
 	{
 		ANKI_VK_LOGE("Vulkan initialization failed");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GrManagerImpl::initInternal(const GrManagerInitInfo& init)
@@ -128,7 +128,7 @@ Error GrManagerImpl::initInternal(const GrManagerInitInfo& init)
 
 	for(VulkanQueueType qtype : EnumIterable<VulkanQueueType>())
 	{
-		if(m_queueFamilyIndices[qtype] != MAX_U32)
+		if(m_queueFamilyIndices[qtype] != kMaxU32)
 		{
 			vkGetDeviceQueue(m_device, m_queueFamilyIndices[qtype], 0, &m_queues[qtype]);
 		}
@@ -201,7 +201,7 @@ Error GrManagerImpl::initInternal(const GrManagerInitInfo& init)
 
 	m_frameGarbageCollector.init(this);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GrManagerImpl::initInstance()
@@ -366,7 +366,7 @@ Error GrManagerImpl::initInstance()
 				| VulkanExtensions::KHR_ANDROID_SURFACE)))
 		{
 			ANKI_VK_LOGE("Couldn't find suitable surface extension");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		if(instExtensionCount)
@@ -425,7 +425,7 @@ Error GrManagerImpl::initInstance()
 	if(count < 1)
 	{
 		ANKI_VK_LOGE("Wrong number of physical devices");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	// Find the correct physical device
@@ -465,7 +465,7 @@ Error GrManagerImpl::initInstance()
 		else
 		{
 			ANKI_VK_LOGE("Couldn't find a suitable descrete or integrated physical device");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 	}
 
@@ -525,7 +525,7 @@ Error GrManagerImpl::initInstance()
 	m_capabilities.m_storageBufferMaxRange = m_devProps.properties.limits.maxStorageBufferRange;
 	m_capabilities.m_textureBufferBindOffsetAlignment =
 		max<U32>(ANKI_SAFE_ALIGNMENT, U32(m_devProps.properties.limits.minTexelBufferOffsetAlignment));
-	m_capabilities.m_textureBufferMaxRange = MAX_U32;
+	m_capabilities.m_textureBufferMaxRange = kMaxU32;
 	m_capabilities.m_computeSharedMemorySize = m_devProps.properties.limits.maxComputeSharedMemorySize;
 
 	m_capabilities.m_majorApiVersion = vulkanMajor;
@@ -546,7 +546,7 @@ Error GrManagerImpl::initInstance()
 	// DLSS checks
 	m_capabilities.m_dlss = ANKI_DLSS && m_capabilities.m_gpuVendor == GpuVendor::kNvidia;
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
@@ -580,19 +580,19 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 		}
 	}
 
-	if(m_queueFamilyIndices[VulkanQueueType::GENERAL] == MAX_U32)
+	if(m_queueFamilyIndices[VulkanQueueType::GENERAL] == kMaxU32)
 	{
 		ANKI_VK_LOGE("Couldn't find a queue family with graphics+compute+transfer+present. "
 					 "Something is wrong");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	if(!m_config->getGrAsyncCompute())
 	{
-		m_queueFamilyIndices[VulkanQueueType::COMPUTE] = MAX_U32;
+		m_queueFamilyIndices[VulkanQueueType::COMPUTE] = kMaxU32;
 	}
 
-	if(m_queueFamilyIndices[VulkanQueueType::COMPUTE] == MAX_U32)
+	if(m_queueFamilyIndices[VulkanQueueType::COMPUTE] == kMaxU32)
 	{
 		ANKI_VK_LOGW("Couldn't find an async compute queue. Will try to use the general queue instead");
 	}
@@ -610,7 +610,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 
 	for(VulkanQueueType qtype : EnumIterable<VulkanQueueType>())
 	{
-		if(m_queueFamilyIndices[qtype] != MAX_U32)
+		if(m_queueFamilyIndices[qtype] != kMaxU32)
 		{
 			q[qtype].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
 			q[qtype].queueFamilyIndex = m_queueFamilyIndices[qtype];
@@ -806,14 +806,14 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	if(!(m_extensions & VulkanExtensions::EXT_TEXTURE_COMPRESSION_ASTC_HDR))
 	{
 		ANKI_VK_LOGE(VK_EXT_TEXTURE_COMPRESSION_ASTC_HDR_EXTENSION_NAME " is not supported");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 #endif
 
 	if(!(m_extensions & VulkanExtensions::KHR_CREATE_RENDERPASS_2))
 	{
 		ANKI_VK_LOGE(VK_KHR_CREATE_RENDERPASS_2_EXTENSION_NAME " is not supported");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	if(!!(m_extensions & VulkanExtensions::EXT_SAMPLER_FILTER_MIN_MAX))
@@ -830,7 +830,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	if(!(m_extensions & VulkanExtensions::EXT_DESCRIPTOR_INDEXING))
 	{
 		ANKI_VK_LOGE(VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME " is not supported");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 	else
 	{
@@ -845,20 +845,20 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 		   || !m_descriptorIndexingFeatures.shaderStorageImageArrayNonUniformIndexing)
 		{
 			ANKI_VK_LOGE("Non uniform indexing is not supported by the device");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		if(!m_descriptorIndexingFeatures.descriptorBindingSampledImageUpdateAfterBind
 		   || !m_descriptorIndexingFeatures.descriptorBindingStorageImageUpdateAfterBind)
 		{
 			ANKI_VK_LOGE("Update descriptors after bind is not supported by the device");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		if(!m_descriptorIndexingFeatures.descriptorBindingUpdateUnusedWhilePending)
 		{
 			ANKI_VK_LOGE("Update descriptors while cmd buffer is pending is not supported by the device");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		m_descriptorIndexingFeatures.pNext = const_cast<void*>(ci.pNext);
@@ -891,7 +891,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	if(!(m_extensions & VulkanExtensions::EXT_SCALAR_BLOCK_LAYOUT))
 	{
 		ANKI_VK_LOGE(VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME " is not supported");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 	else
 	{
@@ -905,7 +905,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 		if(!m_scalarBlockLayout.scalarBlockLayout)
 		{
 			ANKI_VK_LOGE("Scalar block layout is not supported by the device");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		m_scalarBlockLayout.pNext = const_cast<void*>(ci.pNext);
@@ -916,7 +916,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	if(!(m_extensions & VulkanExtensions::KHR_TIMELINE_SEMAPHORE))
 	{
 		ANKI_VK_LOGE(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME " is not supported");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 	else
 	{
@@ -930,7 +930,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 		if(!m_timelineSemaphoreFeatures.timelineSemaphore)
 		{
 			ANKI_VK_LOGE("Timeline semaphores are not supported by the device");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		m_timelineSemaphoreFeatures.pNext = const_cast<void*>(ci.pNext);
@@ -955,7 +955,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 		   || !m_accelerationStructureFeatures.accelerationStructure)
 		{
 			ANKI_VK_LOGE("Ray tracing and ray query are both required");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		// Only enable what's necessary
@@ -986,7 +986,7 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	if(!(m_extensions & VulkanExtensions::KHR_SHADER_FLOAT16_INT8))
 	{
 		ANKI_VK_LOGE(VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME " is not supported");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 	else
 	{
@@ -1113,16 +1113,16 @@ Error GrManagerImpl::initDevice(const GrManagerInitInfo& init)
 	if(!(m_extensions & VulkanExtensions::KHR_SPIRV_1_4))
 	{
 		ANKI_VK_LOGE(VK_KHR_SPIRV_1_4_EXTENSION_NAME " is not supported");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	if(!(m_extensions & VulkanExtensions::KHR_SHADER_FLOAT_CONTROLS))
 	{
 		ANKI_VK_LOGE(VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME " is not supported");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GrManagerImpl::initMemory()
@@ -1145,7 +1145,7 @@ Error GrManagerImpl::initMemory()
 	m_gpuMemManager.init(m_physicalDevice, m_device, getAllocator(),
 						 !!(m_extensions & VulkanExtensions::KHR_BUFFER_DEVICE_ADDRESS));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 #if ANKI_GR_MANAGER_DEBUG_MEMMORY
@@ -1657,7 +1657,7 @@ Error GrManagerImpl::printPipelineShaderInfoInternal(VkPipeline ppline, CString
 		ANKI_VK_LOGV("%s", finalLog.cstr());
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 3 - 3
AnKi/Gr/Vulkan/GrManagerImpl.h

@@ -49,7 +49,7 @@ public:
 
 	ConstWeakArray<U32> getQueueFamilies() const
 	{
-		const Bool hasAsyncCompute = m_queueFamilyIndices[VulkanQueueType::COMPUTE] != MAX_U32;
+		const Bool hasAsyncCompute = m_queueFamilyIndices[VulkanQueueType::COMPUTE] != kMaxU32;
 		return (hasAsyncCompute) ? m_queueFamilyIndices : ConstWeakArray<U32>(&m_queueFamilyIndices[0], 1);
 	}
 
@@ -247,7 +247,7 @@ private:
 	VkPhysicalDevice m_physicalDevice = VK_NULL_HANDLE;
 	VulkanExtensions m_extensions = VulkanExtensions::NONE;
 	VkDevice m_device = VK_NULL_HANDLE;
-	VulkanQueueFamilies m_queueFamilyIndices = {MAX_U32, MAX_U32};
+	VulkanQueueFamilies m_queueFamilyIndices = {kMaxU32, kMaxU32};
 	Array<VkQueue, U32(VulkanQueueType::kCount)> m_queues = {};
 	Mutex m_globalMtx;
 
@@ -293,7 +293,7 @@ private:
 	U32 m_nativeWindowHeight = 0;
 #endif
 	MicroSwapchainPtr m_crntSwapchain;
-	U8 m_acquiredImageIdx = MAX_U8;
+	U8 m_acquiredImageIdx = kMaxU8;
 
 	Array<PerFrame, MAX_FRAMES_IN_FLIGHT> m_perFrame;
 	/// @}

+ 1 - 1
AnKi/Gr/Vulkan/GrManagerImplAndroid.cpp

@@ -17,7 +17,7 @@ Error GrManagerImpl::initSurface(const GrManagerInitInfo& init)
 
 	ANKI_VK_CHECK(vkCreateAndroidSurfaceKHR(m_instance, &createInfo, nullptr, &m_surface));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 1 - 1
AnKi/Gr/Vulkan/GrManagerImplHeadless.cpp

@@ -18,7 +18,7 @@ Error GrManagerImpl::initSurface(const GrManagerInitInfo& init)
 	m_nativeWindowWidth = init.m_window->getWidth();
 	m_nativeWindowHeight = init.m_window->getHeight();
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 2 - 2
AnKi/Gr/Vulkan/GrManagerImplSdl.cpp

@@ -22,10 +22,10 @@ Error GrManagerImpl::initSurface(const GrManagerInitInfo& init)
 	if(!SDL_Vulkan_CreateSurface(static_cast<NativeWindowSdl*>(init.m_window)->m_window, m_instance, &m_surface))
 	{
 		ANKI_VK_LOGE("SDL_Vulkan_CreateSurface() failed: %s", SDL_GetError());
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 6 - 6
AnKi/Gr/Vulkan/GrUpscalerImpl.cpp

@@ -40,7 +40,7 @@ Error GrUpscalerImpl::initInternal(const GrUpscalerInitInfo& initInfo)
 	ANKI_ASSERT(!"Not supported");
 #endif
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 // ==== DLSS ====
@@ -53,7 +53,7 @@ Error GrUpscalerImpl::initInternal(const GrUpscalerInitInfo& initInfo)
 			if(NVSDK_NGX_FAILED(result)) \
 			{ \
 				ANKI_VK_LOGE("DLSS failed to initialize %ls", GetNGXResultAsString(result)); \
-				return Error::FUNCTION_FAILED; \
+				return Error::kFunctionFailed; \
 			} \
 		} while(0)
 
@@ -93,7 +93,7 @@ Error GrUpscalerImpl::initDlss(const GrUpscalerInitInfo& initInfo)
 	if(needsUpdatedDriver)
 	{
 		ANKI_VK_LOGE("DLSS cannot be loaded due to outdated driver");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 #	endif
 
@@ -102,14 +102,14 @@ Error GrUpscalerImpl::initDlss(const GrUpscalerInitInfo& initInfo)
 	if(!dlssAvailable)
 	{
 		ANKI_VK_LOGE("NVIDIA DLSS not available on this hardware/platform");
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	// Create the feature
 	ANKI_CHECK(createDlssFeature(initInfo.m_sourceTextureResolution, initInfo.m_targetTextureResolution,
 								 initInfo.m_qualityMode));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GrUpscalerImpl::createDlssFeature(const UVec2& srcRes, const UVec2& dstRes, const GrUpscalerQualityMode quality)
@@ -150,7 +150,7 @@ Error GrUpscalerImpl::createDlssFeature(const UVec2& srcRes, const UVec2& dstRes
 	cmdb->flush({}, &fence);
 	fence->clientWait(60.0_sec);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void GrUpscalerImpl::destroyDlss()

+ 3 - 3
AnKi/Gr/Vulkan/GrUpscalerImpl.h

@@ -21,9 +21,9 @@ namespace anki {
 class DLSSRecommendedSettings
 {
 public:
-	UVec2 m_optimalRenderSize = UVec2(MAX_U32);
-	UVec2 m_dynamicMaximumRenderSize = UVec2(MAX_U32);
-	UVec2 m_dynamicMinimumRenderSize = UVec2(MAX_U32);
+	UVec2 m_optimalRenderSize = UVec2(kMaxU32);
+	UVec2 m_dynamicMaximumRenderSize = UVec2(kMaxU32);
+	UVec2 m_dynamicMinimumRenderSize = UVec2(kMaxU32);
 };
 
 class GrUpscalerImpl final : public GrUpscaler, public VulkanObject<GrUpscaler, GrUpscalerImpl>

+ 1 - 1
AnKi/Gr/Vulkan/MicroObjectRecycler.h

@@ -76,7 +76,7 @@ private:
 	static constexpr U32 m_maxRequestsPerAdjustment = 128;
 	U32 m_cacheMisses = 0;
 	U32 m_requests = 0;
-	U32 m_minCacheSizePerRequest = MAX_U32;
+	U32 m_minCacheSizePerRequest = kMaxU32;
 	// End trim cache adjustment vars
 
 #if ANKI_EXTRA_CHECKS

+ 1 - 1
AnKi/Gr/Vulkan/OcclusionQueryImpl.cpp

@@ -19,7 +19,7 @@ OcclusionQueryImpl::~OcclusionQueryImpl()
 Error OcclusionQueryImpl::init()
 {
 	ANKI_CHECK(getGrManagerImpl().getOcclusionQueryFactory().newQuery(m_handle));
-	return Error::NONE;
+	return Error::kNone;
 }
 
 OcclusionQueryResult OcclusionQueryImpl::getResultInternal() const

+ 1 - 1
AnKi/Gr/Vulkan/Pipeline.h

@@ -20,7 +20,7 @@ namespace anki {
 class VertexBufferBindingPipelineState
 {
 public:
-	U32 m_stride = MAX_U32; ///< Vertex stride.
+	U32 m_stride = kMaxU32; ///< Vertex stride.
 	VertexStepRate m_stepRate = VertexStepRate::kVertex;
 	Array<U8, 3> m_padding = {};
 

+ 2 - 2
AnKi/Gr/Vulkan/PipelineCache.cpp

@@ -66,7 +66,7 @@ Error PipelineCache::init(VkDevice dev, VkPhysicalDevice pdev, CString cacheDir,
 
 	ANKI_VK_CHECK(vkCreatePipelineCache(dev, &ci, nullptr, &m_cacheHandle));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void PipelineCache::destroy(VkDevice dev, VkPhysicalDevice pdev, GrAllocator<U8> alloc)
@@ -116,7 +116,7 @@ Error PipelineCache::destroyInternal(VkDevice dev, VkPhysicalDevice pdev, GrAllo
 		m_cacheHandle = VK_NULL_HANDLE;
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 1 - 1
AnKi/Gr/Vulkan/PipelineLayout.cpp

@@ -71,7 +71,7 @@ Error PipelineLayoutFactory::newPipelineLayout(const WeakArray<DescriptorSetLayo
 		layout.m_handle = pplineLayHandle;
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 2 - 2
AnKi/Gr/Vulkan/QueryFactory.cpp

@@ -73,12 +73,12 @@ Error QueryFactory::newQuery(MicroQuery& handle)
 	}
 
 	ANKI_ASSERT(!!handle);
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void QueryFactory::deleteQuery(MicroQuery& handle)
 {
-	ANKI_ASSERT(handle.m_pool && handle.m_queryIndex != MAX_U32 && handle.m_chunk);
+	ANKI_ASSERT(handle.m_pool && handle.m_queryIndex != kMaxU32 && handle.m_chunk);
 
 	LockGuard<Mutex> lock(m_mtx);
 

+ 2 - 2
AnKi/Gr/Vulkan/QueryFactory.h

@@ -34,7 +34,7 @@ public:
 	/// Get the index of the query inside the query pool.
 	U32 getQueryIndex() const
 	{
-		ANKI_ASSERT(m_queryIndex != MAX_U32);
+		ANKI_ASSERT(m_queryIndex != kMaxU32);
 		return m_queryIndex;
 	}
 
@@ -45,7 +45,7 @@ public:
 
 private:
 	VkQueryPool m_pool = VK_NULL_HANDLE;
-	U32 m_queryIndex = MAX_U32;
+	U32 m_queryIndex = kMaxU32;
 	QueryFactoryChunk* m_chunk = nullptr;
 };
 

+ 2 - 2
AnKi/Gr/Vulkan/SamplerFactory.cpp

@@ -109,7 +109,7 @@ Error MicroSampler::init(const SamplerInitInfo& inf)
 	ANKI_VK_CHECK(vkCreateSampler(m_factory->m_gr->getDevice(), &ci, nullptr, &m_handle));
 	m_factory->m_gr->trySetVulkanHandleName(inf.getName(), VK_OBJECT_TYPE_SAMPLER, m_handle);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void SamplerFactory::init(GrManagerImpl* gr)
@@ -143,7 +143,7 @@ Error SamplerFactory::newInstance(const SamplerInitInfo& inf, MicroSamplerPtr& p
 {
 	ANKI_ASSERT(m_gr);
 
-	Error err = Error::NONE;
+	Error err = Error::kNone;
 	MicroSampler* out = nullptr;
 	const U64 hash = inf.computeHash();
 

+ 3 - 3
AnKi/Gr/Vulkan/ShaderImpl.cpp

@@ -116,7 +116,7 @@ Error ShaderImpl::init(const ShaderInitInfo& inf)
 		}
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void ShaderImpl::doReflection(ConstWeakArray<U8> spirv, SpecConstsVector& specConstIds)
@@ -163,7 +163,7 @@ void ShaderImpl::doReflection(ConstWeakArray<U8> spirv, SpecConstsVector& specCo
 			}
 
 			// Check that there are no other descriptors with the same binding
-			U32 foundIdx = MAX_U32;
+			U32 foundIdx = kMaxU32;
 			for(U32 i = 0; i < counts[set]; ++i)
 			{
 				if(descriptors[set][i].m_binding == binding)
@@ -173,7 +173,7 @@ void ShaderImpl::doReflection(ConstWeakArray<U8> spirv, SpecConstsVector& specCo
 				}
 			}
 
-			if(foundIdx == MAX_U32)
+			if(foundIdx == kMaxU32)
 			{
 				// New binding, init it
 				DescriptorBinding& descriptor = descriptors[set][counts[set]++];

+ 1 - 1
AnKi/Gr/Vulkan/ShaderProgramImpl.cpp

@@ -352,7 +352,7 @@ Error ShaderProgramImpl::init(const ShaderProgramInitInfo& inf)
 														   &m_rt.m_allHandles[0]));
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 8 - 8
AnKi/Gr/Vulkan/SwapchainFactory.cpp

@@ -44,18 +44,18 @@ Error MicroSwapchain::initInternal()
 																m_factory->m_gr->getSurface(), &surfaceProperties));
 
 #if ANKI_WINDOWING_SYSTEM_HEADLESS
-		if(surfaceProperties.currentExtent.width != MAX_U32 || surfaceProperties.currentExtent.height != MAX_U32)
+		if(surfaceProperties.currentExtent.width != kMaxU32 || surfaceProperties.currentExtent.height != kMaxU32)
 		{
 			ANKI_VK_LOGE("Was expecting an indication that the surface size will be determined by the extent of a "
 						 "swapchain targeting the surface");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 		m_factory->m_gr->getNativeWindowSize(surfaceWidth, surfaceHeight);
 #else
-		if(surfaceProperties.currentExtent.width == MAX_U32 || surfaceProperties.currentExtent.height == MAX_U32)
+		if(surfaceProperties.currentExtent.width == kMaxU32 || surfaceProperties.currentExtent.height == kMaxU32)
 		{
 			ANKI_VK_LOGE("Wrong surface size");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 		surfaceWidth = surfaceProperties.currentExtent.width;
 		surfaceHeight = surfaceProperties.currentExtent.height;
@@ -109,7 +109,7 @@ Error MicroSwapchain::initInternal()
 		if(surfaceFormat == VK_FORMAT_UNDEFINED)
 		{
 			ANKI_VK_LOGE("Suitable surface format not found");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 		else
 		{
@@ -162,7 +162,7 @@ Error MicroSwapchain::initInternal()
 		if(presentMode == VK_PRESENT_MODE_MAX_ENUM_KHR)
 		{
 			ANKI_VK_LOGE("Couldn't find a present mode");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 	}
 
@@ -188,7 +188,7 @@ Error MicroSwapchain::initInternal()
 		else
 		{
 			ANKI_VK_LOGE("Failed to set compositeAlpha");
-			return Error::FUNCTION_FAILED;
+			return Error::kFunctionFailed;
 		}
 
 		VkSwapchainCreateInfoKHR ci = {};
@@ -248,7 +248,7 @@ Error MicroSwapchain::initInternal()
 		}
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 GrAllocator<U8> MicroSwapchain::getAllocator() const

+ 10 - 10
AnKi/Gr/Vulkan/TextureImpl.cpp

@@ -47,7 +47,7 @@ U32 MicroImageView::getOrCreateBindlessIndex(GrManagerImpl& gr) const
 	LockGuard<SpinLock> lock(m_bindlessIndexLock);
 
 	U32 outIdx;
-	if(m_bindlessIndex != MAX_U32)
+	if(m_bindlessIndex != kMaxU32)
 	{
 		outIdx = m_bindlessIndex;
 	}
@@ -78,10 +78,10 @@ TextureImpl::~TextureImpl()
 		garbage->m_viewHandles.emplaceBack(getAllocator(), it.m_handle);
 		it.m_handle = VK_NULL_HANDLE;
 
-		if(it.m_bindlessIndex != MAX_U32)
+		if(it.m_bindlessIndex != kMaxU32)
 		{
 			garbage->m_bindlessIndices.emplaceBack(getAllocator(), it.m_bindlessIndex);
-			it.m_bindlessIndex = MAX_U32;
+			it.m_bindlessIndex = kMaxU32;
 		}
 	}
 
@@ -92,10 +92,10 @@ TextureImpl::~TextureImpl()
 		garbage->m_viewHandles.emplaceBack(getAllocator(), m_singleSurfaceImageView.m_handle);
 		m_singleSurfaceImageView.m_handle = VK_NULL_HANDLE;
 
-		if(m_singleSurfaceImageView.m_bindlessIndex != MAX_U32)
+		if(m_singleSurfaceImageView.m_bindlessIndex != kMaxU32)
 		{
 			garbage->m_bindlessIndices.emplaceBack(getAllocator(), m_singleSurfaceImageView.m_bindlessIndex);
-			m_singleSurfaceImageView.m_bindlessIndex = MAX_U32;
+			m_singleSurfaceImageView.m_bindlessIndex = kMaxU32;
 		}
 	}
 
@@ -192,7 +192,7 @@ Error TextureImpl::initInternal(VkImage externalImage, const TextureInitInfo& in
 												  ptrToNumber(m_singleSurfaceImageView.m_handle));
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 VkImageCreateFlags TextureImpl::calcCreateFlags(const TextureInitInfo& init)
@@ -233,7 +233,7 @@ Error TextureImpl::initImage(const TextureInitInfo& init)
 		ANKI_VK_LOGE("TextureInitInfo contains a combination of parameters that it's not supported by the device. "
 					 "Texture format is %s",
 					 getFormatInfo(init.m_format).m_name);
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	// Contunue with the creation
@@ -310,13 +310,13 @@ Error TextureImpl::initImage(const TextureInitInfo& init)
 																		 VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
 
 	// Fallback
-	if(memIdx == MAX_U32)
+	if(memIdx == kMaxU32)
 	{
 		memIdx = getGrManagerImpl().getGpuMemoryManager().findMemoryType(requirements.memoryRequirements.memoryTypeBits,
 																		 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0);
 	}
 
-	ANKI_ASSERT(memIdx != MAX_U32);
+	ANKI_ASSERT(memIdx != kMaxU32);
 
 	// Allocate
 	if(!dedicatedRequirements.prefersDedicatedAllocation)
@@ -333,7 +333,7 @@ Error TextureImpl::initImage(const TextureInitInfo& init)
 	// Bind
 	ANKI_VK_CHECK(vkBindImageMemory(getDevice(), m_imageHandle, m_memHandle.m_memory, m_memHandle.m_offset));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void TextureImpl::computeBarrierInfo(TextureUsageBit usage, Bool src, U32 level, VkPipelineStageFlags& stages,

+ 3 - 3
AnKi/Gr/Vulkan/TextureImpl.h

@@ -35,7 +35,7 @@ public:
 
 	~MicroImageView()
 	{
-		ANKI_ASSERT(m_bindlessIndex == MAX_U32 && "Forgot to unbind the bindless");
+		ANKI_ASSERT(m_bindlessIndex == kMaxU32 && "Forgot to unbind the bindless");
 		ANKI_ASSERT(m_handle == VK_NULL_HANDLE);
 	}
 
@@ -44,7 +44,7 @@ public:
 		m_handle = b.m_handle;
 		b.m_handle = VK_NULL_HANDLE;
 		m_bindlessIndex = b.m_bindlessIndex;
-		b.m_bindlessIndex = MAX_U32;
+		b.m_bindlessIndex = kMaxU32;
 		m_derivedTextureType = b.m_derivedTextureType;
 		b.m_derivedTextureType = TextureType::kCount;
 		return *this;
@@ -68,7 +68,7 @@ public:
 private:
 	VkImageView m_handle = VK_NULL_HANDLE;
 
-	mutable U32 m_bindlessIndex = MAX_U32;
+	mutable U32 m_bindlessIndex = kMaxU32;
 	mutable SpinLock m_bindlessIndexLock;
 
 	/// Because for example a single surface view of a cube texture will be a 2D view.

+ 2 - 2
AnKi/Gr/Vulkan/TextureViewImpl.cpp

@@ -33,12 +33,12 @@ Error TextureViewImpl::init(const TextureViewInitInfo& inf)
 	Array<U64, 2> toHash = {tex.getUuid(), ptrToNumber(m_handle)};
 	m_hash = computeHash(&toHash[0], sizeof(toHash));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 U32 TextureViewImpl::getOrCreateBindlessIndex()
 {
-	if(m_bindlessIndex == MAX_U32)
+	if(m_bindlessIndex == kMaxU32)
 	{
 		m_bindlessIndex = m_microImageView->getOrCreateBindlessIndex(getGrManagerImpl());
 	}

+ 1 - 1
AnKi/Gr/Vulkan/TextureViewImpl.h

@@ -55,7 +55,7 @@ public:
 
 private:
 	VkImageView m_handle = {}; ///< Cache the handle.
-	U32 m_bindlessIndex = MAX_U32; ///< Cache it.
+	U32 m_bindlessIndex = kMaxU32; ///< Cache it.
 
 	/// This is a hash that depends on the Texture and the VkImageView. It's used as a replacement of
 	/// TextureView::m_uuid since it creates less unique IDs.

+ 1 - 1
AnKi/Gr/Vulkan/TimestampQueryImpl.cpp

@@ -22,7 +22,7 @@ Error TimestampQueryImpl::init()
 
 	m_timestampPeriod = U64(getGrManagerImpl().getPhysicalDeviceProperties().limits.timestampPeriod);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 TimestampQueryResult TimestampQueryImpl::getResultInternal(Second& timestamp) const

+ 28 - 28
AnKi/Importer/GltfImporter.cpp

@@ -41,11 +41,11 @@ static Error getUniformScale(const Mat4& m, F32& out)
 	if(absolute(scale - yAxis.getLength()) > SCALE_THRESHOLD || absolute(scale - zAxis.getLength()) > SCALE_THRESHOLD)
 	{
 		ANKI_IMPORTER_LOGE("No uniform scale in the matrix");
-		return Error::USER_DATA;
+		return Error::kUserData;
 	}
 
 	out = scale;
-	return Error::NONE;
+	return Error::kNone;
 }
 #endif
 
@@ -125,14 +125,14 @@ static Error getNodeTransform(const cgltf_node& node, Transform& trf)
 	if(absolute(scale[0] - scale[1]) > scaleEpsilon || absolute(scale[0] - scale[2]) > scaleEpsilon)
 	{
 		ANKI_IMPORTER_LOGE("Expecting uniform scale");
-		return Error::USER_DATA;
+		return Error::kUserData;
 	}
 
 	trf.setOrigin(tsl.xyz0());
 	trf.setRotation(Mat3x4(Vec3(0.0f), rot));
 	trf.setScale(scale[0]);
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 static Bool stringsExist(const HashMapAuto<CString, StringAuto>& map, const std::initializer_list<CString>& list)
@@ -183,7 +183,7 @@ Error GltfImporter::init(const GltfImporterInitInfo& initInfo)
 	if(m_lodFactor * F32(m_lodCount - 1) > 0.7f)
 	{
 		ANKI_IMPORTER_LOGE("LOD factor is too high %f", m_lodFactor);
-		return Error::USER_DATA;
+		return Error::kUserData;
 	}
 
 	if(m_lodFactor < EPSILON || m_lodCount == 1)
@@ -199,14 +199,14 @@ Error GltfImporter::init(const GltfImporterInitInfo& initInfo)
 	if(res != cgltf_result_success)
 	{
 		ANKI_IMPORTER_LOGE("Failed to open the GLTF file. Code: %d", res);
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	res = cgltf_load_buffers(&options, m_gltf, m_inputFname.cstr());
 	if(res != cgltf_result_success)
 	{
 		ANKI_IMPORTER_LOGE("Failed to load GLTF data. Code: %d", res);
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	if(initInfo.m_threadCount > 0)
@@ -215,7 +215,7 @@ Error GltfImporter::init(const GltfImporterInitInfo& initInfo)
 		m_hive = m_alloc.newInstance<ThreadHive>(threadCount, m_alloc, true);
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GltfImporter::writeAll()
@@ -229,7 +229,7 @@ Error GltfImporter::writeAll()
 	ANKI_CHECK(m_sceneFile.writeText("local scene = getSceneGraph()\nlocal events = getEventManager()\n"));
 
 	// Nodes
-	Error err = Error::NONE;
+	Error err = Error::kNone;
 	for(const cgltf_scene* scene = m_gltf->scenes; scene < m_gltf->scenes + m_gltf->scenes_count && !err; ++scene)
 	{
 		for(cgltf_node* const* node = scene->nodes; node < scene->nodes + scene->nodes_count && !err; ++node)
@@ -271,7 +271,7 @@ Error GltfImporter::getExtras(const cgltf_extras& extras, HashMapAuto<CString, S
 	cgltf_copy_extras_json(m_gltf, &extras, nullptr, &extrasSize);
 	if(extrasSize == 0)
 	{
-		return Error::NONE;
+		return Error::kNone;
 	}
 
 	DynamicArrayAuto<char, PtrSize> json(m_alloc);
@@ -280,7 +280,7 @@ Error GltfImporter::getExtras(const cgltf_extras& extras, HashMapAuto<CString, S
 	if(res != cgltf_result_success)
 	{
 		ANKI_IMPORTER_LOGE("cgltf_copy_extras_json failed: %d", res);
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	json[json.getSize() - 1] = '\0';
@@ -292,7 +292,7 @@ Error GltfImporter::getExtras(const cgltf_extras& extras, HashMapAuto<CString, S
 	const I tokenCount = jsmn_parse(&parser, jsonTxt.cstr(), jsonTxt.getLength(), nullptr, 0);
 	if(tokenCount < 1)
 	{
-		return Error::NONE;
+		return Error::kNone;
 	}
 
 	DynamicArrayAuto<jsmntok_t> tokens(m_alloc);
@@ -318,7 +318,7 @@ Error GltfImporter::getExtras(const cgltf_extras& extras, HashMapAuto<CString, S
 	if((tokenStrings.getSize() % 2) != 0)
 	{
 		ANKI_IMPORTER_LOGE("Unable to parse: %s", jsonTxt.cstr());
-		return Error::FUNCTION_FAILED;
+		return Error::kFunctionFailed;
 	}
 
 	// Write them to the map
@@ -333,7 +333,7 @@ Error GltfImporter::getExtras(const cgltf_extras& extras, HashMapAuto<CString, S
 		++it;
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 void GltfImporter::populateNodePtrToIdxInternal(const cgltf_node& node, U32& idx)
@@ -384,7 +384,7 @@ Error GltfImporter::parseArrayOfNumbers(CString str, DynamicArrayAuto<F64>& out,
 
 	out.create(U32(list.getSize()));
 
-	Error err = Error::NONE;
+	Error err = Error::kNone;
 	auto it = list.getBegin();
 	auto end = list.getEnd();
 	U32 i = 0;
@@ -405,7 +405,7 @@ Error GltfImporter::parseArrayOfNumbers(CString str, DynamicArrayAuto<F64>& out,
 						   str.cstr());
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GltfImporter::visitNode(const cgltf_node& node, const Transform& parentTrf,
@@ -485,7 +485,7 @@ Error GltfImporter::visitNode(const cgltf_node& node, const Transform& parentTrf
 				if(tokens.getSize() != 3)
 				{
 					ANKI_IMPORTER_LOGE("Error parsing \"skybox_solid_color\" of node %s", getNodeName(node).cstr());
-					return Error::USER_DATA;
+					return Error::kUserData;
 				}
 
 				U count = 0;
@@ -497,7 +497,7 @@ Error GltfImporter::visitNode(const cgltf_node& node, const Transform& parentTrf
 					if(err)
 					{
 						ANKI_IMPORTER_LOGE("Error parsing \"skybox_solid_color\" of node %s", getNodeName(node).cstr());
-						return Error::USER_DATA;
+						return Error::kUserData;
 					}
 
 					solidColor[count++] = f;
@@ -810,7 +810,7 @@ Error GltfImporter::visitNode(const cgltf_node& node, const Transform& parentTrf
 		ANKI_CHECK(visitNode(*(*c), nodeTrf, outExtras));
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GltfImporter::writeTransform(const Transform& trf)
@@ -831,7 +831,7 @@ Error GltfImporter::writeTransform(const Transform& trf)
 
 	ANKI_CHECK(m_sceneFile.writeText("node:getSceneNodeBase():getMoveComponent():setLocalTransform(trf)\n"));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GltfImporter::writeModel(const cgltf_mesh& mesh)
@@ -898,7 +898,7 @@ Error GltfImporter::writeModel(const cgltf_mesh& mesh)
 
 	ANKI_CHECK(file.writeText("</model>\n"));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GltfImporter::writeSkeleton(const cgltf_skin& skin)
@@ -913,7 +913,7 @@ Error GltfImporter::writeSkeleton(const cgltf_skin& skin)
 	if(boneMats.getSize() != skin.joints_count)
 	{
 		ANKI_IMPORTER_LOGE("Bone matrices should match the joint count");
-		return Error::USER_DATA;
+		return Error::kUserData;
 	}
 
 	// Write file
@@ -963,7 +963,7 @@ Error GltfImporter::writeSkeleton(const cgltf_skin& skin)
 	ANKI_CHECK(file.writeText("\t</bones>\n"));
 	ANKI_CHECK(file.writeText("</skeleton>\n"));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GltfImporter::writeLight(const cgltf_node& node, const HashMapAuto<CString, StringAuto>& parentExtras)
@@ -990,7 +990,7 @@ Error GltfImporter::writeLight(const cgltf_node& node, const HashMapAuto<CString
 		break;
 	default:
 		ANKI_IMPORTER_LOGE("Unsupporter light type %d", light.type);
-		return Error::USER_DATA;
+		return Error::kUserData;
 	}
 
 	ANKI_CHECK(m_sceneFile.writeTextf("\nnode = scene:new%sLightNode(\"%s\")\n", lightTypeStr.cstr(), nodeName.cstr()));
@@ -1102,7 +1102,7 @@ Error GltfImporter::writeLight(const cgltf_node& node, const HashMapAuto<CString
 		}
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GltfImporter::writeCamera(const cgltf_node& node,
@@ -1111,7 +1111,7 @@ Error GltfImporter::writeCamera(const cgltf_node& node,
 	if(node.camera->type != cgltf_camera_type_perspective)
 	{
 		ANKI_IMPORTER_LOGV("Unsupported camera type: %s", getNodeName(node).cstr());
-		return Error::NONE;
+		return Error::kNone;
 	}
 
 	const cgltf_camera_perspective& cam = node.camera->data.perspective;
@@ -1126,7 +1126,7 @@ Error GltfImporter::writeCamera(const cgltf_node& node,
 	ANKI_CHECK(m_sceneFile.writeText("frustumc:setShadowCascadesDistancePower(1.5)\n"));
 	ANKI_CHECK(m_sceneFile.writeTextf("frustumc:setEffectiveShadowDistance(%f)\n", min(cam.zfar, 100.0f)));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GltfImporter::writeModelNode(const cgltf_node& node, const HashMapAuto<CString, StringAuto>& parentExtras)
@@ -1148,7 +1148,7 @@ Error GltfImporter::writeModelNode(const cgltf_node& node, const HashMapAuto<CSt
 										  m_rpath.cstr(), computeSkeletonResourceFilename(*node.skin).cstr()));
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 StringAuto GltfImporter::computeModelResourceFilename(const cgltf_mesh& mesh) const

+ 1 - 1
AnKi/Importer/GltfImporter.h

@@ -32,7 +32,7 @@ public:
 	F32 m_lodFactor = 1.0f;
 	U32 m_lodCount = 1;
 	F32 m_lightIntensityScale = 1.0f;
-	U32 m_threadCount = MAX_U32;
+	U32 m_threadCount = kMaxU32;
 	CString m_comment;
 };
 

+ 4 - 4
AnKi/Importer/GltfImporterAnimation.cpp

@@ -173,7 +173,7 @@ Error GltfImporter::writeAnimation(const cgltf_animation& anim)
 			if(keys.getSize() != positions.getSize())
 			{
 				ANKI_IMPORTER_LOGE("Position count should match they keyframes");
-				return Error::USER_DATA;
+				return Error::kUserData;
 			}
 
 			for(U32 i = 0; i < keys.getSize(); ++i)
@@ -197,7 +197,7 @@ Error GltfImporter::writeAnimation(const cgltf_animation& anim)
 			if(keys.getSize() != rotations.getSize())
 			{
 				ANKI_IMPORTER_LOGE("Rotation count should match they keyframes");
-				return Error::USER_DATA;
+				return Error::kUserData;
 			}
 
 			for(U32 i = 0; i < keys.getSize(); ++i)
@@ -221,7 +221,7 @@ Error GltfImporter::writeAnimation(const cgltf_animation& anim)
 			if(keys.getSize() != scales.getSize())
 			{
 				ANKI_IMPORTER_LOGE("Scale count should match they keyframes");
-				return Error::USER_DATA;
+				return Error::kUserData;
 			}
 
 			Bool scaleErrorReported = false;
@@ -366,7 +366,7 @@ Error GltfImporter::writeAnimation(const cgltf_animation& anim)
 		// ANKI_CHECK(m_sceneFile.writeText("--]]\n"));
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

+ 4 - 4
AnKi/Importer/GltfImporterMaterial.cpp

@@ -94,7 +94,7 @@ static Error findConstantColorsInImage(CString fname, Vec4& constantColor, Gener
 		}
 	}
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 Error GltfImporter::writeMaterial(const cgltf_material& mtl, Bool writeRayTracing)
@@ -106,7 +106,7 @@ Error GltfImporter::writeMaterial(const cgltf_material& mtl, Bool writeRayTracin
 	if(!mtl.has_pbr_metallic_roughness)
 	{
 		ANKI_IMPORTER_LOGE("Expecting PBR metallic roughness");
-		return Error::USER_DATA;
+		return Error::kUserData;
 	}
 
 	HashMapAuto<CString, StringAuto> extras(m_alloc);
@@ -161,7 +161,7 @@ Error GltfImporter::writeMaterial(const cgltf_material& mtl, Bool writeRayTracin
 			if(tokens.getSize() != 3)
 			{
 				ANKI_IMPORTER_LOGE("Wrong specular: %s", it->cstr());
-				return Error::USER_DATA;
+				return Error::kUserData;
 			}
 
 			auto token = tokens.getBegin();
@@ -338,7 +338,7 @@ Error GltfImporter::writeMaterial(const cgltf_material& mtl, Bool writeRayTracin
 	ANKI_CHECK(file.open(fname.toCString(), FileOpenFlag::WRITE));
 	ANKI_CHECK(file.writeText(xml));
 
-	return Error::NONE;
+	return Error::kNone;
 }
 
 } // end namespace anki

Some files were not shown because too many files changed in this diff