summaryrefslogtreecommitdiff
path: root/src/video_core/renderer_opengl
diff options
context:
space:
mode:
authorGravatar ameerj2022-03-19 00:06:57 -0400
committerGravatar ameerj2022-03-19 15:01:31 -0400
commit1bc7d61b5749ed29108cbbbf0a78a41b79504eff (patch)
tree25b0362101d8f7fc6deeed1bb989d3f33258cee5 /src/video_core/renderer_opengl
parentcommon: Reduce unused includes (diff)
downloadyuzu-1bc7d61b5749ed29108cbbbf0a78a41b79504eff.tar.gz
yuzu-1bc7d61b5749ed29108cbbbf0a78a41b79504eff.tar.xz
yuzu-1bc7d61b5749ed29108cbbbf0a78a41b79504eff.zip
video_core: Reduce unused includes
Diffstat (limited to 'src/video_core/renderer_opengl')
-rw-r--r--src/video_core/renderer_opengl/gl_buffer_cache.h2
-rw-r--r--src/video_core/renderer_opengl/gl_compute_pipeline.h1
-rw-r--r--src/video_core/renderer_opengl/gl_device.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_graphics_pipeline.h1
-rw-r--r--src/video_core/renderer_opengl/gl_query_cache.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp2
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.h10
-rw-r--r--src/video_core/renderer_opengl/gl_resource_manager.cpp2
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.cpp3
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.h5
-rw-r--r--src/video_core/renderer_opengl/gl_shader_util.cpp1
-rw-r--r--src/video_core/renderer_opengl/gl_shader_util.h4
-rw-r--r--src/video_core/renderer_opengl/gl_stream_buffer.h1
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp3
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h2
15 files changed, 2 insertions, 41 deletions
diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.h b/src/video_core/renderer_opengl/gl_buffer_cache.h
index 060d36427..7287731b6 100644
--- a/src/video_core/renderer_opengl/gl_buffer_cache.h
+++ b/src/video_core/renderer_opengl/gl_buffer_cache.h
@@ -7,9 +7,7 @@
7#include <array> 7#include <array>
8#include <span> 8#include <span>
9 9
10#include "common/alignment.h"
11#include "common/common_types.h" 10#include "common/common_types.h"
12#include "common/dynamic_library.h"
13#include "video_core/buffer_cache/buffer_cache.h" 11#include "video_core/buffer_cache/buffer_cache.h"
14#include "video_core/rasterizer_interface.h" 12#include "video_core/rasterizer_interface.h"
15#include "video_core/renderer_opengl/gl_device.h" 13#include "video_core/renderer_opengl/gl_device.h"
diff --git a/src/video_core/renderer_opengl/gl_compute_pipeline.h b/src/video_core/renderer_opengl/gl_compute_pipeline.h
index 50c676365..b0d183b46 100644
--- a/src/video_core/renderer_opengl/gl_compute_pipeline.h
+++ b/src/video_core/renderer_opengl/gl_compute_pipeline.h
@@ -6,7 +6,6 @@
6 6
7#include <array> 7#include <array>
8#include <type_traits> 8#include <type_traits>
9#include <utility>
10 9
11#include "common/common_types.h" 10#include "common/common_types.h"
12#include "shader_recompiler/shader_info.h" 11#include "shader_recompiler/shader_info.h"
diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp
index e62912a22..715cd3a48 100644
--- a/src/video_core/renderer_opengl/gl_device.cpp
+++ b/src/video_core/renderer_opengl/gl_device.cpp
@@ -6,8 +6,6 @@
6#include <array> 6#include <array>
7#include <cstddef> 7#include <cstddef>
8#include <cstdlib> 8#include <cstdlib>
9#include <cstring>
10#include <limits>
11#include <optional> 9#include <optional>
12#include <span> 10#include <span>
13#include <stdexcept> 11#include <stdexcept>
@@ -16,7 +14,6 @@
16#include <glad/glad.h> 14#include <glad/glad.h>
17 15
18#include "common/logging/log.h" 16#include "common/logging/log.h"
19#include "common/scope_exit.h"
20#include "common/settings.h" 17#include "common/settings.h"
21#include "shader_recompiler/stage.h" 18#include "shader_recompiler/stage.h"
22#include "video_core/renderer_opengl/gl_device.h" 19#include "video_core/renderer_opengl/gl_device.h"
diff --git a/src/video_core/renderer_opengl/gl_graphics_pipeline.h b/src/video_core/renderer_opengl/gl_graphics_pipeline.h
index 311d49f3f..4f8049717 100644
--- a/src/video_core/renderer_opengl/gl_graphics_pipeline.h
+++ b/src/video_core/renderer_opengl/gl_graphics_pipeline.h
@@ -14,7 +14,6 @@
14#include "common/common_types.h" 14#include "common/common_types.h"
15#include "shader_recompiler/shader_info.h" 15#include "shader_recompiler/shader_info.h"
16#include "video_core/engines/maxwell_3d.h" 16#include "video_core/engines/maxwell_3d.h"
17#include "video_core/memory_manager.h"
18#include "video_core/renderer_opengl/gl_buffer_cache.h" 17#include "video_core/renderer_opengl/gl_buffer_cache.h"
19#include "video_core/renderer_opengl/gl_resource_manager.h" 18#include "video_core/renderer_opengl/gl_resource_manager.h"
20#include "video_core/renderer_opengl/gl_texture_cache.h" 19#include "video_core/renderer_opengl/gl_texture_cache.h"
diff --git a/src/video_core/renderer_opengl/gl_query_cache.cpp b/src/video_core/renderer_opengl/gl_query_cache.cpp
index acebbf5f4..9e6c50055 100644
--- a/src/video_core/renderer_opengl/gl_query_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_query_cache.cpp
@@ -3,15 +3,12 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <algorithm> 5#include <algorithm>
6#include <cstring>
7#include <memory> 6#include <memory>
8#include <unordered_map>
9#include <utility> 7#include <utility>
10#include <vector> 8#include <vector>
11 9
12#include <glad/glad.h> 10#include <glad/glad.h>
13 11
14#include "common/assert.h"
15#include "core/core.h" 12#include "core/core.h"
16#include "video_core/engines/maxwell_3d.h" 13#include "video_core/engines/maxwell_3d.h"
17#include "video_core/memory_manager.h" 14#include "video_core/memory_manager.h"
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 142412a8e..4d632d211 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -6,9 +6,7 @@
6#include <array> 6#include <array>
7#include <bitset> 7#include <bitset>
8#include <memory> 8#include <memory>
9#include <string>
10#include <string_view> 9#include <string_view>
11#include <tuple>
12#include <utility> 10#include <utility>
13 11
14#include <glad/glad.h> 12#include <glad/glad.h>
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 98f6fd342..c79461d59 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -5,20 +5,14 @@
5#pragma once 5#pragma once
6 6
7#include <array> 7#include <array>
8#include <atomic>
9#include <cstddef> 8#include <cstddef>
10#include <memory>
11#include <optional> 9#include <optional>
12#include <tuple>
13#include <utility>
14 10
15#include <boost/container/static_vector.hpp> 11#include <boost/container/static_vector.hpp>
16 12
17#include <glad/glad.h> 13#include <glad/glad.h>
18 14
19#include "common/common_types.h" 15#include "common/common_types.h"
20#include "video_core/engines/const_buffer_info.h"
21#include "video_core/engines/maxwell_3d.h"
22#include "video_core/engines/maxwell_dma.h" 16#include "video_core/engines/maxwell_dma.h"
23#include "video_core/rasterizer_accelerated.h" 17#include "video_core/rasterizer_accelerated.h"
24#include "video_core/rasterizer_interface.h" 18#include "video_core/rasterizer_interface.h"
@@ -26,12 +20,8 @@
26#include "video_core/renderer_opengl/gl_device.h" 20#include "video_core/renderer_opengl/gl_device.h"
27#include "video_core/renderer_opengl/gl_fence_manager.h" 21#include "video_core/renderer_opengl/gl_fence_manager.h"
28#include "video_core/renderer_opengl/gl_query_cache.h" 22#include "video_core/renderer_opengl/gl_query_cache.h"
29#include "video_core/renderer_opengl/gl_resource_manager.h"
30#include "video_core/renderer_opengl/gl_shader_cache.h" 23#include "video_core/renderer_opengl/gl_shader_cache.h"
31#include "video_core/renderer_opengl/gl_shader_manager.h"
32#include "video_core/renderer_opengl/gl_state_tracker.h"
33#include "video_core/renderer_opengl/gl_texture_cache.h" 24#include "video_core/renderer_opengl/gl_texture_cache.h"
34#include "video_core/textures/texture.h"
35 25
36namespace Core::Memory { 26namespace Core::Memory {
37class Memory; 27class Memory;
diff --git a/src/video_core/renderer_opengl/gl_resource_manager.cpp b/src/video_core/renderer_opengl/gl_resource_manager.cpp
index 5e7101d28..f6839a657 100644
--- a/src/video_core/renderer_opengl/gl_resource_manager.cpp
+++ b/src/video_core/renderer_opengl/gl_resource_manager.cpp
@@ -3,9 +3,7 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <string_view> 5#include <string_view>
6#include <utility>
7#include <glad/glad.h> 6#include <glad/glad.h>
8#include "common/common_types.h"
9#include "common/microprofile.h" 7#include "common/microprofile.h"
10#include "video_core/renderer_opengl/gl_resource_manager.h" 8#include "video_core/renderer_opengl/gl_resource_manager.h"
11#include "video_core/renderer_opengl/gl_shader_util.h" 9#include "video_core/renderer_opengl/gl_shader_util.h"
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index f71e01a34..6423992c3 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -14,10 +14,8 @@
14#include "common/fs/fs.h" 14#include "common/fs/fs.h"
15#include "common/fs/path_util.h" 15#include "common/fs/path_util.h"
16#include "common/logging/log.h" 16#include "common/logging/log.h"
17#include "common/scope_exit.h"
18#include "common/settings.h" 17#include "common/settings.h"
19#include "common/thread_worker.h" 18#include "common/thread_worker.h"
20#include "core/core.h"
21#include "shader_recompiler/backend/glasm/emit_glasm.h" 19#include "shader_recompiler/backend/glasm/emit_glasm.h"
22#include "shader_recompiler/backend/glsl/emit_glsl.h" 20#include "shader_recompiler/backend/glsl/emit_glsl.h"
23#include "shader_recompiler/backend/spirv/emit_spirv.h" 21#include "shader_recompiler/backend/spirv/emit_spirv.h"
@@ -29,7 +27,6 @@
29#include "video_core/engines/maxwell_3d.h" 27#include "video_core/engines/maxwell_3d.h"
30#include "video_core/memory_manager.h" 28#include "video_core/memory_manager.h"
31#include "video_core/renderer_opengl/gl_rasterizer.h" 29#include "video_core/renderer_opengl/gl_rasterizer.h"
32#include "video_core/renderer_opengl/gl_resource_manager.h"
33#include "video_core/renderer_opengl/gl_shader_cache.h" 30#include "video_core/renderer_opengl/gl_shader_cache.h"
34#include "video_core/renderer_opengl/gl_shader_util.h" 31#include "video_core/renderer_opengl/gl_shader_util.h"
35#include "video_core/renderer_opengl/gl_state_tracker.h" 32#include "video_core/renderer_opengl/gl_state_tracker.h"
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h
index a34110b37..06d4b38bb 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.h
+++ b/src/video_core/renderer_opengl/gl_shader_cache.h
@@ -4,18 +4,13 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <array>
8#include <filesystem> 7#include <filesystem>
9#include <stop_token> 8#include <stop_token>
10#include <unordered_map> 9#include <unordered_map>
11 10
12#include <glad/glad.h>
13
14#include "common/common_types.h" 11#include "common/common_types.h"
15#include "common/thread_worker.h" 12#include "common/thread_worker.h"
16#include "shader_recompiler/frontend/ir/value.h"
17#include "shader_recompiler/host_translate_info.h" 13#include "shader_recompiler/host_translate_info.h"
18#include "shader_recompiler/object_pool.h"
19#include "shader_recompiler/profile.h" 14#include "shader_recompiler/profile.h"
20#include "video_core/renderer_opengl/gl_compute_pipeline.h" 15#include "video_core/renderer_opengl/gl_compute_pipeline.h"
21#include "video_core/renderer_opengl/gl_graphics_pipeline.h" 16#include "video_core/renderer_opengl/gl_graphics_pipeline.h"
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp
index d432072ad..129966e72 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_util.cpp
@@ -6,7 +6,6 @@
6#include <vector> 6#include <vector>
7#include <glad/glad.h> 7#include <glad/glad.h>
8 8
9#include "common/assert.h"
10#include "common/logging/log.h" 9#include "common/logging/log.h"
11#include "common/settings.h" 10#include "common/settings.h"
12#include "video_core/renderer_opengl/gl_shader_util.h" 11#include "video_core/renderer_opengl/gl_shader_util.h"
diff --git a/src/video_core/renderer_opengl/gl_shader_util.h b/src/video_core/renderer_opengl/gl_shader_util.h
index 4e1a2a8e1..a64ef37dc 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.h
+++ b/src/video_core/renderer_opengl/gl_shader_util.h
@@ -5,14 +5,10 @@
5#pragma once 5#pragma once
6 6
7#include <span> 7#include <span>
8#include <string>
9#include <string_view> 8#include <string_view>
10#include <vector>
11 9
12#include <glad/glad.h> 10#include <glad/glad.h>
13 11
14#include "common/assert.h"
15#include "common/logging/log.h"
16#include "video_core/renderer_opengl/gl_resource_manager.h" 12#include "video_core/renderer_opengl/gl_resource_manager.h"
17 13
18namespace OpenGL { 14namespace OpenGL {
diff --git a/src/video_core/renderer_opengl/gl_stream_buffer.h b/src/video_core/renderer_opengl/gl_stream_buffer.h
index 2e67922a6..f0cb29dca 100644
--- a/src/video_core/renderer_opengl/gl_stream_buffer.h
+++ b/src/video_core/renderer_opengl/gl_stream_buffer.h
@@ -5,7 +5,6 @@
5#pragma once 5#pragma once
6 6
7#include <array> 7#include <array>
8#include <memory>
9#include <span> 8#include <span>
10#include <utility> 9#include <utility>
11 10
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index f81c1b233..795c97831 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -5,7 +5,6 @@
5#include <algorithm> 5#include <algorithm>
6#include <cstddef> 6#include <cstddef>
7#include <cstdlib> 7#include <cstdlib>
8#include <cstring>
9#include <memory> 8#include <memory>
10 9
11#include <glad/glad.h> 10#include <glad/glad.h>
@@ -15,11 +14,9 @@
15#include "common/microprofile.h" 14#include "common/microprofile.h"
16#include "common/settings.h" 15#include "common/settings.h"
17#include "common/telemetry.h" 16#include "common/telemetry.h"
18#include "core/core.h"
19#include "core/core_timing.h" 17#include "core/core_timing.h"
20#include "core/frontend/emu_window.h" 18#include "core/frontend/emu_window.h"
21#include "core/memory.h" 19#include "core/memory.h"
22#include "core/perf_stats.h"
23#include "core/telemetry_session.h" 20#include "core/telemetry_session.h"
24#include "video_core/host_shaders/fxaa_frag.h" 21#include "video_core/host_shaders/fxaa_frag.h"
25#include "video_core/host_shaders/fxaa_vert.h" 22#include "video_core/host_shaders/fxaa_vert.h"
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index cda333cad..35706cf05 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -8,10 +8,12 @@
8#include <glad/glad.h> 8#include <glad/glad.h>
9#include "common/common_types.h" 9#include "common/common_types.h"
10#include "common/math_util.h" 10#include "common/math_util.h"
11
11#include "video_core/renderer_base.h" 12#include "video_core/renderer_base.h"
12#include "video_core/renderer_opengl/gl_device.h" 13#include "video_core/renderer_opengl/gl_device.h"
13#include "video_core/renderer_opengl/gl_rasterizer.h" 14#include "video_core/renderer_opengl/gl_rasterizer.h"
14#include "video_core/renderer_opengl/gl_resource_manager.h" 15#include "video_core/renderer_opengl/gl_resource_manager.h"
16#include "video_core/renderer_opengl/gl_shader_manager.h"
15#include "video_core/renderer_opengl/gl_state_tracker.h" 17#include "video_core/renderer_opengl/gl_state_tracker.h"
16 18
17namespace Core { 19namespace Core {