summaryrefslogtreecommitdiff
path: root/src/video_core/debug_utils
diff options
context:
space:
mode:
authorGravatar archshift2015-01-20 17:16:47 -0800
committerGravatar archshift2015-02-10 18:30:31 -0800
commitef24e72b2618806f64345544fa46c84f3f494890 (patch)
treefca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/video_core/debug_utils
parentGSP: Fixed typo in SignalInterrupt (diff)
downloadyuzu-ef24e72b2618806f64345544fa46c84f3f494890.tar.gz
yuzu-ef24e72b2618806f64345544fa46c84f3f494890.tar.xz
yuzu-ef24e72b2618806f64345544fa46c84f3f494890.zip
Asserts: break/crash program, fit to style guide; log.h->assert.h
Involves making asserts use printf instead of the log functions (log functions are asynchronous and, as such, the log won't be printed in time) As such, the log type argument was removed (printf obviously can't use it, and it's made obsolete by the file and line printing) Also removed some GEKKO cruft.
Diffstat (limited to 'src/video_core/debug_utils')
-rw-r--r--src/video_core/debug_utils/debug_utils.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 12f0009bd..8c4ec1044 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -16,7 +16,7 @@
16 16
17#include <nihstro/shader_binary.h> 17#include <nihstro/shader_binary.h>
18 18
19#include "common/log.h" 19#include "common/assert.h"
20#include "common/file_util.h" 20#include "common/file_util.h"
21#include "common/math_util.h" 21#include "common/math_util.h"
22 22
@@ -197,7 +197,7 @@ void DumpShader(const u32* binary_data, u32 binary_size, const u32* swizzle_data
197 it->component_mask = it->component_mask | component_mask; 197 it->component_mask = it->component_mask | component_mask;
198 } 198 }
199 } catch (const std::out_of_range& ) { 199 } catch (const std::out_of_range& ) {
200 _dbg_assert_msg_(HW_GPU, 0, "Unknown output attribute mapping"); 200 DEBUG_ASSERT_MSG(false, "Unknown output attribute mapping");
201 LOG_ERROR(HW_GPU, "Unknown output attribute mapping: %03x, %03x, %03x, %03x", 201 LOG_ERROR(HW_GPU, "Unknown output attribute mapping: %03x, %03x, %03x, %03x",
202 (int)output_attributes[i].map_x.Value(), 202 (int)output_attributes[i].map_x.Value(),
203 (int)output_attributes[i].map_y.Value(), 203 (int)output_attributes[i].map_y.Value(),
@@ -571,7 +571,7 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture
571 571
572 default: 572 default:
573 LOG_ERROR(HW_GPU, "Unknown texture format: %x", (u32)info.format); 573 LOG_ERROR(HW_GPU, "Unknown texture format: %x", (u32)info.format);
574 _dbg_assert_(HW_GPU, 0); 574 DEBUG_ASSERT(false);
575 return {}; 575 return {};
576 } 576 }
577} 577}