Browse Source

Merge pull request #78 from godlikepanos/dirrenaming

Spring cleaning
Panagiotis Christopoulos Charitos 4 years ago
parent
commit
317cb379ff
100 changed files with 422 additions and 343 deletions
  1. 20 0
      AnKi/AnKi.h
  2. 6 0
      AnKi/CMakeLists.txt
  3. 19 0
      AnKi/Collision.h
  4. 1 1
      AnKi/Collision/Aabb.cpp
  5. 1 1
      AnKi/Collision/Aabb.h
  6. 0 0
      AnKi/Collision/CMakeLists.txt
  7. 3 3
      AnKi/Collision/Common.h
  8. 1 1
      AnKi/Collision/Cone.h
  9. 2 2
      AnKi/Collision/ConvexHullShape.cpp
  10. 2 2
      AnKi/Collision/ConvexHullShape.h
  11. 0 0
      AnKi/Collision/Forward.h
  12. 5 5
      AnKi/Collision/Functions.h
  13. 7 7
      AnKi/Collision/FunctionsComputeAabb.cpp
  14. 2 2
      AnKi/Collision/FunctionsMisc.cpp
  15. 7 7
      AnKi/Collision/FunctionsTestCollision.cpp
  16. 6 6
      AnKi/Collision/FunctionsTestPlane.cpp
  17. 1 1
      AnKi/Collision/GjkEpa.cpp
  18. 3 3
      AnKi/Collision/GjkEpa.h
  19. 2 2
      AnKi/Collision/LineSegment.h
  20. 1 1
      AnKi/Collision/Obb.cpp
  21. 3 3
      AnKi/Collision/Obb.h
  22. 1 1
      AnKi/Collision/Plane.cpp
  23. 1 1
      AnKi/Collision/Plane.h
  24. 1 1
      AnKi/Collision/Ray.h
  25. 1 1
      AnKi/Collision/Sphere.cpp
  26. 1 1
      AnKi/Collision/Sphere.h
  27. 0 0
      AnKi/Config.h.cmake
  28. 4 4
      AnKi/Core.h
  29. 24 24
      AnKi/Core/App.cpp
  30. 5 5
      AnKi/Core/App.h
  31. 0 0
      AnKi/Core/CMakeLists.txt
  32. 1 1
      AnKi/Core/Common.h
  33. 0 0
      AnKi/Core/ConfigDefs.h
  34. 11 11
      AnKi/Core/ConfigSet.cpp
  35. 3 3
      AnKi/Core/ConfigSet.h
  36. 4 4
      AnKi/Core/CoreTracer.cpp
  37. 5 5
      AnKi/Core/CoreTracer.h
  38. 2 2
      AnKi/Core/DeveloperConsole.cpp
  39. 4 4
      AnKi/Core/DeveloperConsole.h
  40. 5 5
      AnKi/Core/NativeWindow.h
  41. 6 6
      AnKi/Core/NativeWindowAndroid.cpp
  42. 1 1
      AnKi/Core/NativeWindowAndroid.h
  43. 1 1
      AnKi/Core/NativeWindowDummy.cpp
  44. 4 4
      AnKi/Core/NativeWindowEglFbdev.cpp
  45. 1 1
      AnKi/Core/NativeWindowEglFbdev.h
  46. 2 2
      AnKi/Core/NativeWindowSdl.cpp
  47. 1 1
      AnKi/Core/NativeWindowSdl.h
  48. 4 4
      AnKi/Core/StagingGpuMemoryManager.cpp
  49. 3 3
      AnKi/Core/StagingGpuMemoryManager.h
  50. 3 3
      AnKi/Core/StdinListener.cpp
  51. 4 4
      AnKi/Core/StdinListener.h
  52. 34 0
      AnKi/Gr.h
  53. 3 3
      AnKi/Gr/AccelerationStructure.h
  54. 2 2
      AnKi/Gr/Buffer.h
  55. 3 3
      AnKi/Gr/CMakeLists.txt
  56. 3 3
      AnKi/Gr/CommandBuffer.h
  57. 1 1
      AnKi/Gr/Common.cpp
  58. 4 4
      AnKi/Gr/Common.h
  59. 0 0
      AnKi/Gr/ConfigDefs.h
  60. 4 4
      AnKi/Gr/Enums.h
  61. 1 1
      AnKi/Gr/Fence.h
  62. 2 2
      AnKi/Gr/Framebuffer.h
  63. 4 4
      AnKi/Gr/Gl/Buffer.cpp
  64. 2 2
      AnKi/Gr/Gl/BufferImpl.cpp
  65. 2 2
      AnKi/Gr/Gl/BufferImpl.h
  66. 16 16
      AnKi/Gr/Gl/CommandBuffer.cpp
  67. 13 13
      AnKi/Gr/Gl/CommandBufferImpl.cpp
  68. 4 4
      AnKi/Gr/Gl/CommandBufferImpl.h
  69. 1 1
      AnKi/Gr/Gl/Common.cpp
  70. 1 1
      AnKi/Gr/Gl/Common.h
  71. 2 2
      AnKi/Gr/Gl/Error.cpp
  72. 1 1
      AnKi/Gr/Gl/Error.h
  73. 6 6
      AnKi/Gr/Gl/Fence.cpp
  74. 7 7
      AnKi/Gr/Gl/FenceImpl.cpp
  75. 2 2
      AnKi/Gr/Gl/FenceImpl.h
  76. 4 4
      AnKi/Gr/Gl/Framebuffer.cpp
  77. 8 8
      AnKi/Gr/Gl/FramebufferImpl.cpp
  78. 2 2
      AnKi/Gr/Gl/FramebufferImpl.h
  79. 6 6
      AnKi/Gr/Gl/GlObject.cpp
  80. 1 1
      AnKi/Gr/Gl/GlObject.h
  81. 6 6
      AnKi/Gr/Gl/GlState.cpp
  82. 5 5
      AnKi/Gr/Gl/GlState.h
  83. 15 15
      AnKi/Gr/Gl/GrManager.cpp
  84. 6 6
      AnKi/Gr/Gl/GrManagerImpl.cpp
  85. 2 2
      AnKi/Gr/Gl/GrManagerImpl.h
  86. 5 5
      AnKi/Gr/Gl/GrManagerImplSdl.cpp
  87. 4 4
      AnKi/Gr/Gl/OcclusionQuery.cpp
  88. 1 1
      AnKi/Gr/Gl/OcclusionQueryImpl.cpp
  89. 2 2
      AnKi/Gr/Gl/OcclusionQueryImpl.h
  90. 9 9
      AnKi/Gr/Gl/RenderingThread.cpp
  91. 2 2
      AnKi/Gr/Gl/RenderingThread.h
  92. 4 4
      AnKi/Gr/Gl/Sampler.cpp
  93. 2 2
      AnKi/Gr/Gl/SamplerImpl.cpp
  94. 2 2
      AnKi/Gr/Gl/SamplerImpl.h
  95. 4 4
      AnKi/Gr/Gl/Shader.cpp
  96. 7 7
      AnKi/Gr/Gl/ShaderImpl.cpp
  97. 2 2
      AnKi/Gr/Gl/ShaderImpl.h
  98. 5 5
      AnKi/Gr/Gl/ShaderProgram.cpp
  99. 3 3
      AnKi/Gr/Gl/ShaderProgramImpl.cpp
  100. 2 2
      AnKi/Gr/Gl/ShaderProgramImpl.h

