diff options
| author | 2018-12-26 01:57:14 -0300 | |
|---|---|---|
| committer | 2019-01-15 17:54:53 -0300 | |
| commit | af5d7e2c49d1cfe470b0b4ebd55561f9f22dc677 (patch) | |
| tree | fe95585385e2569af1f80b6e6c63918e24b64e5f /src | |
| parent | shader_ir: Remove RZ and use Register::ZeroIndex instead (diff) | |
| download | yuzu-af5d7e2c49d1cfe470b0b4ebd55561f9f22dc677.tar.gz yuzu-af5d7e2c49d1cfe470b0b4ebd55561f9f22dc677.tar.xz yuzu-af5d7e2c49d1cfe470b0b4ebd55561f9f22dc677.zip | |
video_core: Rename glsl_decompiler to gl_shader_decompiler
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_cache.h | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp (renamed from src/video_core/shader/glsl_decompiler.cpp) | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.h (renamed from src/video_core/shader/glsl_decompiler.h) | 0 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_gen.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_gen.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index d767fe77d..509ca117a 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt | |||
| @@ -42,6 +42,8 @@ add_library(video_core STATIC | |||
| 42 | renderer_opengl/gl_resource_manager.h | 42 | renderer_opengl/gl_resource_manager.h |
| 43 | renderer_opengl/gl_shader_cache.cpp | 43 | renderer_opengl/gl_shader_cache.cpp |
| 44 | renderer_opengl/gl_shader_cache.h | 44 | renderer_opengl/gl_shader_cache.h |
| 45 | renderer_opengl/gl_shader_decompiler.cpp | ||
| 46 | renderer_opengl/gl_shader_decompiler.h | ||
| 45 | renderer_opengl/gl_shader_gen.cpp | 47 | renderer_opengl/gl_shader_gen.cpp |
| 46 | renderer_opengl/gl_shader_gen.h | 48 | renderer_opengl/gl_shader_gen.h |
| 47 | renderer_opengl/gl_shader_manager.cpp | 49 | renderer_opengl/gl_shader_manager.cpp |
| @@ -83,8 +85,6 @@ add_library(video_core STATIC | |||
| 83 | shader/decode/xmad.cpp | 85 | shader/decode/xmad.cpp |
| 84 | shader/decode/other.cpp | 86 | shader/decode/other.cpp |
| 85 | shader/decode.cpp | 87 | shader/decode.cpp |
| 86 | shader/glsl_decompiler.cpp | ||
| 87 | shader/glsl_decompiler.h | ||
| 88 | shader/shader_ir.cpp | 88 | shader/shader_ir.cpp |
| 89 | shader/shader_ir.h | 89 | shader/shader_ir.h |
| 90 | surface.cpp | 90 | surface.cpp |
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cpp index e5435d733..b3aca39af 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.cpp +++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp | |||
| @@ -10,9 +10,9 @@ | |||
| 10 | #include "video_core/engines/maxwell_3d.h" | 10 | #include "video_core/engines/maxwell_3d.h" |
| 11 | #include "video_core/renderer_opengl/gl_rasterizer.h" | 11 | #include "video_core/renderer_opengl/gl_rasterizer.h" |
| 12 | #include "video_core/renderer_opengl/gl_shader_cache.h" | 12 | #include "video_core/renderer_opengl/gl_shader_cache.h" |
| 13 | #include "video_core/renderer_opengl/gl_shader_decompiler.h" | ||
| 13 | #include "video_core/renderer_opengl/gl_shader_manager.h" | 14 | #include "video_core/renderer_opengl/gl_shader_manager.h" |
| 14 | #include "video_core/renderer_opengl/utils.h" | 15 | #include "video_core/renderer_opengl/utils.h" |
| 15 | #include "video_core/shader/glsl_decompiler.h" | ||
| 16 | #include "video_core/shader/shader_ir.h" | 16 | #include "video_core/shader/shader_ir.h" |
| 17 | 17 | ||
| 18 | namespace OpenGL { | 18 | namespace OpenGL { |
diff --git a/src/video_core/renderer_opengl/gl_shader_cache.h b/src/video_core/renderer_opengl/gl_shader_cache.h index aad1cf6be..e0887dd7b 100644 --- a/src/video_core/renderer_opengl/gl_shader_cache.h +++ b/src/video_core/renderer_opengl/gl_shader_cache.h | |||
| @@ -12,8 +12,8 @@ | |||
| 12 | #include "common/common_types.h" | 12 | #include "common/common_types.h" |
| 13 | #include "video_core/rasterizer_cache.h" | 13 | #include "video_core/rasterizer_cache.h" |
| 14 | #include "video_core/renderer_opengl/gl_resource_manager.h" | 14 | #include "video_core/renderer_opengl/gl_resource_manager.h" |
| 15 | #include "video_core/renderer_opengl/gl_shader_decompiler.h" | ||
| 15 | #include "video_core/renderer_opengl/gl_shader_gen.h" | 16 | #include "video_core/renderer_opengl/gl_shader_gen.h" |
| 16 | #include "video_core/shader/glsl_decompiler.h" | ||
| 17 | 17 | ||
| 18 | namespace OpenGL { | 18 | namespace OpenGL { |
| 19 | 19 | ||
diff --git a/src/video_core/shader/glsl_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index 27f1e0dde..4ded51074 100644 --- a/src/video_core/shader/glsl_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #include "common/assert.h" | 12 | #include "common/assert.h" |
| 13 | #include "common/common_types.h" | 13 | #include "common/common_types.h" |
| 14 | #include "video_core/engines/maxwell_3d.h" | 14 | #include "video_core/engines/maxwell_3d.h" |
| 15 | #include "video_core/shader/glsl_decompiler.h" | 15 | #include "video_core/renderer_opengl/gl_shader_decompiler.h" |
| 16 | #include "video_core/shader/shader_ir.h" | 16 | #include "video_core/shader/shader_ir.h" |
| 17 | 17 | ||
| 18 | namespace OpenGL::GLShader { | 18 | namespace OpenGL::GLShader { |
diff --git a/src/video_core/shader/glsl_decompiler.h b/src/video_core/renderer_opengl/gl_shader_decompiler.h index 396a560d8..396a560d8 100644 --- a/src/video_core/shader/glsl_decompiler.h +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.h | |||
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp index 9fb2f9ace..a3f39152c 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.cpp +++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp | |||
| @@ -5,8 +5,8 @@ | |||
| 5 | #include <fmt/format.h> | 5 | #include <fmt/format.h> |
| 6 | #include "common/assert.h" | 6 | #include "common/assert.h" |
| 7 | #include "video_core/engines/maxwell_3d.h" | 7 | #include "video_core/engines/maxwell_3d.h" |
| 8 | #include "video_core/renderer_opengl/gl_shader_decompiler.h" | ||
| 8 | #include "video_core/renderer_opengl/gl_shader_gen.h" | 9 | #include "video_core/renderer_opengl/gl_shader_gen.h" |
| 9 | #include "video_core/shader/glsl_decompiler.h" | ||
| 10 | #include "video_core/shader/shader_ir.h" | 10 | #include "video_core/shader/shader_ir.h" |
| 11 | 11 | ||
| 12 | namespace OpenGL::GLShader { | 12 | namespace OpenGL::GLShader { |
diff --git a/src/video_core/renderer_opengl/gl_shader_gen.h b/src/video_core/renderer_opengl/gl_shader_gen.h index b14bdb29c..ac5e6917b 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.h +++ b/src/video_core/renderer_opengl/gl_shader_gen.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #include "common/common_types.h" | 11 | #include "common/common_types.h" |
| 12 | #include "video_core/engines/shader_bytecode.h" | 12 | #include "video_core/engines/shader_bytecode.h" |
| 13 | #include "video_core/shader/glsl_decompiler.h" | 13 | #include "video_core/renderer_opengl/gl_shader_decompiler.h" |
| 14 | #include "video_core/shader/shader_ir.h" | 14 | #include "video_core/shader/shader_ir.h" |
| 15 | 15 | ||
| 16 | namespace OpenGL::GLShader { | 16 | namespace OpenGL::GLShader { |