diff options
| author | 2014-09-28 11:20:06 -0400 | |
|---|---|---|
| committer | 2014-10-07 20:35:13 -0400 | |
| commit | eb5054e6eb0d810f26caff9f09e43dbeee4a69fa (patch) | |
| tree | 58a6e4f1e07f3ee8e2ad469bca7c2b43edac20a6 /src/video_core/debug_utils | |
| parent | Merge pull request #118 from lioncash/chunk-file (diff) | |
| download | yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.tar.gz yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.tar.xz yuzu-eb5054e6eb0d810f26caff9f09e43dbeee4a69fa.zip | |
Fix warnings in video_core
Diffstat (limited to 'src/video_core/debug_utils')
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 8f4aa0ad0..22b8e9950 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp | |||
| @@ -203,7 +203,7 @@ void DumpShader(const u32* binary_data, u32 binary_size, const u32* swizzle_data | |||
| 203 | } else { | 203 | } else { |
| 204 | it->component_mask = it->component_mask | component_mask; | 204 | it->component_mask = it->component_mask | component_mask; |
| 205 | } | 205 | } |
| 206 | } catch (const std::out_of_range& oor) { | 206 | } catch (const std::out_of_range& ) { |
| 207 | _dbg_assert_msg_(GPU, 0, "Unknown output attribute mapping"); | 207 | _dbg_assert_msg_(GPU, 0, "Unknown output attribute mapping"); |
| 208 | ERROR_LOG(GPU, "Unknown output attribute mapping: %03x, %03x, %03x, %03x", | 208 | ERROR_LOG(GPU, "Unknown output attribute mapping: %03x, %03x, %03x, %03x", |
| 209 | (int)output_attributes[i].map_x.Value(), | 209 | (int)output_attributes[i].map_x.Value(), |
| @@ -235,7 +235,7 @@ void DumpShader(const u32* binary_data, u32 binary_size, const u32* swizzle_data | |||
| 235 | dvlp.swizzle_patterns_offset = write_offset - dvlp_offset; | 235 | dvlp.swizzle_patterns_offset = write_offset - dvlp_offset; |
| 236 | dvlp.swizzle_patterns_num_entries = swizzle_size; | 236 | dvlp.swizzle_patterns_num_entries = swizzle_size; |
| 237 | u32 dummy = 0; | 237 | u32 dummy = 0; |
| 238 | for (int i = 0; i < swizzle_size; ++i) { | 238 | for (unsigned int i = 0; i < swizzle_size; ++i) { |
| 239 | QueueForWriting((u8*)&swizzle_data[i], sizeof(swizzle_data[i])); | 239 | QueueForWriting((u8*)&swizzle_data[i], sizeof(swizzle_data[i])); |
| 240 | QueueForWriting((u8*)&dummy, sizeof(dummy)); | 240 | QueueForWriting((u8*)&dummy, sizeof(dummy)); |
| 241 | } | 241 | } |
| @@ -278,7 +278,7 @@ void StartPicaTracing() | |||
| 278 | 278 | ||
| 279 | bool IsPicaTracing() | 279 | bool IsPicaTracing() |
| 280 | { | 280 | { |
| 281 | return is_pica_tracing; | 281 | return is_pica_tracing != 0; |
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | void OnPicaRegWrite(u32 id, u32 value) | 284 | void OnPicaRegWrite(u32 id, u32 value) |
| @@ -428,7 +428,7 @@ void DumpTevStageConfig(const std::array<Pica::Regs::TevStageConfig,6>& stages) | |||
| 428 | using Operation = Pica::Regs::TevStageConfig::Operation; | 428 | using Operation = Pica::Regs::TevStageConfig::Operation; |
| 429 | 429 | ||
| 430 | std::string stage_info = "Tev setup:\n"; | 430 | std::string stage_info = "Tev setup:\n"; |
| 431 | for (int index = 0; index < stages.size(); ++index) { | 431 | for (size_t index = 0; index < stages.size(); ++index) { |
| 432 | const auto& tev_stage = stages[index]; | 432 | const auto& tev_stage = stages[index]; |
| 433 | 433 | ||
| 434 | const std::map<Source, std::string> source_map = { | 434 | const std::map<Source, std::string> source_map = { |