+ 20 - 0
AnKi/AnKi.h

@@ -0,0 +1,20 @@
+// Copyright (C) 2009-2021, Panagiotis Christopoulos Charitos and contributors.
+// All rights reserved.
+// Code licensed under the BSD License.
+// http://www.anki3d.org/LICENSE
+
+#pragma once
+
+#include <AnKi/Util.h>
+#include <AnKi/Math.h>
+#include <AnKi/Collision.h>
+#include <AnKi/Scene.h>
+#include <AnKi/Renderer.h>
+#include <AnKi/Script.h>
+#include <AnKi/Input.h>
+#include <AnKi/Resource.h>
+#include <AnKi/Physics.h>
+#include <AnKi/Gr.h>
+#include <AnKi/Core.h>
+#include <AnKi/Importer.h>
+#include <AnKi/ShaderCompiler.h>

+ 6 - 0
AnKi/CMakeLists.txt

@@ -0,0 +1,6 @@
+set(ANKI_SUB_DIRS Importer Core Script Renderer Scene Ui Input Physics Resource Gr Collision Math Util ShaderCompiler)
+foreach(TMP ${ANKI_SUB_DIRS})
+	add_subdirectory(${TMP})
+endforeach()
+
+set(AK_SOURCES ${AK_SOURCES} PARENT_SCOPE)

+ 19 - 0
AnKi/Collision.h

@@ -0,0 +1,19 @@
+// Copyright (C) 2009-2021, Panagiotis Christopoulos Charitos and contributors.
+// All rights reserved.
+// Code licensed under the BSD License.
+// http://www.anki3d.org/LICENSE
+
+#pragma once
+
+#include <AnKi/Collision/Plane.h>
+#include <AnKi/Collision/Sphere.h>
+#include <AnKi/Collision/Obb.h>
+#include <AnKi/Collision/LineSegment.h>
+#include <AnKi/Collision/Aabb.h>
+#include <AnKi/Collision/ConvexHullShape.h>
+#include <AnKi/Collision/Ray.h>
+#include <AnKi/Collision/Cone.h>
+
+#include <AnKi/Collision/Functions.h>
+
+/// @defgroup collision Collision detection module

