diff options
| author | 2014-12-05 23:53:49 -0200 | |
|---|---|---|
| committer | 2014-12-13 02:08:02 -0200 | |
| commit | 0600e2d8b5b30bd68c8b19cb1f2051e096e7caa9 (patch) | |
| tree | 40fee084c551bfb497e68181447298f862ea68ca /src/video_core/debug_utils | |
| parent | Implement text path trimming for shorter paths. (diff) | |
| download | yuzu-0600e2d8b5b30bd68c8b19cb1f2051e096e7caa9.tar.gz yuzu-0600e2d8b5b30bd68c8b19cb1f2051e096e7caa9.tar.xz yuzu-0600e2d8b5b30bd68c8b19cb1f2051e096e7caa9.zip | |
Convert old logging calls to new logging macros
Diffstat (limited to 'src/video_core/debug_utils')
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 71b03f31c..1a20f19ec 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp | |||
| @@ -248,8 +248,8 @@ void DumpShader(const u32* binary_data, u32 binary_size, const u32* swizzle_data | |||
| 248 | it->component_mask = it->component_mask | component_mask; | 248 | it->component_mask = it->component_mask | component_mask; |
| 249 | } | 249 | } |
| 250 | } catch (const std::out_of_range& ) { | 250 | } catch (const std::out_of_range& ) { |
| 251 | _dbg_assert_msg_(GPU, 0, "Unknown output attribute mapping"); | 251 | _dbg_assert_msg_(HW_GPU, 0, "Unknown output attribute mapping"); |
| 252 | ERROR_LOG(GPU, "Unknown output attribute mapping: %03x, %03x, %03x, %03x", | 252 | LOG_ERROR(HW_GPU, "Unknown output attribute mapping: %03x, %03x, %03x, %03x", |
| 253 | (int)output_attributes[i].map_x.Value(), | 253 | (int)output_attributes[i].map_x.Value(), |
| 254 | (int)output_attributes[i].map_y.Value(), | 254 | (int)output_attributes[i].map_y.Value(), |
| 255 | (int)output_attributes[i].map_z.Value(), | 255 | (int)output_attributes[i].map_z.Value(), |
| @@ -309,7 +309,7 @@ static int is_pica_tracing = false; | |||
| 309 | void StartPicaTracing() | 309 | void StartPicaTracing() |
| 310 | { | 310 | { |
| 311 | if (is_pica_tracing) { | 311 | if (is_pica_tracing) { |
| 312 | ERROR_LOG(GPU, "StartPicaTracing called even though tracing already running!"); | 312 | LOG_WARNING(HW_GPU, "StartPicaTracing called even though tracing already running!"); |
| 313 | return; | 313 | return; |
| 314 | } | 314 | } |
| 315 | 315 | ||
| @@ -342,7 +342,7 @@ void OnPicaRegWrite(u32 id, u32 value) | |||
| 342 | std::unique_ptr<PicaTrace> FinishPicaTracing() | 342 | std::unique_ptr<PicaTrace> FinishPicaTracing() |
| 343 | { | 343 | { |
| 344 | if (!is_pica_tracing) { | 344 | if (!is_pica_tracing) { |
| 345 | ERROR_LOG(GPU, "FinishPicaTracing called even though tracing already running!"); | 345 | LOG_WARNING(HW_GPU, "FinishPicaTracing called even though tracing isn't running!"); |
| 346 | return {}; | 346 | return {}; |
| 347 | } | 347 | } |
| 348 | 348 | ||
| @@ -357,7 +357,7 @@ std::unique_ptr<PicaTrace> FinishPicaTracing() | |||
| 357 | } | 357 | } |
| 358 | 358 | ||
| 359 | const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const TextureInfo& info) { | 359 | const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const TextureInfo& info) { |
| 360 | _dbg_assert_(GPU, info.format == Pica::Regs::TextureFormat::RGB8); | 360 | _dbg_assert_(Debug_GPU, info.format == Pica::Regs::TextureFormat::RGB8); |
| 361 | 361 | ||
| 362 | // Cf. rasterizer code for an explanation of this algorithm. | 362 | // Cf. rasterizer code for an explanation of this algorithm. |
| 363 | int texel_index_within_tile = 0; | 363 | int texel_index_within_tile = 0; |
| @@ -421,7 +421,7 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) { | |||
| 421 | // Initialize write structure | 421 | // Initialize write structure |
| 422 | png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); | 422 | png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr); |
| 423 | if (png_ptr == nullptr) { | 423 | if (png_ptr == nullptr) { |
| 424 | ERROR_LOG(GPU, "Could not allocate write struct\n"); | 424 | LOG_ERROR(Debug_GPU, "Could not allocate write struct\n"); |
| 425 | goto finalise; | 425 | goto finalise; |
| 426 | 426 | ||
| 427 | } | 427 | } |
| @@ -429,13 +429,13 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) { | |||
| 429 | // Initialize info structure | 429 | // Initialize info structure |
| 430 | info_ptr = png_create_info_struct(png_ptr); | 430 | info_ptr = png_create_info_struct(png_ptr); |
| 431 | if (info_ptr == nullptr) { | 431 | if (info_ptr == nullptr) { |
| 432 | ERROR_LOG(GPU, "Could not allocate info struct\n"); | 432 | LOG_ERROR(Debug_GPU, "Could not allocate info struct\n"); |
| 433 | goto finalise; | 433 | goto finalise; |
| 434 | } | 434 | } |
| 435 | 435 | ||
| 436 | // Setup Exception handling | 436 | // Setup Exception handling |
| 437 | if (setjmp(png_jmpbuf(png_ptr))) { | 437 | if (setjmp(png_jmpbuf(png_ptr))) { |
| 438 | ERROR_LOG(GPU, "Error during png creation\n"); | 438 | LOG_ERROR(Debug_GPU, "Error during png creation\n"); |
| 439 | goto finalise; | 439 | goto finalise; |
| 440 | } | 440 | } |
| 441 | 441 | ||
| @@ -582,7 +582,7 @@ void DumpTevStageConfig(const std::array<Pica::Regs::TevStageConfig,6>& stages) | |||
| 582 | stage_info += "Stage " + std::to_string(index) + ": " + GetColorCombinerStr(tev_stage) + " " + GetAlphaCombinerStr(tev_stage) + "\n"; | 582 | stage_info += "Stage " + std::to_string(index) + ": " + GetColorCombinerStr(tev_stage) + " " + GetAlphaCombinerStr(tev_stage) + "\n"; |
| 583 | } | 583 | } |
| 584 | 584 | ||
| 585 | DEBUG_LOG(GPU, "%s", stage_info.c_str()); | 585 | LOG_TRACE(HW_GPU, "%s", stage_info.c_str()); |
| 586 | } | 586 | } |
| 587 | 587 | ||
| 588 | } // namespace | 588 | } // namespace |