diff options
| author | 2018-04-20 22:25:29 -0400 | |
|---|---|---|
| committer | 2018-04-20 22:30:56 -0400 | |
| commit | 8b28dc55e6f5465302125923ef55175a2594173b (patch) | |
| tree | e10a238f5d33f60aabd17f033b7ebf2271933122 /src | |
| parent | shader_bytecode: Add several more instruction decodings. (diff) | |
| download | yuzu-8b28dc55e6f5465302125923ef55175a2594173b.tar.gz yuzu-8b28dc55e6f5465302125923ef55175a2594173b.tar.xz yuzu-8b28dc55e6f5465302125923ef55175a2594173b.zip | |
gl_shader_decompiler: Cleanup error logging.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_shader_decompiler.cpp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp index 5919b3c9e..6e901f627 100644 --- a/src/video_core/renderer_opengl/gl_shader_decompiler.cpp +++ b/src/video_core/renderer_opengl/gl_shader_decompiler.cpp | |||
| @@ -342,7 +342,7 @@ private: | |||
| 342 | 342 | ||
| 343 | // Decoding failure | 343 | // Decoding failure |
| 344 | if (!opcode) { | 344 | if (!opcode) { |
| 345 | NGLOG_CRITICAL(HW_GPU, "Unhandled instruction: {}", instr.value); | 345 | NGLOG_CRITICAL(HW_GPU, "Unhandled instruction: {0:x}", instr.value); |
| 346 | UNREACHABLE(); | 346 | UNREACHABLE(); |
| 347 | } | 347 | } |
| 348 | 348 | ||
| @@ -425,16 +425,14 @@ private: | |||
| 425 | SetDest(0, dest, "min(" + op_a + "," + op_b + ")", 1, 1, instr.alu.abs_d); | 425 | SetDest(0, dest, "min(" + op_a + "," + op_b + ")", 1, 1, instr.alu.abs_d); |
| 426 | break; | 426 | break; |
| 427 | default: | 427 | default: |
| 428 | NGLOG_CRITICAL(HW_GPU, "Unhandled MUFU sub op: {}", | 428 | NGLOG_CRITICAL(HW_GPU, "Unhandled MUFU sub op: {0:x}", |
| 429 | static_cast<unsigned>(instr.sub_op.Value())); | 429 | static_cast<unsigned>(instr.sub_op.Value())); |
| 430 | UNREACHABLE(); | 430 | UNREACHABLE(); |
| 431 | } | 431 | } |
| 432 | break; | 432 | break; |
| 433 | } | 433 | } |
| 434 | default: { | 434 | default: { |
| 435 | NGLOG_CRITICAL(HW_GPU, "Unhandled arithmetic instruction: {} ({}): {}", | 435 | NGLOG_CRITICAL(HW_GPU, "Unhandled arithmetic instruction: {}", opcode->GetName()); |
| 436 | static_cast<unsigned>(opcode->GetId()), opcode->GetName(), | ||
| 437 | instr.value); | ||
| 438 | UNREACHABLE(); | 436 | UNREACHABLE(); |
| 439 | } | 437 | } |
| 440 | } | 438 | } |
| @@ -468,9 +466,7 @@ private: | |||
| 468 | break; | 466 | break; |
| 469 | } | 467 | } |
| 470 | default: { | 468 | default: { |
| 471 | NGLOG_CRITICAL(HW_GPU, "Unhandled FFMA instruction: {} ({}): {}", | 469 | NGLOG_CRITICAL(HW_GPU, "Unhandled FFMA instruction: {}", opcode->GetName()); |
| 472 | static_cast<unsigned>(opcode->GetId()), opcode->GetName(), | ||
| 473 | instr.value); | ||
| 474 | UNREACHABLE(); | 470 | UNREACHABLE(); |
| 475 | } | 471 | } |
| 476 | } | 472 | } |
| @@ -513,9 +509,7 @@ private: | |||
| 513 | break; | 509 | break; |
| 514 | } | 510 | } |
| 515 | default: { | 511 | default: { |
| 516 | NGLOG_CRITICAL(HW_GPU, "Unhandled memory instruction: {} ({}): {}", | 512 | NGLOG_CRITICAL(HW_GPU, "Unhandled memory instruction: {}", opcode->GetName()); |
| 517 | static_cast<unsigned>(opcode->GetId()), opcode->GetName(), | ||
| 518 | instr.value); | ||
| 519 | UNREACHABLE(); | 513 | UNREACHABLE(); |
| 520 | } | 514 | } |
| 521 | } | 515 | } |
| @@ -592,9 +586,7 @@ private: | |||
| 592 | break; | 586 | break; |
| 593 | } | 587 | } |
| 594 | default: { | 588 | default: { |
| 595 | NGLOG_CRITICAL(HW_GPU, "Unhandled instruction: {} ({}): {}", | 589 | NGLOG_CRITICAL(HW_GPU, "Unhandled instruction: {}", opcode->GetName()); |
| 596 | static_cast<unsigned>(opcode->GetId()), opcode->GetName(), | ||
| 597 | instr.value); | ||
| 598 | UNREACHABLE(); | 590 | UNREACHABLE(); |
| 599 | } | 591 | } |
| 600 | } | 592 | } |