diff options
| author | 2015-04-08 19:41:04 -0500 | |
|---|---|---|
| committer | 2015-04-09 18:55:01 -0500 | |
| commit | f15c142c5e31422b5b9ec8de23f43d8091958fbd (patch) | |
| tree | 1d5782bab56f56f435f51968cb743853e6cffda2 | |
| parent | Merge pull request #689 from lioncash/format (diff) | |
| download | yuzu-f15c142c5e31422b5b9ec8de23f43d8091958fbd.tar.gz yuzu-f15c142c5e31422b5b9ec8de23f43d8091958fbd.tar.xz yuzu-f15c142c5e31422b5b9ec8de23f43d8091958fbd.zip | |
Silence some -Wsign-compare warnings.
| -rw-r--r-- | src/citra_qt/debugger/profiler.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/rasterizer.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp index ae0568b6a..2ac1748b7 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/citra_qt/debugger/profiler.cpp | |||
| @@ -26,7 +26,7 @@ static QVariant GetDataForColumn(int col, const AggregatedDuration& duration) | |||
| 26 | static const TimingCategoryInfo* GetCategoryInfo(int id) | 26 | static const TimingCategoryInfo* GetCategoryInfo(int id) |
| 27 | { | 27 | { |
| 28 | const auto& categories = GetProfilingManager().GetTimingCategoriesInfo(); | 28 | const auto& categories = GetProfilingManager().GetTimingCategoriesInfo(); |
| 29 | if (id >= categories.size()) { | 29 | if ((size_t)id >= categories.size()) { |
| 30 | return nullptr; | 30 | return nullptr; |
| 31 | } else { | 31 | } else { |
| 32 | return &categories[id]; | 32 | return &categories[id]; |
| @@ -98,7 +98,7 @@ QVariant ProfilerModel::data(const QModelIndex& index, int role) const | |||
| 98 | const TimingCategoryInfo* info = GetCategoryInfo(index.row() - 2); | 98 | const TimingCategoryInfo* info = GetCategoryInfo(index.row() - 2); |
| 99 | return info != nullptr ? QString(info->name) : QVariant(); | 99 | return info != nullptr ? QString(info->name) : QVariant(); |
| 100 | } else { | 100 | } else { |
| 101 | if (index.row() - 2 < results.time_per_category.size()) { | 101 | if (index.row() - 2 < (int)results.time_per_category.size()) { |
| 102 | return GetDataForColumn(index.column(), results.time_per_category[index.row() - 2]); | 102 | return GetDataForColumn(index.column(), results.time_per_category[index.row() - 2]); |
| 103 | } else { | 103 | } else { |
| 104 | return QVariant(); | 104 | return QVariant(); |
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index dd46f0ec3..6ec253601 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp | |||
| @@ -342,10 +342,10 @@ static void ProcessTriangleInternal(const VertexShader::OutputVertex& v0, | |||
| 342 | 342 | ||
| 343 | case Regs::TextureConfig::MirroredRepeat: | 343 | case Regs::TextureConfig::MirroredRepeat: |
| 344 | { | 344 | { |
| 345 | int coord = (int)((unsigned)val % (2 * size)); | 345 | unsigned int coord = ((unsigned)val % (2 * size)); |
| 346 | if (coord >= size) | 346 | if (coord >= size) |
| 347 | coord = 2 * size - 1 - coord; | 347 | coord = 2 * size - 1 - coord; |
| 348 | return coord; | 348 | return (int)coord; |
| 349 | } | 349 | } |
| 350 | 350 | ||
| 351 | default: | 351 | default: |