diff options
| author | 2014-06-14 12:13:16 -0400 | |
|---|---|---|
| committer | 2014-06-14 12:13:16 -0400 | |
| commit | 004df767953a949817da89bddcd5d1379240f769 (patch) | |
| tree | b2d54928dcbf3cb4dde0cd5d3277afe7999b7bd9 /src/core/hle/coprocessor.cpp | |
| parent | GPU debugger: Const correctness and build fix. (diff) | |
| parent | Kernel: Removed unnecessary "#pragma once". (diff) | |
| download | yuzu-004df767953a949817da89bddcd5d1379240f769.tar.gz yuzu-004df767953a949817da89bddcd5d1379240f769.tar.xz yuzu-004df767953a949817da89bddcd5d1379240f769.zip | |
Merge branch 'threading' of https://github.com/bunnei/citra
Conflicts:
src/core/hle/function_wrappers.h
src/core/hle/service/gsp.cpp
Diffstat (limited to 'src/core/hle/coprocessor.cpp')
| -rw-r--r-- | src/core/hle/coprocessor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/coprocessor.cpp b/src/core/hle/coprocessor.cpp index 39674ee64..9a5b0deda 100644 --- a/src/core/hle/coprocessor.cpp +++ b/src/core/hle/coprocessor.cpp | |||
| @@ -25,7 +25,7 @@ s32 CallMRC(u32 instruction) { | |||
| 25 | return GetThreadCommandBuffer(); | 25 | return GetThreadCommandBuffer(); |
| 26 | 26 | ||
| 27 | default: | 27 | default: |
| 28 | //DEBUG_LOG(OSHLE, "unknown MRC call 0x%08X", instruction); | 28 | DEBUG_LOG(OSHLE, "unknown MRC call 0x%08X", instruction); |
| 29 | break; | 29 | break; |
| 30 | } | 30 | } |
| 31 | return -1; | 31 | return -1; |