Просмотр исходного кода

Merge pull request #1099 from aroulin/video-core-format-specifier

video_core: Fix format specifiers warnings
bunnei 11 лет назад
Родитель
Сommit
d02c9c83f5
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 1
      src/video_core/command_processor.cpp
  2. 2 1
      src/video_core/shader/shader_jit_x64.cpp

+ 1 - 1
src/video_core/command_processor.cpp

@@ -290,7 +290,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
                                     *(float*)srcdata;
                                     *(float*)srcdata;
 
 
                                 input.attr[i][comp] = float24::FromFloat32(srcval);
                                 input.attr[i][comp] = float24::FromFloat32(srcval);
-                                LOG_TRACE(HW_GPU, "Loaded component %x of attribute %x for vertex %x (index %x) from 0x%08x + 0x%08lx + 0x%04lx: %f",
+                                LOG_TRACE(HW_GPU, "Loaded component %x of attribute %x for vertex %x (index %x) from 0x%08x + 0x%08x + 0x%04x: %f",
                                     comp, i, vertex, index,
                                     comp, i, vertex, index,
                                     attribute_config.GetPhysicalBaseAddress(),
                                     attribute_config.GetPhysicalBaseAddress(),
                                     vertex_attribute_sources[i] - base_address,
                                     vertex_attribute_sources[i] - base_address,

+ 2 - 1
src/video_core/shader/shader_jit_x64.cpp

@@ -746,7 +746,8 @@ void JitCompiler::Compile_NextInstr(unsigned* offset) {
         ((*this).*instr_func)(instr);
         ((*this).*instr_func)(instr);
     } else {
     } else {
         // Unhandled instruction
         // Unhandled instruction
-        LOG_CRITICAL(HW_GPU, "Unhandled instruction: 0x%02x (0x%08x)", instr.opcode.Value(), instr.hex);
+        LOG_CRITICAL(HW_GPU, "Unhandled instruction: 0x%02x (0x%08x)",
+                     instr.opcode.Value().EffectiveOpCode(), instr.hex);
     }
     }
 }
 }