Browse Source

Revert "Renaming"

This reverts commit 0fd9a0128b031669c795136b46558d65e150a3fd.
Panagiotis Christopoulos Charitos 2 years ago
parent
commit
5dba306c6f

+ 3 - 3
AnKi/Core/App.cpp

@@ -6,7 +6,7 @@
 
 
 #include <AnKi/Core/App.h>
 #include <AnKi/Core/App.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Core/ConfigSet.h>
-#include <AnKi/Core/GPUMemory/UnifiedGeometryBuffer.h>
+#include <AnKi/Core/GpuMemory/UnifiedGeometryBuffer.h>
 #include <AnKi/Util/Logger.h>
 #include <AnKi/Util/Logger.h>
 #include <AnKi/Util/File.h>
 #include <AnKi/Util/File.h>
 #include <AnKi/Util/Filesystem.h>
 #include <AnKi/Util/Filesystem.h>
@@ -15,8 +15,8 @@
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Util/HighRezTimer.h>
 #include <AnKi/Util/HighRezTimer.h>
 #include <AnKi/Core/CoreTracer.h>
 #include <AnKi/Core/CoreTracer.h>
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
-#include <AnKi/Core/GPUMemory/GpuVisibleTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/GpuVisibleTransientMemoryPool.h>
 #include <AnKi/Core/DeveloperConsole.h>
 #include <AnKi/Core/DeveloperConsole.h>
 #include <AnKi/Core/StatsUi.h>
 #include <AnKi/Core/StatsUi.h>
 #include <AnKi/Window/NativeWindow.h>
 #include <AnKi/Window/NativeWindow.h>

+ 6 - 6
AnKi/Core/CMakeLists.txt

