summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2021-06-16 01:49:19 -0300
committerGravatar ameerj2021-07-22 21:51:38 -0400
commit376aa94819b7da976adb120136d83980a757d044 (patch)
tree9e7917c30612ee74d37f92ee4773e907e75dddb4
parentvulkan_device: Blacklist VK_EXT_vertex_input_dynamic_state on Intel (diff)
downloadyuzu-376aa94819b7da976adb120136d83980a757d044.tar.gz
yuzu-376aa94819b7da976adb120136d83980a757d044.tar.xz
yuzu-376aa94819b7da976adb120136d83980a757d044.zip
shader: Rename maxwell/program.h to translate_program.h
-rw-r--r--src/shader_recompiler/CMakeLists.txt4
-rw-r--r--src/shader_recompiler/frontend/maxwell/translate_program.cpp (renamed from src/shader_recompiler/frontend/maxwell/program.cpp)2
-rw-r--r--src/shader_recompiler/frontend/maxwell/translate_program.h (renamed from src/shader_recompiler/frontend/maxwell/program.h)7
-rw-r--r--src/video_core/renderer_opengl/gl_shader_cache.cpp2
-rw-r--r--src/video_core/renderer_vulkan/vk_pipeline_cache.cpp2
5 files changed, 6 insertions, 11 deletions
diff --git a/src/shader_recompiler/CMakeLists.txt b/src/shader_recompiler/CMakeLists.txt
index 06ee50fff..f801a9f72 100644
--- a/src/shader_recompiler/CMakeLists.txt
+++ b/src/shader_recompiler/CMakeLists.txt
@@ -114,8 +114,6 @@ add_library(shader_recompiler STATIC
114 frontend/maxwell/maxwell.inc 114 frontend/maxwell/maxwell.inc
115 frontend/maxwell/opcodes.cpp 115 frontend/maxwell/opcodes.cpp
116 frontend/maxwell/opcodes.h 116 frontend/maxwell/opcodes.h
117 frontend/maxwell/program.cpp
118 frontend/maxwell/program.h
119 frontend/maxwell/structured_control_flow.cpp 117 frontend/maxwell/structured_control_flow.cpp
120 frontend/maxwell/structured_control_flow.h 118 frontend/maxwell/structured_control_flow.h
121 frontend/maxwell/translate/impl/atomic_operations_global_memory.cpp 119 frontend/maxwell/translate/impl/atomic_operations_global_memory.cpp
@@ -211,6 +209,8 @@ add_library(shader_recompiler STATIC
211 frontend/maxwell/translate/impl/warp_shuffle.cpp 209 frontend/maxwell/translate/impl/warp_shuffle.cpp
212 frontend/maxwell/translate/translate.cpp 210 frontend/maxwell/translate/translate.cpp
213 frontend/maxwell/translate/translate.h 211 frontend/maxwell/translate/translate.h
212 frontend/maxwell/translate_program.cpp
213 frontend/maxwell/translate_program.h
214 ir_opt/collect_shader_info_pass.cpp 214 ir_opt/collect_shader_info_pass.cpp
215 ir_opt/constant_propagation_pass.cpp 215 ir_opt/constant_propagation_pass.cpp
216 ir_opt/dead_code_elimination_pass.cpp 216 ir_opt/dead_code_elimination_pass.cpp
diff --git a/src/shader_recompiler/frontend/maxwell/program.cpp b/src/shader_recompiler/frontend/maxwell/translate_program.cpp
index 8489f9a5f..e52170e3e 100644
--- a/src/shader_recompiler/frontend/maxwell/program.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate_program.cpp
@@ -10,9 +10,9 @@
10#include "shader_recompiler/exception.h" 10#include "shader_recompiler/exception.h"
11#include "shader_recompiler/frontend/ir/basic_block.h" 11#include "shader_recompiler/frontend/ir/basic_block.h"
12#include "shader_recompiler/frontend/ir/post_order.h" 12#include "shader_recompiler/frontend/ir/post_order.h"
13#include "shader_recompiler/frontend/maxwell/program.h"
14#include "shader_recompiler/frontend/maxwell/structured_control_flow.h" 13#include "shader_recompiler/frontend/maxwell/structured_control_flow.h"
15#include "shader_recompiler/frontend/maxwell/translate/translate.h" 14#include "shader_recompiler/frontend/maxwell/translate/translate.h"
15#include "shader_recompiler/frontend/maxwell/translate_program.h"
16#include "shader_recompiler/ir_opt/passes.h" 16#include "shader_recompiler/ir_opt/passes.h"
17 17
18namespace Shader::Maxwell { 18namespace Shader::Maxwell {
diff --git a/src/shader_recompiler/frontend/maxwell/program.h b/src/shader_recompiler/frontend/maxwell/translate_program.h
index f7f5930e4..1e5536443 100644
--- a/src/shader_recompiler/frontend/maxwell/program.h
+++ b/src/shader_recompiler/frontend/maxwell/translate_program.h
@@ -4,13 +4,8 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <memory>
8#include <string>
9#include <vector>
10
11#include <boost/container/small_vector.hpp>
12
13#include "shader_recompiler/environment.h" 7#include "shader_recompiler/environment.h"
8#include "shader_recompiler/frontend/ir/basic_block.h"
14#include "shader_recompiler/frontend/ir/program.h" 9#include "shader_recompiler/frontend/ir/program.h"
15#include "shader_recompiler/frontend/maxwell/control_flow.h" 10#include "shader_recompiler/frontend/maxwell/control_flow.h"
16#include "shader_recompiler/object_pool.h" 11#include "shader_recompiler/object_pool.h"
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp
index 620666622..c05cd5d28 100644
--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp
@@ -22,7 +22,7 @@
22#include "shader_recompiler/backend/spirv/emit_spirv.h" 22#include "shader_recompiler/backend/spirv/emit_spirv.h"
23#include "shader_recompiler/frontend/ir/program.h" 23#include "shader_recompiler/frontend/ir/program.h"
24#include "shader_recompiler/frontend/maxwell/control_flow.h" 24#include "shader_recompiler/frontend/maxwell/control_flow.h"
25#include "shader_recompiler/frontend/maxwell/program.h" 25#include "shader_recompiler/frontend/maxwell/translate_program.h"
26#include "shader_recompiler/profile.h" 26#include "shader_recompiler/profile.h"
27#include "video_core/engines/kepler_compute.h" 27#include "video_core/engines/kepler_compute.h"
28#include "video_core/engines/maxwell_3d.h" 28#include "video_core/engines/maxwell_3d.h"
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index b17f34cdd..0b6fe8e2e 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -20,7 +20,7 @@
20#include "shader_recompiler/backend/spirv/emit_spirv.h" 20#include "shader_recompiler/backend/spirv/emit_spirv.h"
21#include "shader_recompiler/environment.h" 21#include "shader_recompiler/environment.h"
22#include "shader_recompiler/frontend/maxwell/control_flow.h" 22#include "shader_recompiler/frontend/maxwell/control_flow.h"
23#include "shader_recompiler/frontend/maxwell/program.h" 23#include "shader_recompiler/frontend/maxwell/translate_program.h"
24#include "shader_recompiler/program_header.h" 24#include "shader_recompiler/program_header.h"
25#include "video_core/dirty_flags.h" 25#include "video_core/dirty_flags.h"
26#include "video_core/engines/kepler_compute.h" 26#include "video_core/engines/kepler_compute.h"