summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-12-17 09:06:23 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2017-01-26 03:53:23 +0100
commit8eefc62833bc8c3052c23f4f0d01d8b60a01925c (patch)
treeca580e5b048cc7d5ce84a1256dd2c3a2e3aeb76e
parentVideoCore/Shader: Split shader uniform state and shader engine (diff)
downloadyuzu-8eefc62833bc8c3052c23f4f0d01d8b60a01925c.tar
yuzu-8eefc62833bc8c3052c23f4f0d01d8b60a01925c.tar.gz
yuzu-8eefc62833bc8c3052c23f4f0d01d8b60a01925c.tar.bz2
yuzu-8eefc62833bc8c3052c23f4f0d01d8b60a01925c.tar.lz
yuzu-8eefc62833bc8c3052c23f4f0d01d8b60a01925c.tar.xz
yuzu-8eefc62833bc8c3052c23f4f0d01d8b60a01925c.tar.zst
yuzu-8eefc62833bc8c3052c23f4f0d01d8b60a01925c.zip
-rw-r--r--src/video_core/CMakeLists.txt4
-rw-r--r--src/video_core/shader/shader.cpp2
-rw-r--r--src/video_core/shader/shader_jit_x64_compiler.cpp (renamed from src/video_core/shader/shader_jit_x64.cpp)2
-rw-r--r--src/video_core/shader/shader_jit_x64_compiler.h (renamed from src/video_core/shader/shader_jit_x64.h)0
4 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt
index 6ca319b59..36397cce9 100644
--- a/src/video_core/CMakeLists.txt
+++ b/src/video_core/CMakeLists.txt
@@ -50,10 +50,10 @@ set(HEADERS
if(ARCHITECTURE_x86_64)
set(SRCS ${SRCS}
- shader/shader_jit_x64.cpp)
+ shader/shader_jit_x64_compiler.cpp)
set(HEADERS ${HEADERS}
- shader/shader_jit_x64.h)
+ shader/shader_jit_x64_compiler.h)
endif()
create_directory_groups(${SRCS} ${HEADERS})
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index d276a1221..97c6519d6 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -17,7 +17,7 @@
#include "video_core/shader/shader.h"
#include "video_core/shader/shader_interpreter.h"
#ifdef ARCHITECTURE_x86_64
-#include "video_core/shader/shader_jit_x64.h"
+#include "video_core/shader/shader_jit_x64_compiler.h"
#endif // ARCHITECTURE_x86_64
#include "video_core/video_core.h"
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64_compiler.cpp
index c588b778b..880543306 100644
--- a/src/video_core/shader/shader_jit_x64.cpp
+++ b/src/video_core/shader/shader_jit_x64_compiler.cpp
@@ -17,7 +17,7 @@
#include "video_core/pica_state.h"
#include "video_core/pica_types.h"
#include "video_core/shader/shader.h"
-#include "video_core/shader/shader_jit_x64.h"
+#include "video_core/shader/shader_jit_x64_compiler.h"
using namespace Common::X64;
using namespace Xbyak::util;
diff --git a/src/video_core/shader/shader_jit_x64.h b/src/video_core/shader/shader_jit_x64_compiler.h
index f37548306..f37548306 100644
--- a/src/video_core/shader/shader_jit_x64.h
+++ b/src/video_core/shader/shader_jit_x64_compiler.h