+ 1 - 1
anki/collision/Aabb.cpp → AnKi/Collision/Aabb.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/collision/Aabb.h>
+#include <AnKi/Collision/Aabb.h>
 
 namespace anki
 {

+ 1 - 1
anki/collision/Aabb.h → AnKi/Collision/Aabb.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
+#include <AnKi/Collision/Common.h>
 
 namespace anki
 {

+ 0 - 0
anki/collision/CMakeLists.txt → AnKi/Collision/CMakeLists.txt


+ 3 - 3
anki/collision/Common.h → AnKi/Collision/Common.h

@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <anki/collision/Forward.h>
-#include <anki/Math.h>
-#include <anki/util/Enum.h>
+#include <AnKi/Collision/Forward.h>
+#include <AnKi/Math.h>
+#include <AnKi/Util/Enum.h>
 
 namespace anki
 {

+ 1 - 1
anki/collision/Cone.h → AnKi/Collision/Cone.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
+#include <AnKi/Collision/Common.h>
 
 namespace anki
 {

+ 2 - 2
anki/collision/ConvexHullShape.cpp → AnKi/Collision/ConvexHullShape.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/collision/ConvexHullShape.h>
-#include <anki/util/Functions.h>
+#include <AnKi/Collision/ConvexHullShape.h>
+#include <AnKi/Util/Functions.h>
 
 namespace anki
 {

+ 2 - 2
anki/collision/ConvexHullShape.h → AnKi/Collision/ConvexHullShape.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
-#include <anki/util/WeakArray.h>
+#include <AnKi/Collision/Common.h>
+#include <AnKi/Util/WeakArray.h>
 
 namespace anki
 {

+ 0 - 0
anki/collision/Forward.h → AnKi/Collision/Forward.h


+ 5 - 5
anki/collision/Functions.h → AnKi/Collision/Functions.h

@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
-#include <anki/collision/Plane.h>
-#include <anki/collision/Ray.h>
-#include <anki/collision/Aabb.h>
+#include <AnKi/Collision/Common.h>
+#include <AnKi/Collision/Plane.h>
+#include <AnKi/Collision/Ray.h>
+#include <AnKi/Collision/Aabb.h>
 
 namespace anki
 {
@@ -231,4 +231,4 @@ void computeEdgesOfFrustum(F32 far, F32 fovX, F32 fovY, Vec4 points[4]);
 
 /// @}
 
-} // end namespace anki
+} // end namespace anki

+ 7 - 7
anki/collision/FunctionsComputeAabb.cpp → AnKi/Collision/FunctionsComputeAabb.cpp

@@ -3,12 +3,12 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/collision/Functions.h>
-#include <anki/collision/ConvexHullShape.h>
-#include <anki/collision/Obb.h>
-#include <anki/collision/LineSegment.h>
-#include <anki/collision/Cone.h>
-#include <anki/collision/Sphere.h>
+#include <AnKi/Collision/Functions.h>
+#include <AnKi/Collision/ConvexHullShape.h>
+#include <AnKi/Collision/Obb.h>
+#include <AnKi/Collision/LineSegment.h>
+#include <AnKi/Collision/Cone.h>
+#include <AnKi/Collision/Sphere.h>
 
 namespace anki
 {
@@ -63,4 +63,4 @@ Aabb computeAabb(const LineSegment& ls)
 	return Aabb(min, max);
 }
 
-} // end namespace anki
+} // end namespace anki

+ 2 - 2
anki/collision/FunctionsMisc.cpp → AnKi/Collision/FunctionsMisc.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/collision/Functions.h>
+#include <AnKi/Collision/Functions.h>
 
 namespace anki
 {
@@ -56,4 +56,4 @@ void computeEdgesOfFrustum(F32 far, F32 fovX, F32 fovY, Vec4 points[4])
 	points[3] = Vec4(x, -y, z, 0.0f); // bot right
 }
 
-} // end namespace anki
+} // end namespace anki

+ 7 - 7
anki/collision/FunctionsTestCollision.cpp → AnKi/Collision/FunctionsTestCollision.cpp

@@ -3,13 +3,13 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/collision/Functions.h>
-#include <anki/collision/ConvexHullShape.h>
-#include <anki/collision/Obb.h>
-#include <anki/collision/LineSegment.h>
-#include <anki/collision/Cone.h>
-#include <anki/collision/Sphere.h>
-#include <anki/collision/GjkEpa.h>
+#include <AnKi/Collision/Functions.h>
+#include <AnKi/Collision/ConvexHullShape.h>
+#include <AnKi/Collision/Obb.h>
+#include <AnKi/Collision/LineSegment.h>
+#include <AnKi/Collision/Cone.h>
+#include <AnKi/Collision/Sphere.h>
+#include <AnKi/Collision/GjkEpa.h>
 
 namespace anki
 {

+ 6 - 6
anki/collision/FunctionsTestPlane.cpp → AnKi/Collision/FunctionsTestPlane.cpp

@@ -1,9 +1,9 @@
-#include <anki/collision/Functions.h>
-#include <anki/collision/ConvexHullShape.h>
-#include <anki/collision/Obb.h>
-#include <anki/collision/LineSegment.h>
-#include <anki/collision/Cone.h>
-#include <anki/collision/Sphere.h>
+#include <AnKi/Collision/Functions.h>
+#include <AnKi/Collision/ConvexHullShape.h>
+#include <AnKi/Collision/Obb.h>
+#include <AnKi/Collision/LineSegment.h>
+#include <AnKi/Collision/Cone.h>
+#include <AnKi/Collision/Sphere.h>
 
 namespace anki
 {

+ 1 - 1
anki/collision/GjkEpa.cpp → AnKi/Collision/GjkEpa.cpp

@@ -4,7 +4,7 @@
 // http://www.anki3d.org/LICENSE
 // Inspired by http://vec3.ca/gjk/implementation/
 
-#include <anki/collision/GjkEpa.h>
+#include <AnKi/Collision/GjkEpa.h>
 
 namespace anki
 {

+ 3 - 3
anki/collision/GjkEpa.h → AnKi/Collision/GjkEpa.h

@@ -5,13 +5,13 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
-#include <anki/Math.h>
+#include <AnKi/Collision/Common.h>
+#include <AnKi/Math.h>
 
 namespace anki
 {
 
-/// @addtogroup collision_internal
+/// @addtogroup collision
 /// @{
 
 using GjkSupportCallback = Vec4 (*)(const void* shape, const Vec4& dir);

+ 2 - 2
anki/collision/LineSegment.h → AnKi/Collision/LineSegment.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
-#include <anki/Math.h>
+#include <AnKi/Collision/Common.h>
+#include <AnKi/Math.h>
 
 namespace anki
 {

+ 1 - 1
anki/collision/Obb.cpp → AnKi/Collision/Obb.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/collision/Obb.h>
+#include <AnKi/Collision/Obb.h>
 
 namespace anki
 {

+ 3 - 3
anki/collision/Obb.h → AnKi/Collision/Obb.h

@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
-#include <anki/Math.h>
-#include <anki/util/Array.h>
+#include <AnKi/Collision/Common.h>
+#include <AnKi/Math.h>
+#include <AnKi/Util/Array.h>
 
 namespace anki
 {

+ 1 - 1
anki/collision/Plane.cpp → AnKi/Collision/Plane.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/collision/Plane.h>
+#include <AnKi/Collision/Plane.h>
 
 namespace anki
 {

+ 1 - 1
anki/collision/Plane.h → AnKi/Collision/Plane.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
+#include <AnKi/Collision/Common.h>
 
 namespace anki
 {

+ 1 - 1
anki/collision/Ray.h → AnKi/Collision/Ray.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
+#include <AnKi/Collision/Common.h>
 
 namespace anki
 {

+ 1 - 1
anki/collision/Sphere.cpp → AnKi/Collision/Sphere.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/collision/Sphere.h>
+#include <AnKi/Collision/Sphere.h>
 
 namespace anki
 {

+ 1 - 1
anki/collision/Sphere.h → AnKi/Collision/Sphere.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/collision/Common.h>
+#include <AnKi/Collision/Common.h>
 
 namespace anki
 {

+ 0 - 0
anki/Config.h.cmake → AnKi/Config.h.cmake


+ 4 - 4
anki/Core.h → AnKi/Core.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/core/App.h>
-#include <anki/core/ConfigSet.h>
-#include <anki/core/NativeWindow.h>
-#include <anki/core/CoreTracer.h>
+#include <AnKi/Core/App.h>
+#include <AnKi/Core/ConfigSet.h>
+#include <AnKi/Core/NativeWindow.h>
+#include <AnKi/Core/CoreTracer.h>

+ 24 - 24
anki/core/App.cpp → AnKi/Core/App.cpp

@@ -3,30 +3,30 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/App.h>
-#include <anki/core/ConfigSet.h>
-#include <anki/util/Logger.h>
-#include <anki/util/File.h>
-#include <anki/util/Filesystem.h>
-#include <anki/util/System.h>
-#include <anki/util/ThreadHive.h>
-#include <anki/util/Tracer.h>
-#include <anki/util/HighRezTimer.h>
-#include <anki/core/CoreTracer.h>
-#include <anki/core/DeveloperConsole.h>
-#include <anki/core/NativeWindow.h>
-#include <anki/input/Input.h>
-#include <anki/scene/SceneGraph.h>
-#include <anki/renderer/RenderQueue.h>
-#include <anki/resource/ResourceManager.h>
-#include <anki/physics/PhysicsWorld.h>
-#include <anki/renderer/MainRenderer.h>
-#include <anki/script/ScriptManager.h>
-#include <anki/resource/ResourceFilesystem.h>
-#include <anki/resource/AsyncLoader.h>
-#include <anki/core/StagingGpuMemoryManager.h>
-#include <anki/ui/UiManager.h>
-#include <anki/ui/Canvas.h>
+#include <AnKi/Core/App.h>
+#include <AnKi/Core/ConfigSet.h>
+#include <AnKi/Util/Logger.h>
+#include <AnKi/Util/File.h>
+#include <AnKi/Util/Filesystem.h>
+#include <AnKi/Util/System.h>
+#include <AnKi/Util/ThreadHive.h>
+#include <AnKi/Util/Tracer.h>
+#include <AnKi/Util/HighRezTimer.h>
+#include <AnKi/Core/CoreTracer.h>
+#include <AnKi/Core/DeveloperConsole.h>
+#include <AnKi/Core/NativeWindow.h>
+#include <AnKi/Input/Input.h>
+#include <AnKi/Scene/SceneGraph.h>
+#include <AnKi/Renderer/RenderQueue.h>
+#include <AnKi/Resource/ResourceManager.h>
+#include <AnKi/Physics/PhysicsWorld.h>
+#include <AnKi/Renderer/MainRenderer.h>
+#include <AnKi/Script/ScriptManager.h>
+#include <AnKi/Resource/ResourceFilesystem.h>
+#include <AnKi/Resource/AsyncLoader.h>
+#include <AnKi/Core/StagingGpuMemoryManager.h>
+#include <AnKi/Ui/UiManager.h>
+#include <AnKi/Ui/Canvas.h>
 
 #if ANKI_OS_ANDROID
 #	include <android_native_app_glue.h>

+ 5 - 5
anki/core/App.h → AnKi/Core/App.h

@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <anki/core/Common.h>
-#include <anki/util/Allocator.h>
-#include <anki/util/String.h>
-#include <anki/util/Ptr.h>
-#include <anki/ui/UiImmediateModeBuilder.h>
+#include <AnKi/Core/Common.h>
+#include <AnKi/Util/Allocator.h>
+#include <AnKi/Util/String.h>
+#include <AnKi/Util/Ptr.h>
+#include <AnKi/Ui/UiImmediateModeBuilder.h>
 #if ANKI_OS_ANDROID
 #	include <android_native_app_glue.h>
 #endif

+ 0 - 0
anki/core/CMakeLists.txt → AnKi/Core/CMakeLists.txt


+ 1 - 1
anki/core/Common.h → AnKi/Core/Common.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/Config.h>
+#include <AnKi/Config.h>
 
 namespace anki
 {

+ 0 - 0
anki/core/ConfigDefs.h → AnKi/Core/ConfigDefs.h


+ 11 - 11
anki/core/ConfigSet.cpp → AnKi/Core/ConfigSet.cpp

@@ -3,14 +3,14 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/ConfigSet.h>
-#include <anki/util/Xml.h>
-#include <anki/util/Logger.h>
-#include <anki/util/File.h>
+#include <AnKi/Core/ConfigSet.h>
+#include <AnKi/Util/Xml.h>
+#include <AnKi/Util/Logger.h>
+#include <AnKi/Util/File.h>
 
 // Used by the config options
-#include <anki/util/System.h>
-#include <anki/renderer/ClusterBin.h>
+#include <AnKi/Util/System.h>
+#include <AnKi/Renderer/ClusterBin.h>
 
 namespace anki
 {
@@ -65,11 +65,11 @@ ConfigSet::ConfigSet()
 	m_alloc = HeapAllocator<U8>(allocAligned, nullptr);
 
 #define ANKI_CONFIG_OPTION(name, ...) newOption(ANKI_STRINGIZE(name), __VA_ARGS__);
-#include <anki/core/ConfigDefs.h>
-#include <anki/resource/ConfigDefs.h>
-#include <anki/renderer/ConfigDefs.h>
-#include <anki/scene/ConfigDefs.h>
-#include <anki/gr/ConfigDefs.h>
+#include <AnKi/Core/ConfigDefs.h>
+#include <AnKi/Resource/ConfigDefs.h>
+#include <AnKi/Renderer/ConfigDefs.h>
+#include <AnKi/Scene/ConfigDefs.h>
+#include <AnKi/Gr/ConfigDefs.h>
 #undef ANKI_CONFIG_OPTION
 }
 

+ 3 - 3
anki/core/ConfigSet.h → AnKi/Core/ConfigSet.h

@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <anki/core/Common.h>
-#include <anki/util/List.h>
-#include <anki/util/String.h>
+#include <AnKi/Core/Common.h>
+#include <AnKi/Util/List.h>
+#include <AnKi/Util/String.h>
 
 namespace anki
 {

+ 4 - 4
anki/core/CoreTracer.cpp → AnKi/Core/CoreTracer.cpp

@@ -3,10 +3,10 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/CoreTracer.h>
-#include <anki/util/DynamicArray.h>
-#include <anki/util/Tracer.h>
-#include <anki/math/Functions.h>
+#include <AnKi/Core/CoreTracer.h>
+#include <AnKi/Util/DynamicArray.h>
+#include <AnKi/Util/Tracer.h>
+#include <AnKi/Math/Functions.h>
 #include <ctime>
 
 namespace anki

+ 5 - 5
anki/core/CoreTracer.h → AnKi/Core/CoreTracer.h

@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <anki/core/Common.h>
-#include <anki/util/Thread.h>
-#include <anki/util/Allocator.h>
-#include <anki/util/List.h>
-#include <anki/util/File.h>
+#include <AnKi/Core/Common.h>
+#include <AnKi/Util/Thread.h>
+#include <AnKi/Util/Allocator.h>
+#include <AnKi/Util/List.h>
+#include <AnKi/Util/File.h>
 
 namespace anki
 {

+ 2 - 2
anki/core/DeveloperConsole.cpp → AnKi/Core/DeveloperConsole.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/DeveloperConsole.h>
+#include <AnKi/Core/DeveloperConsole.h>
 
 namespace anki
 {
@@ -26,7 +26,7 @@ Error DeveloperConsole::init(AllocAlignedCallback allocCb, void* allocCbUserData
 	m_alloc = HeapAllocator<U8>(allocCb, allocCbUserData);
 	zeroMemory(m_inputText);
 
-	ANKI_CHECK(m_manager->newInstance(m_font, "engine_data/UbuntuMonoRegular.ttf", std::initializer_list<U32>{16}));
+	ANKI_CHECK(m_manager->newInstance(m_font, "EngineAssets/UbuntuMonoRegular.ttf", std::initializer_list<U32>{16}));
 
 	// Add a new callback to the logger
 	LoggerSingleton::get().addMessageHandler(this, loggerCallback);

+ 4 - 4
anki/core/DeveloperConsole.h → AnKi/Core/DeveloperConsole.h

@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <anki/Ui.h>
-#include <anki/core/Common.h>
-#include <anki/util/List.h>
-#include <anki/script/ScriptEnvironment.h>
+#include <AnKi/Ui.h>
+#include <AnKi/Core/Common.h>
+#include <AnKi/Util/List.h>
+#include <AnKi/Script/ScriptEnvironment.h>
 
 namespace anki
 {

+ 5 - 5
anki/core/NativeWindow.h → AnKi/Core/NativeWindow.h

@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <anki/core/Common.h>
-#include <anki/util/StdTypes.h>
-#include <anki/util/Array.h>
-#include <anki/util/String.h>
-#include <anki/util/Allocator.h>
+#include <AnKi/Core/Common.h>
+#include <AnKi/Util/StdTypes.h>
+#include <AnKi/Util/Array.h>
+#include <AnKi/Util/String.h>
+#include <AnKi/Util/Allocator.h>
 
 namespace anki
 {

+ 6 - 6
anki/core/NativeWindowAndroid.cpp → AnKi/Core/NativeWindowAndroid.cpp

@@ -3,12 +3,12 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/NativeWindowAndroid.h>
-#include <anki/core/App.h>
-#include <anki/util/Logger.h>
-#include <anki/util/Array.h>
-#include <anki/util/StdTypes.h>
-#include <anki/core/Counters.h>
+#include <AnKi/Core/NativeWindowAndroid.h>
+#include <AnKi/Core/App.h>
+#include <AnKi/Util/Logger.h>
+#include <AnKi/Util/Array.h>
+#include <AnKi/Util/StdTypes.h>
+#include <AnKi/Core/Counters.h>
 
 namespace anki
 {

+ 1 - 1
anki/core/NativeWindowAndroid.h → AnKi/Core/NativeWindowAndroid.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/core/NativeWindow.h>
+#include <AnKi/Core/NativeWindow.h>
 #include <EGL/egl.h>
 #include <GLES3/gl3.h>
 #include <android_native_app_glue.h>

+ 1 - 1
anki/core/NativeWindowDummy.cpp → AnKi/Core/NativeWindowDummy.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/NativeWindow.h>
+#include <AnKi/Core/NativeWindow.h>
 
 namespace anki
 {

+ 4 - 4
anki/core/NativeWindowEglFbdev.cpp → AnKi/Core/NativeWindowEglFbdev.cpp

@@ -3,10 +3,10 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/NativeWindowEglFbdev.h>
-#include <anki/util/Vector.h>
-#include <anki/util/Array.h>
-#include <anki/util/StdTypes.h>
+#include <AnKi/Core/NativeWindowEglFbdev.h>
+#include <AnKi/Util/Vector.h>
+#include <AnKi/Util/Array.h>
+#include <AnKi/Util/StdTypes.h>
 
 namespace anki
 {

+ 1 - 1
anki/core/NativeWindowEglFbdev.h → AnKi/Core/NativeWindowEglFbdev.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/core/NativeWindow.h>
+#include <AnKi/Core/NativeWindow.h>
 #define EGL_FBDEV 1
 #include <EGL/egl.h>
 #include <GLES3/gl3.h>

+ 2 - 2
anki/core/NativeWindowSdl.cpp → AnKi/Core/NativeWindowSdl.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/NativeWindowSdl.h>
-#include <anki/util/Logger.h>
+#include <AnKi/Core/NativeWindowSdl.h>
+#include <AnKi/Util/Logger.h>
 #if ANKI_GR_BACKEND_VULKAN
 #	include <SDL_vulkan.h>
 #endif

+ 1 - 1
anki/core/NativeWindowSdl.h → AnKi/Core/NativeWindowSdl.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/core/NativeWindow.h>
+#include <AnKi/Core/NativeWindow.h>
 #include <SDL.h>
 
 namespace anki

+ 4 - 4
anki/core/StagingGpuMemoryManager.cpp → AnKi/Core/StagingGpuMemoryManager.cpp

@@ -3,10 +3,10 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/StagingGpuMemoryManager.h>
-#include <anki/core/ConfigSet.h>
-#include <anki/gr/GrManager.h>
-#include <anki/util/Tracer.h>
+#include <AnKi/Core/StagingGpuMemoryManager.h>
+#include <AnKi/Core/ConfigSet.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Util/Tracer.h>
 
 namespace anki
 {

+ 3 - 3
anki/core/StagingGpuMemoryManager.h → AnKi/Core/StagingGpuMemoryManager.h

@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <anki/core/Common.h>
-#include <anki/gr/Buffer.h>
-#include <anki/gr/utils/FrameGpuAllocator.h>
+#include <AnKi/Core/Common.h>
+#include <AnKi/Gr/Buffer.h>
+#include <AnKi/Gr/Utils/FrameGpuAllocator.h>
 
 namespace anki
 {

+ 3 - 3
anki/core/StdinListener.cpp → AnKi/Core/StdinListener.cpp

@@ -3,9 +3,9 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/core/StdinListener.h>
-#include <anki/util/Array.h>
-#include <anki/util/Thread.h>
+#include <AnKi/Core/StdinListener.h>
+#include <AnKi/Util/Array.h>
+#include <AnKi/Util/Thread.h>
 #include <unistd.h>
 
 namespace anki

+ 4 - 4
anki/core/StdinListener.h → AnKi/Core/StdinListener.h

@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <anki/core/Common.h>
-#include <anki/util/String.h>
-#include <anki/util/Thread.h>
-#include <anki/util/List.h>
+#include <AnKi/Core/Common.h>
+#include <AnKi/Util/String.h>
+#include <AnKi/Util/Thread.h>
+#include <AnKi/Util/List.h>
 
 namespace anki
 {

+ 34 - 0
AnKi/Gr.h

@@ -0,0 +1,34 @@
+// Copyright (C) 2009-2021, Panagiotis Christopoulos Charitos and contributors.
+// All rights reserved.
+// Code licensed under the BSD License.
+// http://www.anki3d.org/LICENSE
+
+#pragma once
+
+#include <AnKi/Gr/Buffer.h>
+#include <AnKi/Gr/Texture.h>
+#include <AnKi/Gr/TextureView.h>
+#include <AnKi/Gr/Sampler.h>
+#include <AnKi/Gr/Shader.h>
+#include <AnKi/Gr/ShaderProgram.h>
+#include <AnKi/Gr/Framebuffer.h>
+#include <AnKi/Gr/CommandBuffer.h>
+#include <AnKi/Gr/OcclusionQuery.h>
+#include <AnKi/Gr/TimestampQuery.h>
+#include <AnKi/Gr/Fence.h>
+#include <AnKi/Gr/AccelerationStructure.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/RenderGraph.h>
+
+#include <AnKi/Gr/Utils/ClassGpuAllocator.h>
+#include <AnKi/Gr/Utils/FrameGpuAllocator.h>
+#include <AnKi/Gr/Utils/Functions.h>
+#include <AnKi/Gr/Utils/StackGpuAllocator.h>
+
+/// @defgroup graphics Graphics API abstraction
+
+/// @defgroup opengl OpenGL backend
+/// @ingroup graphics
+
+/// @defgroup vulkan Vulkan backend
+/// @ingroup graphics

+ 3 - 3
anki/gr/AccelerationStructure.h → AnKi/Gr/AccelerationStructure.h

@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <anki/gr/Buffer.h>
-#include <anki/Math.h>
-#include <anki/util/WeakArray.h>
+#include <AnKi/Gr/Buffer.h>
+#include <AnKi/Math.h>
+#include <AnKi/Util/WeakArray.h>
 
 namespace anki
 {

+ 2 - 2
anki/gr/Buffer.h → AnKi/Gr/Buffer.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/GrObject.h>
-#include <anki/util/WeakArray.h>
+#include <AnKi/Gr/GrObject.h>
+#include <AnKi/Util/WeakArray.h>
 
 namespace anki
 {

+ 3 - 3
anki/gr/CMakeLists.txt → AnKi/Gr/CMakeLists.txt

@@ -1,9 +1,9 @@
-file(GLOB SOURCES *.cpp utils/*.cpp)
+file(GLOB SOURCES *.cpp Utils/*.cpp)
 
 if(GL)
-	set(GR_BACKEND "gl")
+	set(GR_BACKEND "Gl")
 else()
-	set(GR_BACKEND "vulkan")
+	set(GR_BACKEND "Vulkan")
 endif()
 
 file(GLOB GR_BACKEND_SOURCES ${GR_BACKEND}/*.cpp)

+ 3 - 3
anki/gr/CommandBuffer.h → AnKi/Gr/CommandBuffer.h

@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <anki/gr/GrObject.h>
-#include <anki/gr/Framebuffer.h>
-#include <anki/util/Functions.h>
+#include <AnKi/Gr/GrObject.h>
+#include <AnKi/Gr/Framebuffer.h>
+#include <AnKi/Util/Functions.h>
 
 namespace anki
 {

+ 1 - 1
anki/gr/Common.cpp → AnKi/Gr/Common.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/Common.h>
+#include <AnKi/Gr/Common.h>
 
 namespace anki
 {

+ 4 - 4
anki/gr/Common.h → AnKi/Gr/Common.h

@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <anki/gr/Enums.h>
-#include <anki/util/Allocator.h>
-#include <anki/util/Ptr.h>
-#include <anki/util/String.h>
+#include <AnKi/Gr/Enums.h>
+#include <AnKi/Util/Allocator.h>
+#include <AnKi/Util/Ptr.h>
+#include <AnKi/Util/String.h>
 
 namespace anki
 {

+ 0 - 0
anki/gr/ConfigDefs.h → AnKi/Gr/ConfigDefs.h


+ 4 - 4
anki/gr/Enums.h → AnKi/Gr/Enums.h

@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include <anki/util/StdTypes.h>
-#include <anki/util/Enum.h>
-#include <anki/util/Array.h>
+#include <AnKi/Util/StdTypes.h>
+#include <AnKi/Util/Enum.h>
+#include <AnKi/Util/Array.h>
 
 namespace anki
 {
@@ -496,7 +496,7 @@ enum class ShaderVariableDataType : U8
 
 #define ANKI_SVDT_MACRO(capital, type, baseType, rowCount, columnCount) capital,
 #define ANKI_SVDT_MACRO_OPAQUE(capital, type) capital,
-#include <anki/gr/ShaderVariableDataTypeDefs.h>
+#include <AnKi/Gr/ShaderVariableDataTypeDefs.h>
 #undef ANKI_SVDT_MACRO
 #undef ANKI_SVDT_MACRO_OPAQUE
 

+ 1 - 1
anki/gr/Fence.h → AnKi/Gr/Fence.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/gr/GrObject.h>
+#include <AnKi/Gr/GrObject.h>
 
 namespace anki
 {

+ 2 - 2
anki/gr/Framebuffer.h → AnKi/Gr/Framebuffer.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/GrObject.h>
-#include <anki/gr/TextureView.h>
+#include <AnKi/Gr/GrObject.h>
+#include <AnKi/Gr/TextureView.h>
 
 namespace anki
 {

+ 4 - 4
anki/gr/gl/Buffer.cpp → AnKi/Gr/Gl/Buffer.cpp

@@ -3,10 +3,10 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/Buffer.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/BufferImpl.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/Buffer.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/BufferImpl.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
 
 namespace anki
 {

+ 2 - 2
anki/gr/gl/BufferImpl.cpp → AnKi/Gr/Gl/BufferImpl.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/BufferImpl.h>
-#include <anki/util/Logger.h>
+#include <AnKi/Gr/gl/BufferImpl.h>
+#include <AnKi/Util/Logger.h>
 #include <cmath>
 
 namespace anki

+ 2 - 2
anki/gr/gl/BufferImpl.h → AnKi/Gr/Gl/BufferImpl.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/Buffer.h>
-#include <anki/gr/gl/GlObject.h>
+#include <AnKi/Gr/Buffer.h>
+#include <AnKi/Gr/gl/GlObject.h>
 
 namespace anki
 {

+ 16 - 16
anki/gr/gl/CommandBuffer.cpp → AnKi/Gr/Gl/CommandBuffer.cpp

@@ -3,22 +3,22 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/CommandBuffer.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/gl/RenderingThread.h>
-#include <anki/gr/gl/GlState.h>
-
-#include <anki/gr/gl/FramebufferImpl.h>
-#include <anki/gr/gl/OcclusionQueryImpl.h>
-#include <anki/gr/gl/TextureImpl.h>
-#include <anki/gr/gl/BufferImpl.h>
-#include <anki/gr/gl/SamplerImpl.h>
-#include <anki/gr/gl/ShaderProgramImpl.h>
-#include <anki/gr/gl/TextureViewImpl.h>
-
-#include <anki/core/Trace.h>
+#include <AnKi/Gr/CommandBuffer.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/gl/RenderingThread.h>
+#include <AnKi/Gr/gl/GlState.h>
+
+#include <AnKi/Gr/gl/FramebufferImpl.h>
+#include <AnKi/Gr/gl/OcclusionQueryImpl.h>
+#include <AnKi/Gr/gl/TextureImpl.h>
+#include <AnKi/Gr/gl/BufferImpl.h>
+#include <AnKi/Gr/gl/SamplerImpl.h>
+#include <AnKi/Gr/gl/ShaderProgramImpl.h>
+#include <AnKi/Gr/gl/TextureViewImpl.h>
+
+#include <AnKi/Core/Trace.h>
 
 namespace anki
 {

+ 13 - 13
anki/gr/gl/CommandBufferImpl.cpp → AnKi/Gr/Gl/CommandBufferImpl.cpp

@@ -3,19 +3,19 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/gl/GlState.h>
-#include <anki/gr/gl/Error.h>
-
-#include <anki/gr/OcclusionQuery.h>
-#include <anki/gr/gl/OcclusionQueryImpl.h>
-#include <anki/gr/Buffer.h>
-#include <anki/gr/gl/BufferImpl.h>
-
-#include <anki/util/Logger.h>
-#include <anki/core/Trace.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/gl/GlState.h>
+#include <AnKi/Gr/gl/Error.h>
+
+#include <AnKi/Gr/OcclusionQuery.h>
+#include <AnKi/Gr/gl/OcclusionQueryImpl.h>
+#include <AnKi/Gr/Buffer.h>
+#include <AnKi/Gr/gl/BufferImpl.h>
+
+#include <AnKi/Util/Logger.h>
+#include <AnKi/Core/Trace.h>
 #include <cstring>
 
 namespace anki

+ 4 - 4
anki/gr/gl/CommandBufferImpl.h → AnKi/Gr/Gl/CommandBufferImpl.h

@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include <anki/gr/CommandBuffer.h>
-#include <anki/gr/gl/StateTracker.h>
-#include <anki/util/Assert.h>
-#include <anki/util/Allocator.h>
+#include <AnKi/Gr/CommandBuffer.h>
+#include <AnKi/Gr/gl/StateTracker.h>
+#include <AnKi/Util/Assert.h>
+#include <AnKi/Util/Allocator.h>
 
 namespace anki
 {

+ 1 - 1
anki/gr/gl/Common.cpp → AnKi/Gr/Gl/Common.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/Common.h>
+#include <AnKi/Gr/gl/Common.h>
 
 namespace anki
 {

+ 1 - 1
anki/gr/gl/Common.h → AnKi/Gr/Gl/Common.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/gr/Common.h>
+#include <AnKi/Gr/Common.h>
 
 #if ANKI_GL == ANKI_GL_DESKTOP
 #	if ANKI_OS == ANKI_OS_WINDOWS && !defined(GLEW_STATIC)

+ 2 - 2
anki/gr/gl/Error.cpp → AnKi/Gr/Gl/Error.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/Error.h>
-#include <anki/util/Logger.h>
+#include <AnKi/Gr/gl/Error.h>
+#include <AnKi/Util/Logger.h>
 #include <cstring>
 
 namespace anki

+ 1 - 1
anki/gr/gl/Error.h → AnKi/Gr/Gl/Error.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/gr/gl/Common.h>
+#include <AnKi/Gr/gl/Common.h>
 
 namespace anki
 {

+ 6 - 6
anki/gr/gl/Fence.cpp → AnKi/Gr/Gl/Fence.cpp

@@ -3,12 +3,12 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/Fence.h>
-#include <anki/gr/gl/FenceImpl.h>
-#include <anki/gr/CommandBuffer.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/util/HighRezTimer.h>
+#include <AnKi/Gr/Fence.h>
+#include <AnKi/Gr/gl/FenceImpl.h>
+#include <AnKi/Gr/CommandBuffer.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Util/HighRezTimer.h>
 
 namespace anki
 {

+ 7 - 7
anki/gr/gl/FenceImpl.cpp → AnKi/Gr/Gl/FenceImpl.cpp

@@ -3,12 +3,12 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/FenceImpl.h>
-#include <anki/gr/CommandBuffer.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/gl/RenderingThread.h>
+#include <AnKi/Gr/gl/FenceImpl.h>
+#include <AnKi/Gr/CommandBuffer.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/gl/RenderingThread.h>
 
 namespace anki
 {
@@ -52,4 +52,4 @@ FenceImpl::~FenceImpl()
 	}
 }
 
-} // end namespace anki
+} // end namespace anki

+ 2 - 2
anki/gr/gl/FenceImpl.h → AnKi/Gr/Gl/FenceImpl.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/Fence.h>
-#include <anki/gr/gl/GlObject.h>
+#include <AnKi/Gr/Fence.h>
+#include <AnKi/Gr/gl/GlObject.h>
 
 namespace anki
 {

+ 4 - 4
anki/gr/gl/Framebuffer.cpp → AnKi/Gr/Gl/Framebuffer.cpp

@@ -3,10 +3,10 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/Framebuffer.h>
-#include <anki/gr/gl/FramebufferImpl.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
+#include <AnKi/Gr/Framebuffer.h>
+#include <AnKi/Gr/gl/FramebufferImpl.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
 
 namespace anki
 {

+ 8 - 8
anki/gr/gl/FramebufferImpl.cpp → AnKi/Gr/Gl/FramebufferImpl.cpp

@@ -3,14 +3,14 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/FramebufferImpl.h>
-#include <anki/gr/Texture.h>
-#include <anki/gr/gl/TextureViewImpl.h>
-#include <anki/gr/gl/GlState.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/gl/RenderingThread.h>
-#include <anki/util/Logger.h>
+#include <AnKi/Gr/gl/FramebufferImpl.h>
+#include <AnKi/Gr/Texture.h>
+#include <AnKi/Gr/gl/TextureViewImpl.h>
+#include <AnKi/Gr/gl/GlState.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/gl/RenderingThread.h>
+#include <AnKi/Util/Logger.h>
 
 namespace anki
 {

+ 2 - 2
anki/gr/gl/FramebufferImpl.h → AnKi/Gr/Gl/FramebufferImpl.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/Framebuffer.h>
-#include <anki/gr/gl/GlObject.h>
+#include <AnKi/Gr/Framebuffer.h>
+#include <AnKi/Gr/gl/GlObject.h>
 
 namespace anki
 {

+ 6 - 6
anki/gr/gl/GlObject.cpp → AnKi/Gr/Gl/GlObject.cpp

@@ -3,12 +3,12 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/GlObject.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/gl/RenderingThread.h>
-#include <anki/gr/CommandBuffer.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/gl/GlObject.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/gl/RenderingThread.h>
+#include <AnKi/Gr/CommandBuffer.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
 
 namespace anki
 {

+ 1 - 1
anki/gr/gl/GlObject.h → AnKi/Gr/Gl/GlObject.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/gr/gl/Common.h>
+#include <AnKi/Gr/gl/Common.h>
 
 namespace anki
 {

+ 6 - 6
anki/gr/gl/GlState.cpp → AnKi/Gr/Gl/GlState.cpp

@@ -3,12 +3,12 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/GlState.h>
-#include <anki/gr/gl/BufferImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/util/Logger.h>
-#include <anki/core/Trace.h>
-#include <anki/core/ConfigSet.h>
+#include <AnKi/Gr/gl/GlState.h>
+#include <AnKi/Gr/gl/BufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Util/Logger.h>
+#include <AnKi/Core/Trace.h>
+#include <AnKi/Core/ConfigSet.h>
 #include <algorithm>
 #include <cstring>
 

+ 5 - 5
anki/gr/gl/GlState.h → AnKi/Gr/Gl/GlState.h

@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include <anki/gr/gl/Common.h>
-#include <anki/util/DynamicArray.h>
-#include <anki/gr/ShaderProgram.h>
-#include <anki/gr/Texture.h>
-#include <anki/gr/Framebuffer.h>
+#include <AnKi/Gr/gl/Common.h>
+#include <AnKi/Util/DynamicArray.h>
+#include <AnKi/Gr/ShaderProgram.h>
+#include <AnKi/Gr/Texture.h>
+#include <AnKi/Gr/Framebuffer.h>
 
 namespace anki
 {

+ 15 - 15
anki/gr/gl/GrManager.cpp → AnKi/Gr/Gl/GrManager.cpp

@@ -3,21 +3,21 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/gl/RenderingThread.h>
-#include <anki/gr/gl/TextureImpl.h>
-#include <anki/gr/gl/GlState.h>
-
-#include <anki/gr/Buffer.h>
-#include <anki/gr/Texture.h>
-#include <anki/gr/Sampler.h>
-#include <anki/gr/Shader.h>
-#include <anki/gr/ShaderProgram.h>
-#include <anki/gr/CommandBuffer.h>
-#include <anki/gr/Framebuffer.h>
-#include <anki/gr/OcclusionQuery.h>
-#include <anki/gr/RenderGraph.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/gl/RenderingThread.h>
+#include <AnKi/Gr/gl/TextureImpl.h>
+#include <AnKi/Gr/gl/GlState.h>
+
+#include <AnKi/Gr/Buffer.h>
+#include <AnKi/Gr/Texture.h>
+#include <AnKi/Gr/Sampler.h>
+#include <AnKi/Gr/Shader.h>
+#include <AnKi/Gr/ShaderProgram.h>
+#include <AnKi/Gr/CommandBuffer.h>
+#include <AnKi/Gr/Framebuffer.h>
+#include <AnKi/Gr/OcclusionQuery.h>
+#include <AnKi/Gr/RenderGraph.h>
 
 #include <cstring>
 

+ 6 - 6
anki/gr/gl/GrManagerImpl.cpp → AnKi/Gr/Gl/GrManagerImpl.cpp

@@ -3,12 +3,12 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/RenderingThread.h>
-#include <anki/gr/gl/GlState.h>
-#include <anki/core/Config.h>
-#include <anki/core/NativeWindow.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/RenderingThread.h>
+#include <AnKi/Gr/gl/GlState.h>
+#include <AnKi/Core/Config.h>
+#include <AnKi/Core/NativeWindow.h>
 
 namespace anki
 {

+ 2 - 2
anki/gr/gl/GrManagerImpl.h → AnKi/Gr/Gl/GrManagerImpl.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/Common.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/Common.h>
 
 namespace anki
 {

+ 5 - 5
anki/gr/gl/GrManagerImplSdl.cpp → AnKi/Gr/Gl/GrManagerImplSdl.cpp

@@ -5,11 +5,11 @@
 
 /// @file Contains the SDL specific bits of the GL implamentation
 
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/core/NativeWindow.h>
-#include <anki/core/NativeWindowSdl.h>
-#include <anki/core/Config.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Core/NativeWindow.h>
+#include <AnKi/Core/NativeWindowSdl.h>
+#include <AnKi/Core/Config.h>
 #include <SDL.h>
 #include <GL/glew.h>
 

+ 4 - 4
anki/gr/gl/OcclusionQuery.cpp → AnKi/Gr/Gl/OcclusionQuery.cpp

@@ -3,10 +3,10 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/OcclusionQuery.h>
-#include <anki/gr/gl/OcclusionQueryImpl.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
+#include <AnKi/Gr/OcclusionQuery.h>
+#include <AnKi/Gr/gl/OcclusionQueryImpl.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
 
 namespace anki
 {

+ 1 - 1
anki/gr/gl/OcclusionQueryImpl.cpp → AnKi/Gr/Gl/OcclusionQueryImpl.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/OcclusionQueryImpl.h>
+#include <AnKi/Gr/gl/OcclusionQueryImpl.h>
 
 namespace anki
 {

+ 2 - 2
anki/gr/gl/OcclusionQueryImpl.h → AnKi/Gr/Gl/OcclusionQueryImpl.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/OcclusionQuery.h>
-#include <anki/gr/gl/GlObject.h>
+#include <AnKi/Gr/OcclusionQuery.h>
+#include <AnKi/Gr/gl/GlObject.h>
 
 namespace anki
 {

+ 9 - 9
anki/gr/gl/RenderingThread.cpp → AnKi/Gr/Gl/RenderingThread.cpp

@@ -3,15 +3,15 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/RenderingThread.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/gl/GlState.h>
-#include <anki/gr/Fence.h>
-#include <anki/gr/gl/FenceImpl.h>
-#include <anki/util/Logger.h>
-#include <anki/core/Trace.h>
+#include <AnKi/Gr/gl/RenderingThread.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/gl/GlState.h>
+#include <AnKi/Gr/Fence.h>
+#include <AnKi/Gr/gl/FenceImpl.h>
+#include <AnKi/Util/Logger.h>
+#include <AnKi/Core/Trace.h>
 #include <cstdlib>
 
 namespace anki

+ 2 - 2
anki/gr/gl/RenderingThread.h → AnKi/Gr/Gl/RenderingThread.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/CommandBuffer.h>
-#include <anki/util/Thread.h>
+#include <AnKi/Gr/CommandBuffer.h>
+#include <AnKi/Util/Thread.h>
 
 namespace anki
 {

+ 4 - 4
anki/gr/gl/Sampler.cpp → AnKi/Gr/Gl/Sampler.cpp

@@ -3,10 +3,10 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/Sampler.h>
-#include <anki/gr/gl/SamplerImpl.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
+#include <AnKi/Gr/Sampler.h>
+#include <AnKi/Gr/gl/SamplerImpl.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
 
 namespace anki
 {

+ 2 - 2
anki/gr/gl/SamplerImpl.cpp → AnKi/Gr/Gl/SamplerImpl.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/SamplerImpl.h>
-#include <anki/gr/Texture.h>
+#include <AnKi/Gr/gl/SamplerImpl.h>
+#include <AnKi/Gr/Texture.h>
 
 namespace anki
 {

+ 2 - 2
anki/gr/gl/SamplerImpl.h → AnKi/Gr/Gl/SamplerImpl.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/Sampler.h>
-#include <anki/gr/gl/GlObject.h>
+#include <AnKi/Gr/Sampler.h>
+#include <AnKi/Gr/gl/GlObject.h>
 
 namespace anki
 {

+ 4 - 4
anki/gr/gl/Shader.cpp → AnKi/Gr/Gl/Shader.cpp

@@ -3,10 +3,10 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/Shader.h>
-#include <anki/gr/gl/ShaderImpl.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
+#include <AnKi/Gr/Shader.h>
+#include <AnKi/Gr/gl/ShaderImpl.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
 
 namespace anki
 {

+ 7 - 7
anki/gr/gl/ShaderImpl.cpp → AnKi/Gr/Gl/ShaderImpl.cpp

@@ -3,13 +3,13 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/ShaderImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/gl/GrManagerImpl.h>
-#include <anki/gr/gl/GlState.h>
-#include <anki/gr/ShaderCompiler.h>
-#include <anki/util/StringList.h>
-#include <anki/util/Logger.h>
+#include <AnKi/Gr/gl/ShaderImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/gl/GrManagerImpl.h>
+#include <AnKi/Gr/gl/GlState.h>
+#include <AnKi/Gr/ShaderCompiler.h>
+#include <AnKi/Util/StringList.h>
+#include <AnKi/Util/Logger.h>
 
 #define ANKI_DUMP_SHADERS ANKI_EXTRA_CHECKS
 

+ 2 - 2
anki/gr/gl/ShaderImpl.h → AnKi/Gr/Gl/ShaderImpl.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/Shader.h>
-#include <anki/gr/gl/GlObject.h>
+#include <AnKi/Gr/Shader.h>
+#include <AnKi/Gr/gl/GlObject.h>
 
 namespace anki
 {

+ 5 - 5
anki/gr/gl/ShaderProgram.cpp → AnKi/Gr/Gl/ShaderProgram.cpp

@@ -3,11 +3,11 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/ShaderProgram.h>
-#include <anki/gr/gl/ShaderProgramImpl.h>
-#include <anki/gr/gl/CommandBufferImpl.h>
-#include <anki/gr/GrManager.h>
-#include <anki/gr/Shader.h>
+#include <AnKi/Gr/ShaderProgram.h>
+#include <AnKi/Gr/gl/ShaderProgramImpl.h>
+#include <AnKi/Gr/gl/CommandBufferImpl.h>
+#include <AnKi/Gr/GrManager.h>
+#include <AnKi/Gr/Shader.h>
 
 namespace anki
 {

+ 3 - 3
anki/gr/gl/ShaderProgramImpl.cpp → AnKi/Gr/Gl/ShaderProgramImpl.cpp

@@ -3,9 +3,9 @@
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 
-#include <anki/gr/gl/ShaderProgramImpl.h>
-#include <anki/gr/Shader.h>
-#include <anki/gr/gl/ShaderImpl.h>
+#include <AnKi/Gr/gl/ShaderProgramImpl.h>
+#include <AnKi/Gr/Shader.h>
+#include <AnKi/Gr/gl/ShaderImpl.h>
 
 namespace anki
 {

+ 2 - 2
anki/gr/gl/ShaderProgramImpl.h → AnKi/Gr/Gl/ShaderProgramImpl.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include <anki/gr/ShaderProgram.h>
-#include <anki/gr/gl/GlObject.h>
+#include <AnKi/Gr/ShaderProgram.h>
+#include <AnKi/Gr/gl/GlObject.h>
 
 namespace anki
 {

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