Ver código fonte

video_core/texures/texture: Remove unnecessary includes

Nothing in this header relies on common_funcs or the memory manager.

This gets rid of reliance on indirect inclusions in the OpenGL caches.
Lioncash 7 anos atrás
pai
commit
fbf452ab0e

+ 1 - 0
src/video_core/dma_pusher.cpp

@@ -8,6 +8,7 @@
 #include "video_core/dma_pusher.h"
 #include "video_core/dma_pusher.h"
 #include "video_core/engines/maxwell_3d.h"
 #include "video_core/engines/maxwell_3d.h"
 #include "video_core/gpu.h"
 #include "video_core/gpu.h"
+#include "video_core/memory_manager.h"
 
 
 namespace Tegra {
 namespace Tegra {
 
 

+ 1 - 0
src/video_core/renderer_opengl/gl_buffer_cache.cpp

@@ -7,6 +7,7 @@
 
 
 #include "common/alignment.h"
 #include "common/alignment.h"
 #include "core/core.h"
 #include "core/core.h"
+#include "video_core/memory_manager.h"
 #include "video_core/renderer_opengl/gl_buffer_cache.h"
 #include "video_core/renderer_opengl/gl_buffer_cache.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 
 

+ 1 - 0
src/video_core/renderer_opengl/gl_global_cache.cpp

@@ -6,6 +6,7 @@
 
 
 #include "common/logging/log.h"
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/core.h"
+#include "video_core/memory_manager.h"
 #include "video_core/renderer_opengl/gl_global_cache.h"
 #include "video_core/renderer_opengl/gl_global_cache.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_shader_decompiler.h"
 #include "video_core/renderer_opengl/gl_shader_decompiler.h"

+ 1 - 0
src/video_core/renderer_opengl/gl_rasterizer_cache.cpp

@@ -15,6 +15,7 @@
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/process.h"
 #include "core/settings.h"
 #include "core/settings.h"
 #include "video_core/engines/maxwell_3d.h"
 #include "video_core/engines/maxwell_3d.h"
+#include "video_core/memory_manager.h"
 #include "video_core/morton.h"
 #include "video_core/morton.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_rasterizer_cache.h"
 #include "video_core/renderer_opengl/gl_rasterizer_cache.h"

+ 1 - 0
src/video_core/renderer_opengl/gl_shader_cache.cpp

@@ -7,6 +7,7 @@
 #include "common/hash.h"
 #include "common/hash.h"
 #include "core/core.h"
 #include "core/core.h"
 #include "video_core/engines/maxwell_3d.h"
 #include "video_core/engines/maxwell_3d.h"
+#include "video_core/memory_manager.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_shader_cache.h"
 #include "video_core/renderer_opengl/gl_shader_cache.h"
 #include "video_core/renderer_opengl/gl_shader_decompiler.h"
 #include "video_core/renderer_opengl/gl_shader_decompiler.h"

+ 0 - 2
src/video_core/textures/texture.h

@@ -7,9 +7,7 @@
 #include <array>
 #include <array>
 #include "common/assert.h"
 #include "common/assert.h"
 #include "common/bit_field.h"
 #include "common/bit_field.h"
-#include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/common_types.h"
-#include "video_core/memory_manager.h"
 
 
 namespace Tegra::Texture {
 namespace Tegra::Texture {