yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

video_core: Silence signed/unsigned mismatch warnings

This commit is contained in:
Morph 2021-06-28 02:55:02 -04:00
parent c5e25cffb9
commit d3d6613d33
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/video_core/renderer_opengl/gl_texture_cache.cpp
View File

@ -327,7 +327,8 @@ void ApplySwizzle(GLuint handle, PixelFormat format, std::array<SwizzleSource, 4
if (format_info.is_compressed) { if (format_info.is_compressed) {
return false; return false;
} }
if (std::ranges::find(ACCELERATED_FORMATS, internal_format) == ACCELERATED_FORMATS.end()) { if (std::ranges::find(ACCELERATED_FORMATS, static_cast<int>(internal_format)) ==
ACCELERATED_FORMATS.end()) {
return false; return false;
} }
if (format_info.compatibility_by_size) { if (format_info.compatibility_by_size) {

2
src/video_core/texture_cache/image_base.cpp
View File

@ -82,7 +82,7 @@ std::optional<SubresourceBase> ImageBase::TryFindBase(GPUVAddr other_addr) const
if (info.type != ImageType::e3D) { if (info.type != ImageType::e3D) {
const auto [layer, mip_offset] = LayerMipOffset(diff, info.layer_stride); const auto [layer, mip_offset] = LayerMipOffset(diff, info.layer_stride);
const auto end = mip_level_offsets.begin() + info.resources.levels; const auto end = mip_level_offsets.begin() + info.resources.levels;
const auto it = std::find(mip_level_offsets.begin(), end, mip_offset); const auto it = std::find(mip_level_offsets.begin(), end, static_cast<u32>(mip_offset));
if (layer > info.resources.layers || it == end) { if (layer > info.resources.layers || it == end) {
return std::nullopt; return std::nullopt;
} }

2
src/video_core/texture_cache/util.cpp
View File

@ -394,7 +394,7 @@ template <u32 GOB_EXTENT>
const s32 mip_offset = diff % layer_stride; const s32 mip_offset = diff % layer_stride;
const std::array offsets = CalculateMipLevelOffsets(new_info); const std::array offsets = CalculateMipLevelOffsets(new_info);
const auto end = offsets.begin() + new_info.resources.levels; const auto end = offsets.begin() + new_info.resources.levels;
const auto it = std::find(offsets.begin(), end, mip_offset); const auto it = std::find(offsets.begin(), end, static_cast<u32>(mip_offset));
if (it == end) { if (it == end) {
// Mipmap is not aligned to any valid size // Mipmap is not aligned to any valid size
return std::nullopt; return std::nullopt;

4
src/video_core/textures/astc.cpp
View File

@ -1365,8 +1365,8 @@ static void DecompressBlock(std::span<const u8, 16> inBuf, const u32 blockWidth,
// each partition. // each partition.
// Determine partitions, partition index, and color endpoint modes // Determine partitions, partition index, and color endpoint modes
s32 planeIdx = -1; u32 planeIdx{UINT32_MAX};
u32 partitionIndex; u32 partitionIndex{};
u32 colorEndpointMode[4] = {0, 0, 0, 0}; u32 colorEndpointMode[4] = {0, 0, 0, 0};
// Define color data. // Define color data.