@@ -5,9 +5,9 @@ set(sources
 	CoreTracer.cpp
 	CoreTracer.cpp
 	MaliHwCounters.cpp
 	MaliHwCounters.cpp
 	StatsUi.cpp
 	StatsUi.cpp
-	GPUMemory/UnifiedGeometryBuffer.cpp
-	GPUMemory/GpuSceneBuffer.cpp
-	GPUMemory/RebarTransientMemoryPool.cpp)
+	GpuMemory/UnifiedGeometryBuffer.cpp
+	GpuMemory/GpuSceneBuffer.cpp
+	GpuMemory/RebarTransientMemoryPool.cpp)
 
 
 set(headers
 set(headers
 	AllConfigVars.defs.h
 	AllConfigVars.defs.h
@@ -21,9 +21,9 @@ set(headers
 	StatsUi.h
 	StatsUi.h
 	StatsUi.defs.h
 	StatsUi.defs.h
 	StdinListener.h
 	StdinListener.h
-	GPUMemory/UnifiedGeometryBuffer.h
-	GPUMemory/GpuSceneBuffer.h
-	GPUMemory/RebarTransientMemoryPool.h)
+	GpuMemory/UnifiedGeometryBuffer.h
+	GpuMemory/GpuSceneBuffer.h
+	GpuMemory/RebarTransientMemoryPool.h)
 
 
 add_library(AnKiCore ${sources} ${headers})
 add_library(AnKiCore ${sources} ${headers})
 
 

+ 2 - 2
AnKi/Core/GPUMemory/GpuSceneBuffer.cpp

@@ -3,8 +3,8 @@
 // Code licensed under the BSD License.
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 // http://www.anki3d.org/LICENSE
 
 
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Resource/ResourceManager.h>

+ 1 - 1
AnKi/Core/GPUMemory/RebarTransientMemoryPool.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 // http://www.anki3d.org/LICENSE
 
 
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Gr/GrManager.h>
 #include <AnKi/Gr/GrManager.h>

+ 1 - 1
AnKi/Core/GPUMemory/UnifiedGeometryBuffer.cpp

@@ -3,7 +3,7 @@
 // Code licensed under the BSD License.
 // Code licensed under the BSD License.
 // http://www.anki3d.org/LICENSE
 // http://www.anki3d.org/LICENSE
 
 
-#include <AnKi/Core/GPUMemory/UnifiedGeometryBuffer.h>
+#include <AnKi/Core/GpuMemory/UnifiedGeometryBuffer.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Gr/GrManager.h>
 #include <AnKi/Gr/GrManager.h>
 
 

+ 1 - 1
AnKi/Renderer/DebugDrawer.cpp

@@ -6,7 +6,7 @@
 #include <AnKi/Renderer/DebugDrawer.h>
 #include <AnKi/Renderer/DebugDrawer.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Renderer/RenderQueue.h>
 #include <AnKi/Renderer/RenderQueue.h>
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
 #include <AnKi/Physics/PhysicsWorld.h>
 #include <AnKi/Physics/PhysicsWorld.h>
 #include <AnKi/Gr/Buffer.h>
 #include <AnKi/Gr/Buffer.h>
 
 

+ 3 - 3
AnKi/Renderer/Drawer.cpp

@@ -11,9 +11,9 @@
 #include <AnKi/Util/Logger.h>
 #include <AnKi/Util/Logger.h>
 #include <AnKi/Shaders/Include/MaterialTypes.h>
 #include <AnKi/Shaders/Include/MaterialTypes.h>
 #include <AnKi/Shaders/Include/GpuSceneFunctions.h>
 #include <AnKi/Shaders/Include/GpuSceneFunctions.h>
-#include <AnKi/Core/GPUMemory/UnifiedGeometryBuffer.h>
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/UnifiedGeometryBuffer.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
 #include <AnKi/Scene/RenderStateBucket.h>
 #include <AnKi/Scene/RenderStateBucket.h>
 
 
 namespace anki {
 namespace anki {

+ 1 - 1
AnKi/Renderer/GBuffer.cpp

@@ -8,7 +8,7 @@
 #include <AnKi/Renderer/RenderQueue.h>
 #include <AnKi/Renderer/RenderQueue.h>
 #include <AnKi/Renderer/VrsSriGeneration.h>
 #include <AnKi/Renderer/VrsSriGeneration.h>
 #include <AnKi/Renderer/Scale.h>
 #include <AnKi/Renderer/Scale.h>
-#include <AnKi/Renderer/GPUVisibility.h>
+#include <AnKi/Renderer/GpuVisibility.h>
 #include <AnKi/Util/Logger.h>
 #include <AnKi/Util/Logger.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Util/Tracer.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Core/ConfigSet.h>

+ 3 - 3
AnKi/Renderer/GPUVisibility.cpp

@@ -8,9 +8,9 @@
 #include <AnKi/Renderer/HZB.h>
 #include <AnKi/Renderer/HZB.h>
 #include <AnKi/Scene/RenderStateBucket.h>
 #include <AnKi/Scene/RenderStateBucket.h>
 #include <AnKi/Scene/ContiguousArrayAllocator.h>
 #include <AnKi/Scene/ContiguousArrayAllocator.h>
-#include <AnKi/Core/GPUMemory/GpuVisibleTransientMemoryPool.h>
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/GpuVisibleTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
 #include <AnKi/Collision/Functions.h>
 #include <AnKi/Collision/Functions.h>
 #include <AnKi/Shaders/Include/MiscRendererTypes.h>
 #include <AnKi/Shaders/Include/MiscRendererTypes.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Core/ConfigSet.h>

+ 1 - 1
AnKi/Renderer/PackVisibleClusteredObjects.cpp

@@ -9,7 +9,7 @@
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Shaders/Include/GpuSceneTypes.h>
 #include <AnKi/Shaders/Include/GpuSceneTypes.h>
 #include <AnKi/Shaders/Include/MiscRendererTypes.h>
 #include <AnKi/Shaders/Include/MiscRendererTypes.h>
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
 
 
 namespace anki {
 namespace anki {
 
 

+ 1 - 1
AnKi/Renderer/Renderer.cpp

@@ -13,7 +13,7 @@
 #include <AnKi/Collision/Plane.h>
 #include <AnKi/Collision/Plane.h>
 #include <AnKi/Collision/Functions.h>
 #include <AnKi/Collision/Functions.h>
 #include <AnKi/Shaders/Include/ClusteredShadingTypes.h>
 #include <AnKi/Shaders/Include/ClusteredShadingTypes.h>
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
 
 
 #include <AnKi/Renderer/ProbeReflections.h>
 #include <AnKi/Renderer/ProbeReflections.h>
 #include <AnKi/Renderer/GBuffer.h>
 #include <AnKi/Renderer/GBuffer.h>

+ 1 - 1
AnKi/Renderer/RendererObject.h

@@ -10,7 +10,7 @@
 #include <AnKi/Gr.h>
 #include <AnKi/Gr.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Resource/ShaderProgramResource.h>
 #include <AnKi/Resource/ShaderProgramResource.h>
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
 
 
 namespace anki {
 namespace anki {
 
 

+ 2 - 2
AnKi/Renderer/RtShadows.cpp

@@ -17,8 +17,8 @@
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Shaders/Include/MaterialTypes.h>
 #include <AnKi/Shaders/Include/MaterialTypes.h>
 #include <AnKi/Shaders/Include/GpuSceneTypes.h>
 #include <AnKi/Shaders/Include/GpuSceneTypes.h>
-#include <AnKi/Core/GPUMemory/UnifiedGeometryBuffer.h>
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/UnifiedGeometryBuffer.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
 
 
 namespace anki {
 namespace anki {
 
 

+ 1 - 1
AnKi/Resource/MeshResource.h

@@ -10,7 +10,7 @@
 #include <AnKi/Gr.h>
 #include <AnKi/Gr.h>
 #include <AnKi/Collision/Aabb.h>
 #include <AnKi/Collision/Aabb.h>
 #include <AnKi/Shaders/Include/MeshTypes.h>
 #include <AnKi/Shaders/Include/MeshTypes.h>
-#include <AnKi/Core/GPUMemory/UnifiedGeometryBuffer.h>
+#include <AnKi/Core/GpuMemory/UnifiedGeometryBuffer.h>
 
 
 namespace anki {
 namespace anki {
 
 

+ 1 - 1
AnKi/Scene/Components/DecalComponent.cpp

@@ -7,7 +7,7 @@
 #include <AnKi/Scene/SceneGraph.h>
 #include <AnKi/Scene/SceneGraph.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Shaders/Include/ClusteredShadingTypes.h>
 #include <AnKi/Shaders/Include/ClusteredShadingTypes.h>
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
 
 
 namespace anki {
 namespace anki {
 
 

+ 1 - 1
AnKi/Scene/Components/FogDensityComponent.cpp

@@ -6,7 +6,7 @@
 #include <AnKi/Scene/Components/FogDensityComponent.h>
 #include <AnKi/Scene/Components/FogDensityComponent.h>
 #include <AnKi/Scene/SceneNode.h>
 #include <AnKi/Scene/SceneNode.h>
 #include <AnKi/Scene/SceneGraph.h>
 #include <AnKi/Scene/SceneGraph.h>
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
 
 
 namespace anki {
 namespace anki {
 
 

+ 1 - 1
AnKi/Scene/Components/SkinComponent.h

@@ -11,7 +11,7 @@
 #include <AnKi/Util/Forward.h>
 #include <AnKi/Util/Forward.h>
 #include <AnKi/Util/WeakArray.h>
 #include <AnKi/Util/WeakArray.h>
 #include <AnKi/Math.h>
 #include <AnKi/Math.h>
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
 
 
 namespace anki {
 namespace anki {
 
 

+ 1 - 1
AnKi/Scene/ContiguousArrayAllocator.h

@@ -6,7 +6,7 @@
 #pragma once
 #pragma once
 
 
 #include <AnKi/Scene/Common.h>
 #include <AnKi/Scene/Common.h>
-#include <AnKi/Core/GPUMemory/GpuSceneBuffer.h>
+#include <AnKi/Core/GpuMemory/GpuSceneBuffer.h>
 
 
 namespace anki {
 namespace anki {
 
 

+ 1 - 1
AnKi/Ui/Canvas.cpp

@@ -7,7 +7,7 @@
 #include <AnKi/Ui/Font.h>
 #include <AnKi/Ui/Font.h>
 #include <AnKi/Ui/UiManager.h>
 #include <AnKi/Ui/UiManager.h>
 #include <AnKi/Resource/ResourceManager.h>
 #include <AnKi/Resource/ResourceManager.h>
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
 #include <AnKi/Window/Input.h>
 #include <AnKi/Window/Input.h>
 #include <AnKi/Gr/Sampler.h>
 #include <AnKi/Gr/Sampler.h>
 #include <AnKi/Gr/GrManager.h>
 #include <AnKi/Gr/GrManager.h>

+ 1 - 1
Tests/Gr/Gr.cpp

@@ -10,7 +10,7 @@
 #include <AnKi/Window/NativeWindow.h>
 #include <AnKi/Window/NativeWindow.h>
 #include <AnKi/Window/Input.h>
 #include <AnKi/Window/Input.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Core/ConfigSet.h>
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
 #include <AnKi/Util/HighRezTimer.h>
 #include <AnKi/Util/HighRezTimer.h>
 #include <AnKi/Resource/TransferGpuAllocator.h>
 #include <AnKi/Resource/TransferGpuAllocator.h>
 #include <AnKi/ShaderCompiler/ShaderProgramParser.h>
 #include <AnKi/ShaderCompiler/ShaderProgramParser.h>

+ 1 - 1
Tests/Ui/Ui.cpp

@@ -5,7 +5,7 @@
 
 
 #include <Tests/Framework/Framework.h>
 #include <Tests/Framework/Framework.h>
 #include <AnKi/Core/ConfigSet.h>
 #include <AnKi/Core/ConfigSet.h>
-#include <AnKi/Core/GPUMemory/RebarTransientMemoryPool.h>
+#include <AnKi/Core/GpuMemory/RebarTransientMemoryPool.h>
 #include <AnKi/Util/HighRezTimer.h>
 #include <AnKi/Util/HighRezTimer.h>
 #include <AnKi/Ui.h>
 #include <AnKi/Ui.h>
 #include <AnKi/Window.h>
 #include <AnKi/Window.h>