diff options
| author | 2021-06-28 02:55:02 -0400 | |
|---|---|---|
| committer | 2021-06-28 09:21:42 -0400 | |
| commit | d3d6613d33d6ca695732ccbdbd3e749053d22d0a (patch) | |
| tree | f60dfab785157d35dd4110f7cf42b52c7180fee0 /src | |
| parent | Merge pull request #6535 from ameerj/insert-fancy-name (diff) | |
| download | yuzu-d3d6613d33d6ca695732ccbdbd3e749053d22d0a.tar.gz yuzu-d3d6613d33d6ca695732ccbdbd3e749053d22d0a.tar.xz yuzu-d3d6613d33d6ca695732ccbdbd3e749053d22d0a.zip | |
video_core: Silence signed/unsigned mismatch warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_texture_cache.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/texture_cache/image_base.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/texture_cache/util.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/textures/astc.cpp | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 23948feed..e892bd9ba 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp | |||
| @@ -327,7 +327,8 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::array<SwizzleSource, 4 | |||
| 327 | if (format_info.is_compressed) { | 327 | if (format_info.is_compressed) { |
| 328 | return false; | 328 | return false; |
| 329 | } | 329 | } |
| 330 | if (std::ranges::find(ACCELERATED_FORMATS, internal_format) == ACCELERATED_FORMATS.end()) { | 330 | if (std::ranges::find(ACCELERATED_FORMATS, static_cast<int>(internal_format)) == |
| 331 | ACCELERATED_FORMATS.end()) { | ||
| 331 | return false; | 332 | return false; |
| 332 | } | 333 | } |
| 333 | if (format_info.compatibility_by_size) { | 334 | if (format_info.compatibility_by_size) { |
diff --git a/src/video_core/texture_cache/image_base.cpp b/src/video_core/texture_cache/image_base.cpp index ad69d32d1..f22358c90 100644 --- a/src/video_core/texture_cache/image_base.cpp +++ b/src/video_core/texture_cache/image_base.cpp | |||
| @@ -82,7 +82,7 @@ std::optional<SubresourceBase> ImageBase::TryFindBase(GPUVAddr other_addr) const | |||
| 82 | if (info.type != ImageType::e3D) { | 82 | if (info.type != ImageType::e3D) { |
| 83 | const auto [layer, mip_offset] = LayerMipOffset(diff, info.layer_stride); | 83 | const auto [layer, mip_offset] = LayerMipOffset(diff, info.layer_stride); |
| 84 | const auto end = mip_level_offsets.begin() + info.resources.levels; | 84 | const auto end = mip_level_offsets.begin() + info.resources.levels; |
| 85 | const auto it = std::find(mip_level_offsets.begin(), end, mip_offset); | 85 | const auto it = std::find(mip_level_offsets.begin(), end, static_cast<u32>(mip_offset)); |
| 86 | if (layer > info.resources.layers || it == end) { | 86 | if (layer > info.resources.layers || it == end) { |
| 87 | return std::nullopt; | 87 | return std::nullopt; |
| 88 | } | 88 | } |
diff --git a/src/video_core/texture_cache/util.cpp b/src/video_core/texture_cache/util.cpp index 4efe042b6..20794fa32 100644 --- a/src/video_core/texture_cache/util.cpp +++ b/src/video_core/texture_cache/util.cpp | |||
| @@ -394,7 +394,7 @@ template <u32 GOB_EXTENT> | |||
| 394 | const s32 mip_offset = diff % layer_stride; | 394 | const s32 mip_offset = diff % layer_stride; |
| 395 | const std::array offsets = CalculateMipLevelOffsets(new_info); | 395 | const std::array offsets = CalculateMipLevelOffsets(new_info); |
| 396 | const auto end = offsets.begin() + new_info.resources.levels; | 396 | const auto end = offsets.begin() + new_info.resources.levels; |
| 397 | const auto it = std::find(offsets.begin(), end, mip_offset); | 397 | const auto it = std::find(offsets.begin(), end, static_cast<u32>(mip_offset)); |
| 398 | if (it == end) { | 398 | if (it == end) { |
| 399 | // Mipmap is not aligned to any valid size | 399 | // Mipmap is not aligned to any valid size |
| 400 | return std::nullopt; | 400 | return std::nullopt; |
diff --git a/src/video_core/textures/astc.cpp b/src/video_core/textures/astc.cpp index 7b756ba41..3ab500760 100644 --- a/src/video_core/textures/astc.cpp +++ b/src/video_core/textures/astc.cpp | |||
| @@ -1365,8 +1365,8 @@ static void DecompressBlock(std::span<const u8, 16> inBuf, const u32 blockWidth, | |||
| 1365 | // each partition. | 1365 | // each partition. |
| 1366 | 1366 | ||
| 1367 | // Determine partitions, partition index, and color endpoint modes | 1367 | // Determine partitions, partition index, and color endpoint modes |
| 1368 | s32 planeIdx = -1; | 1368 | u32 planeIdx{UINT32_MAX}; |
| 1369 | u32 partitionIndex; | 1369 | u32 partitionIndex{}; |
| 1370 | u32 colorEndpointMode[4] = {0, 0, 0, 0}; | 1370 | u32 colorEndpointMode[4] = {0, 0, 0, 0}; |
| 1371 | 1371 | ||
| 1372 | // Define color data. | 1372 | // Define color data. |