diff options
| author | 2015-09-02 08:45:01 -0400 | |
|---|---|---|
| committer | 2015-09-02 08:45:01 -0400 | |
| commit | d02c9c83f53ea6d3d1b48a754390c316cb697e0e (patch) | |
| tree | 56b71527dd31b102d350f2f5f679c7bffce102a6 /src | |
| parent | Merge pull request #1072 from yuriks/GetSystemTick-advance-time (diff) | |
| parent | video_core: Fix format specifiers warnings (diff) | |
| download | yuzu-d02c9c83f53ea6d3d1b48a754390c316cb697e0e.tar.gz yuzu-d02c9c83f53ea6d3d1b48a754390c316cb697e0e.tar.xz yuzu-d02c9c83f53ea6d3d1b48a754390c316cb697e0e.zip | |
Merge pull request #1099 from aroulin/video-core-format-specifier
video_core: Fix format specifiers warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/command_processor.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/shader/shader_jit_x64.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index 682be89ec..6e9cb2586 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp | |||
| @@ -290,7 +290,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { | |||
| 290 | *(float*)srcdata; | 290 | *(float*)srcdata; |
| 291 | 291 | ||
| 292 | input.attr[i][comp] = float24::FromFloat32(srcval); | 292 | input.attr[i][comp] = float24::FromFloat32(srcval); |
| 293 | LOG_TRACE(HW_GPU, "Loaded component %x of attribute %x for vertex %x (index %x) from 0x%08x + 0x%08lx + 0x%04lx: %f", | 293 | LOG_TRACE(HW_GPU, "Loaded component %x of attribute %x for vertex %x (index %x) from 0x%08x + 0x%08x + 0x%04x: %f", |
| 294 | comp, i, vertex, index, | 294 | comp, i, vertex, index, |
| 295 | attribute_config.GetPhysicalBaseAddress(), | 295 | attribute_config.GetPhysicalBaseAddress(), |
| 296 | vertex_attribute_sources[i] - base_address, | 296 | vertex_attribute_sources[i] - base_address, |
diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp index c7b63a9b7..1039c8df4 100644 --- a/src/video_core/shader/shader_jit_x64.cpp +++ b/src/video_core/shader/shader_jit_x64.cpp | |||
| @@ -746,7 +746,8 @@ void JitCompiler::Compile_NextInstr(unsigned* offset) { | |||
| 746 | ((*this).*instr_func)(instr); | 746 | ((*this).*instr_func)(instr); |
| 747 | } else { | 747 | } else { |
| 748 | // Unhandled instruction | 748 | // Unhandled instruction |
| 749 | LOG_CRITICAL(HW_GPU, "Unhandled instruction: 0x%02x (0x%08x)", instr.opcode.Value(), instr.hex); | 749 | LOG_CRITICAL(HW_GPU, "Unhandled instruction: 0x%02x (0x%08x)", |
| 750 | instr.opcode.Value().EffectiveOpCode(), instr.hex); | ||
| 750 | } | 751 | } |
| 751 | } | 752 | } |
| 752 | 753 | ||