diff options
| author | 2015-07-21 19:09:11 -0400 | |
|---|---|---|
| committer | 2015-08-15 17:33:42 -0400 | |
| commit | 18527b9e21a95445fbee45fea29f674fbdd2aae1 (patch) | |
| tree | bf037c3877e288b561cd7f075c24d3ce8e449a85 /src | |
| parent | GPU: Refactor "VertexShader" namespace to "Shader". (diff) | |
| download | yuzu-18527b9e21a95445fbee45fea29f674fbdd2aae1.tar.gz yuzu-18527b9e21a95445fbee45fea29f674fbdd2aae1.tar.xz yuzu-18527b9e21a95445fbee45fea29f674fbdd2aae1.zip | |
Shader: Move shader code to its own subdirectory, "shader".
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/debugger/graphics_vertex_shader.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/video_core/clipper.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/command_processor.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/primitive_assembly.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/primitive_assembly.h | 2 | ||||
| -rw-r--r-- | src/video_core/rasterizer.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 2 | ||||
| -rw-r--r-- | src/video_core/shader/shader_interpreter.cpp (renamed from src/video_core/shader_interpreter.cpp) | 6 | ||||
| -rw-r--r-- | src/video_core/shader/shader_interpreter.h (renamed from src/video_core/shader_interpreter.h) | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index 566a986f5..302e22d7a 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include <QBoxLayout> | 8 | #include <QBoxLayout> |
| 9 | #include <QTreeView> | 9 | #include <QTreeView> |
| 10 | 10 | ||
| 11 | #include "video_core/shader_interpreter.h" | 11 | #include "video_core/shader/shader_interpreter.h" |
| 12 | 12 | ||
| 13 | #include "graphics_vertex_shader.h" | 13 | #include "graphics_vertex_shader.h" |
| 14 | 14 | ||
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index e06d368e5..22252ea1d 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt | |||
| @@ -11,7 +11,7 @@ set(SRCS | |||
| 11 | pica.cpp | 11 | pica.cpp |
| 12 | primitive_assembly.cpp | 12 | primitive_assembly.cpp |
| 13 | rasterizer.cpp | 13 | rasterizer.cpp |
| 14 | shader_interpreter.cpp | 14 | shader/shader_interpreter.cpp |
| 15 | utils.cpp | 15 | utils.cpp |
| 16 | video_core.cpp | 16 | video_core.cpp |
| 17 | ) | 17 | ) |
| @@ -35,7 +35,7 @@ set(HEADERS | |||
| 35 | primitive_assembly.h | 35 | primitive_assembly.h |
| 36 | rasterizer.h | 36 | rasterizer.h |
| 37 | renderer_base.h | 37 | renderer_base.h |
| 38 | shader_interpreter.h | 38 | shader/shader_interpreter.h |
| 39 | utils.h | 39 | utils.h |
| 40 | video_core.h | 40 | video_core.h |
| 41 | ) | 41 | ) |
diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp index e397ca2e8..bb6048cc0 100644 --- a/src/video_core/clipper.cpp +++ b/src/video_core/clipper.cpp | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include "clipper.h" | 7 | #include "clipper.h" |
| 8 | #include "pica.h" | 8 | #include "pica.h" |
| 9 | #include "rasterizer.h" | 9 | #include "rasterizer.h" |
| 10 | #include "shader_interpreter.h" | 10 | #include "shader/shader_interpreter.h" |
| 11 | 11 | ||
| 12 | namespace Pica { | 12 | namespace Pica { |
| 13 | 13 | ||
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index e199424c3..8f8e9872d 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include "pica.h" | 18 | #include "pica.h" |
| 19 | #include "primitive_assembly.h" | 19 | #include "primitive_assembly.h" |
| 20 | #include "renderer_base.h" | 20 | #include "renderer_base.h" |
| 21 | #include "shader_interpreter.h" | 21 | #include "shader/shader_interpreter.h" |
| 22 | #include "video_core.h" | 22 | #include "video_core.h" |
| 23 | 23 | ||
| 24 | namespace Pica { | 24 | namespace Pica { |
diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp index e15a1daba..e2b1df44c 100644 --- a/src/video_core/primitive_assembly.cpp +++ b/src/video_core/primitive_assembly.cpp | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include "pica.h" | 5 | #include "pica.h" |
| 6 | #include "primitive_assembly.h" | 6 | #include "primitive_assembly.h" |
| 7 | #include "shader_interpreter.h" | 7 | #include "shader/shader_interpreter.h" |
| 8 | 8 | ||
| 9 | #include "common/logging/log.h" | 9 | #include "common/logging/log.h" |
| 10 | #include "video_core/debug_utils/debug_utils.h" | 10 | #include "video_core/debug_utils/debug_utils.h" |
diff --git a/src/video_core/primitive_assembly.h b/src/video_core/primitive_assembly.h index 0de0b8810..80432d68a 100644 --- a/src/video_core/primitive_assembly.h +++ b/src/video_core/primitive_assembly.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include "video_core/pica.h" | 9 | #include "video_core/pica.h" |
| 10 | 10 | ||
| 11 | #include "video_core/shader_interpreter.h" | 11 | #include "video_core/shader/shader_interpreter.h" |
| 12 | 12 | ||
| 13 | namespace Pica { | 13 | namespace Pica { |
| 14 | 14 | ||
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index 4f94313df..b83798b0f 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include "math.h" | 16 | #include "math.h" |
| 17 | #include "pica.h" | 17 | #include "pica.h" |
| 18 | #include "rasterizer.h" | 18 | #include "rasterizer.h" |
| 19 | #include "shader_interpreter.h" | 19 | #include "shader/shader_interpreter.h" |
| 20 | #include "video_core/utils.h" | 20 | #include "video_core/utils.h" |
| 21 | 21 | ||
| 22 | namespace Pica { | 22 | namespace Pica { |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 9018b5e88..a02d5c856 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 10 | 10 | ||
| 11 | #include "video_core/hwrasterizer_base.h" | 11 | #include "video_core/hwrasterizer_base.h" |
| 12 | #include "video_core/shader_interpreter.h" | 12 | #include "video_core/shader/shader_interpreter.h" |
| 13 | 13 | ||
| 14 | #include "gl_state.h" | 14 | #include "gl_state.h" |
| 15 | #include "gl_rasterizer_cache.h" | 15 | #include "gl_rasterizer_cache.h" |
diff --git a/src/video_core/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp index 3cce26d36..369883225 100644 --- a/src/video_core/shader_interpreter.cpp +++ b/src/video_core/shader/shader_interpreter.cpp | |||
| @@ -11,9 +11,9 @@ | |||
| 11 | 11 | ||
| 12 | #include "common/profiler.h" | 12 | #include "common/profiler.h" |
| 13 | 13 | ||
| 14 | #include "pica.h" | 14 | #include "video_core/pica.h" |
| 15 | #include "shader_interpreter.h" | 15 | #include "video_core/shader/shader_interpreter.h" |
| 16 | #include "debug_utils/debug_utils.h" | 16 | #include "video_core/debug_utils/debug_utils.h" |
| 17 | 17 | ||
| 18 | using nihstro::OpCode; | 18 | using nihstro::OpCode; |
| 19 | using nihstro::Instruction; | 19 | using nihstro::Instruction; |
diff --git a/src/video_core/shader_interpreter.h b/src/video_core/shader/shader_interpreter.h index 942a30841..f2900bfc6 100644 --- a/src/video_core/shader_interpreter.h +++ b/src/video_core/shader/shader_interpreter.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include "common/vector_math.h" | 9 | #include "common/vector_math.h" |
| 10 | 10 | ||
| 11 | #include "pica.h" | 11 | #include "video_core/pica.h" |
| 12 | 12 | ||
| 13 | namespace Pica { | 13 | namespace Pica { |
| 14 | 14 | ||