video_core/engines: Remove unnecessary inclusions where applicable
Replaces header inclusions with forward declarations where applicable and also removes unused headers within the cpp file. This reduces a few more dependencies on core/memory.h
This commit is contained in:
		
							parent
							
								
									66be5150d6
								
							
						
					
					
						commit
						26223f8124
					
				@ -6,6 +6,7 @@
 | 
				
			|||||||
#include "common/logging/log.h"
 | 
					#include "common/logging/log.h"
 | 
				
			||||||
#include "common/math_util.h"
 | 
					#include "common/math_util.h"
 | 
				
			||||||
#include "video_core/engines/fermi_2d.h"
 | 
					#include "video_core/engines/fermi_2d.h"
 | 
				
			||||||
 | 
					#include "video_core/memory_manager.h"
 | 
				
			||||||
#include "video_core/rasterizer_interface.h"
 | 
					#include "video_core/rasterizer_interface.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Tegra::Engines {
 | 
					namespace Tegra::Engines {
 | 
				
			||||||
 | 
				
			|||||||
@ -10,7 +10,10 @@
 | 
				
			|||||||
#include "common/common_funcs.h"
 | 
					#include "common/common_funcs.h"
 | 
				
			||||||
#include "common/common_types.h"
 | 
					#include "common/common_types.h"
 | 
				
			||||||
#include "video_core/gpu.h"
 | 
					#include "video_core/gpu.h"
 | 
				
			||||||
#include "video_core/memory_manager.h"
 | 
					
 | 
				
			||||||
 | 
					namespace Tegra {
 | 
				
			||||||
 | 
					class MemoryManager;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace VideoCore {
 | 
					namespace VideoCore {
 | 
				
			||||||
class RasterizerInterface;
 | 
					class RasterizerInterface;
 | 
				
			||||||
 | 
				
			|||||||
@ -9,7 +9,10 @@
 | 
				
			|||||||
#include "common/common_funcs.h"
 | 
					#include "common/common_funcs.h"
 | 
				
			||||||
#include "common/common_types.h"
 | 
					#include "common/common_types.h"
 | 
				
			||||||
#include "video_core/gpu.h"
 | 
					#include "video_core/gpu.h"
 | 
				
			||||||
#include "video_core/memory_manager.h"
 | 
					
 | 
				
			||||||
 | 
					namespace Tegra {
 | 
				
			||||||
 | 
					class MemoryManager;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Tegra::Engines {
 | 
					namespace Tegra::Engines {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -5,9 +5,9 @@
 | 
				
			|||||||
#include "common/assert.h"
 | 
					#include "common/assert.h"
 | 
				
			||||||
#include "common/logging/log.h"
 | 
					#include "common/logging/log.h"
 | 
				
			||||||
#include "core/core.h"
 | 
					#include "core/core.h"
 | 
				
			||||||
#include "core/memory.h"
 | 
					 | 
				
			||||||
#include "video_core/engines/kepler_memory.h"
 | 
					#include "video_core/engines/kepler_memory.h"
 | 
				
			||||||
#include "video_core/engines/maxwell_3d.h"
 | 
					#include "video_core/engines/maxwell_3d.h"
 | 
				
			||||||
 | 
					#include "video_core/memory_manager.h"
 | 
				
			||||||
#include "video_core/rasterizer_interface.h"
 | 
					#include "video_core/rasterizer_interface.h"
 | 
				
			||||||
#include "video_core/renderer_base.h"
 | 
					#include "video_core/renderer_base.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -10,12 +10,15 @@
 | 
				
			|||||||
#include "common/common_funcs.h"
 | 
					#include "common/common_funcs.h"
 | 
				
			||||||
#include "common/common_types.h"
 | 
					#include "common/common_types.h"
 | 
				
			||||||
#include "video_core/gpu.h"
 | 
					#include "video_core/gpu.h"
 | 
				
			||||||
#include "video_core/memory_manager.h"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Core {
 | 
					namespace Core {
 | 
				
			||||||
class System;
 | 
					class System;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					namespace Tegra {
 | 
				
			||||||
 | 
					class MemoryManager;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace VideoCore {
 | 
					namespace VideoCore {
 | 
				
			||||||
class RasterizerInterface;
 | 
					class RasterizerInterface;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -7,11 +7,10 @@
 | 
				
			|||||||
#include "common/assert.h"
 | 
					#include "common/assert.h"
 | 
				
			||||||
#include "core/core.h"
 | 
					#include "core/core.h"
 | 
				
			||||||
#include "core/core_timing.h"
 | 
					#include "core/core_timing.h"
 | 
				
			||||||
#include "core/memory.h"
 | 
					 | 
				
			||||||
#include "video_core/debug_utils/debug_utils.h"
 | 
					#include "video_core/debug_utils/debug_utils.h"
 | 
				
			||||||
#include "video_core/engines/maxwell_3d.h"
 | 
					#include "video_core/engines/maxwell_3d.h"
 | 
				
			||||||
 | 
					#include "video_core/memory_manager.h"
 | 
				
			||||||
#include "video_core/rasterizer_interface.h"
 | 
					#include "video_core/rasterizer_interface.h"
 | 
				
			||||||
#include "video_core/renderer_base.h"
 | 
					 | 
				
			||||||
#include "video_core/textures/texture.h"
 | 
					#include "video_core/textures/texture.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Tegra::Engines {
 | 
					namespace Tegra::Engines {
 | 
				
			||||||
 | 
				
			|||||||
@ -16,13 +16,16 @@
 | 
				
			|||||||
#include "common/math_util.h"
 | 
					#include "common/math_util.h"
 | 
				
			||||||
#include "video_core/gpu.h"
 | 
					#include "video_core/gpu.h"
 | 
				
			||||||
#include "video_core/macro_interpreter.h"
 | 
					#include "video_core/macro_interpreter.h"
 | 
				
			||||||
#include "video_core/memory_manager.h"
 | 
					 | 
				
			||||||
#include "video_core/textures/texture.h"
 | 
					#include "video_core/textures/texture.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Core {
 | 
					namespace Core {
 | 
				
			||||||
class System;
 | 
					class System;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					namespace Tegra {
 | 
				
			||||||
 | 
					class MemoryManager;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace VideoCore {
 | 
					namespace VideoCore {
 | 
				
			||||||
class RasterizerInterface;
 | 
					class RasterizerInterface;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -5,9 +5,9 @@
 | 
				
			|||||||
#include "common/assert.h"
 | 
					#include "common/assert.h"
 | 
				
			||||||
#include "common/logging/log.h"
 | 
					#include "common/logging/log.h"
 | 
				
			||||||
#include "core/core.h"
 | 
					#include "core/core.h"
 | 
				
			||||||
#include "core/memory.h"
 | 
					 | 
				
			||||||
#include "video_core/engines/maxwell_3d.h"
 | 
					#include "video_core/engines/maxwell_3d.h"
 | 
				
			||||||
#include "video_core/engines/maxwell_dma.h"
 | 
					#include "video_core/engines/maxwell_dma.h"
 | 
				
			||||||
 | 
					#include "video_core/memory_manager.h"
 | 
				
			||||||
#include "video_core/rasterizer_interface.h"
 | 
					#include "video_core/rasterizer_interface.h"
 | 
				
			||||||
#include "video_core/renderer_base.h"
 | 
					#include "video_core/renderer_base.h"
 | 
				
			||||||
#include "video_core/textures/decoders.h"
 | 
					#include "video_core/textures/decoders.h"
 | 
				
			||||||
 | 
				
			|||||||
@ -10,12 +10,15 @@
 | 
				
			|||||||
#include "common/common_funcs.h"
 | 
					#include "common/common_funcs.h"
 | 
				
			||||||
#include "common/common_types.h"
 | 
					#include "common/common_types.h"
 | 
				
			||||||
#include "video_core/gpu.h"
 | 
					#include "video_core/gpu.h"
 | 
				
			||||||
#include "video_core/memory_manager.h"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace Core {
 | 
					namespace Core {
 | 
				
			||||||
class System;
 | 
					class System;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					namespace Tegra {
 | 
				
			||||||
 | 
					class MemoryManager;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace VideoCore {
 | 
					namespace VideoCore {
 | 
				
			||||||
class RasterizerInterface;
 | 
					class RasterizerInterface;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -10,6 +10,7 @@
 | 
				
			|||||||
#include "common/alignment.h"
 | 
					#include "common/alignment.h"
 | 
				
			||||||
#include "common/assert.h"
 | 
					#include "common/assert.h"
 | 
				
			||||||
#include "core/memory.h"
 | 
					#include "core/memory.h"
 | 
				
			||||||
 | 
					#include "video_core/memory_manager.h"
 | 
				
			||||||
#include "video_core/renderer_vulkan/declarations.h"
 | 
					#include "video_core/renderer_vulkan/declarations.h"
 | 
				
			||||||
#include "video_core/renderer_vulkan/vk_buffer_cache.h"
 | 
					#include "video_core/renderer_vulkan/vk_buffer_cache.h"
 | 
				
			||||||
#include "video_core/renderer_vulkan/vk_scheduler.h"
 | 
					#include "video_core/renderer_vulkan/vk_scheduler.h"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user