diff options
| author | bunnei <bunneidev@gmail.com> | 2015-08-15 04:29:08 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-08-16 00:03:27 +0200 |
| commit | b39c053785abc4a94ce380885a846c5d8be89675 (patch) | |
| tree | 42911208a051652a7452c8bbbd35ec91aa2d4e20 /src/video_core | |
| parent | Common: Cleanup CPU capability detection code. (diff) | |
| download | yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.gz yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.bz2 yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.lz yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.xz yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.zst yuzu-b39c053785abc4a94ce380885a846c5d8be89675.zip | |
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/video_core/shader/shader.cpp | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 221abc160..183709d8b 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -42,7 +42,7 @@ set(HEADERS video_core.h ) -if(ARCHITECTURE_X64) +if(ARCHITECTURE_x86_64) set(SRCS ${SRCS} shader/shader_jit_x64.cpp) diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index f7459e2ad..06c1fe653 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp @@ -16,20 +16,18 @@ #include "shader.h" #include "shader_interpreter.h" -#ifdef ARCHITECTURE_X64 +#ifdef ARCHITECTURE_x86_64 #include "shader_jit_x64.h" -#endif // ARCHITECTURE_X64 +#endif // ARCHITECTURE_x86_64 namespace Pica { namespace Shader { #ifdef ARCHITECTURE_x86_64 - static std::unordered_map<u64, CompiledShader*> shader_map; static JitCompiler jit; static CompiledShader* jit_shader; - #endif // ARCHITECTURE_x86_64 void Setup(UnitState& state) { @@ -46,7 +44,8 @@ void Setup(UnitState& state) { jit_shader = jit.Compile(); shader_map.emplace(cache_key, jit_shader); } -#endif // ARCHITECTURE_X64 + } +#endif // ARCHITECTURE_x86_64 } void Shutdown() { @@ -95,7 +94,7 @@ OutputVertex Run(UnitState& state, const InputVertex& input, int num_attributes) RunInterpreter(state); #else RunInterpreter(state); -#endif // ARCHITECTURE_X64 +#endif // ARCHITECTURE_x86_64 #if PICA_DUMP_SHADERS DebugUtils::DumpShader(setup.program_code.data(), state.debug.max_offset, setup.swizzle_data.data(), |