core: Resolve C4267 warning on MSVC
This commit is contained in:
parent
4e73ff3978
commit
3a43475149
|
@ -8,7 +8,8 @@
|
||||||
namespace VideoDumper {
|
namespace VideoDumper {
|
||||||
|
|
||||||
VideoFrame::VideoFrame(std::size_t width_, std::size_t height_, u8* data_)
|
VideoFrame::VideoFrame(std::size_t width_, std::size_t height_, u8* data_)
|
||||||
: width(width_), height(height_), stride(width * 4), data(data_, data_ + width * height * 4) {}
|
: width(width_), height(height_), stride(static_cast<u32>(width * 4)),
|
||||||
|
data(data_, data_ + width * height * 4) {}
|
||||||
|
|
||||||
Backend::~Backend() = default;
|
Backend::~Backend() = default;
|
||||||
NullBackend::~NullBackend() = default;
|
NullBackend::~NullBackend() = default;
|
||||||
|
|
|
@ -354,7 +354,7 @@ void FFmpegAudioStream::ProcessFrame(const VariableAudioFrame& channel0,
|
||||||
}
|
}
|
||||||
|
|
||||||
auto resampled_count = swr_convert(swr_context.get(), dst_data.data(), frame_size - offset,
|
auto resampled_count = swr_convert(swr_context.get(), dst_data.data(), frame_size - offset,
|
||||||
src_data.data(), channel0.size());
|
src_data.data(), static_cast<int>(channel0.size()));
|
||||||
if (resampled_count < 0) {
|
if (resampled_count < 0) {
|
||||||
LOG_ERROR(Render, "Audio frame dropped: Could not resample data");
|
LOG_ERROR(Render, "Audio frame dropped: Could not resample data");
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -143,7 +143,7 @@ u32 GetSeedCount() {
|
||||||
if (!db.Load()) {
|
if (!db.Load()) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return db.GetCount();
|
return static_cast<u32>(db.GetCount());
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace FileSys
|
} // namespace FileSys
|
||||||
|
|
|
@ -209,7 +209,8 @@ ResultCode TranslateCommandBuffer(Kernel::KernelSystem& kernel, Memory::MemorySy
|
||||||
target_address =
|
target_address =
|
||||||
dst_process->vm_manager
|
dst_process->vm_manager
|
||||||
.MapBackingMemoryToBase(Memory::IPC_MAPPING_VADDR, Memory::IPC_MAPPING_SIZE,
|
.MapBackingMemoryToBase(Memory::IPC_MAPPING_VADDR, Memory::IPC_MAPPING_SIZE,
|
||||||
buffer, buffer->GetSize(), Kernel::MemoryState::Shared)
|
buffer, static_cast<u32>(buffer->GetSize()),
|
||||||
|
Kernel::MemoryState::Shared)
|
||||||
.Unwrap();
|
.Unwrap();
|
||||||
|
|
||||||
cmd_buf[i++] = target_address + page_offset;
|
cmd_buf[i++] = target_address + page_offset;
|
||||||
|
@ -217,7 +218,7 @@ ResultCode TranslateCommandBuffer(Kernel::KernelSystem& kernel, Memory::MemorySy
|
||||||
// Reserve a page of memory after the mapped buffer
|
// Reserve a page of memory after the mapped buffer
|
||||||
dst_process->vm_manager.MapBackingMemoryToBase(
|
dst_process->vm_manager.MapBackingMemoryToBase(
|
||||||
Memory::IPC_MAPPING_VADDR, Memory::IPC_MAPPING_SIZE, reserve_buffer,
|
Memory::IPC_MAPPING_VADDR, Memory::IPC_MAPPING_SIZE, reserve_buffer,
|
||||||
reserve_buffer->GetSize(), Kernel::MemoryState::Reserved);
|
static_cast<u32>(reserve_buffer->GetSize()), Kernel::MemoryState::Reserved);
|
||||||
|
|
||||||
mapped_buffer_context.push_back({permissions, size, source_address,
|
mapped_buffer_context.push_back({permissions, size, source_address,
|
||||||
target_address + page_offset, std::move(buffer),
|
target_address + page_offset, std::move(buffer),
|
||||||
|
|
|
@ -389,15 +389,16 @@ ResultVal<std::shared_ptr<Thread>> KernelSystem::CreateThread(
|
||||||
auto& vm_manager = owner_process->vm_manager;
|
auto& vm_manager = owner_process->vm_manager;
|
||||||
|
|
||||||
// Map the page to the current process' address space.
|
// Map the page to the current process' address space.
|
||||||
vm_manager.MapBackingMemory(Memory::TLS_AREA_VADDR + available_page * Memory::PAGE_SIZE,
|
vm_manager.MapBackingMemory(
|
||||||
memory.GetFCRAMRef(*offset), Memory::PAGE_SIZE,
|
Memory::TLS_AREA_VADDR + static_cast<VAddr>(available_page) * Memory::PAGE_SIZE,
|
||||||
MemoryState::Locked);
|
memory.GetFCRAMRef(*offset), Memory::PAGE_SIZE, MemoryState::Locked);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mark the slot as used
|
// Mark the slot as used
|
||||||
tls_slots[available_page].set(available_slot);
|
tls_slots[available_page].set(available_slot);
|
||||||
thread->tls_address = Memory::TLS_AREA_VADDR + available_page * Memory::PAGE_SIZE +
|
thread->tls_address = Memory::TLS_AREA_VADDR +
|
||||||
available_slot * Memory::TLS_ENTRY_SIZE;
|
static_cast<VAddr>(available_page) * Memory::PAGE_SIZE +
|
||||||
|
static_cast<VAddr>(available_slot) * Memory::TLS_ENTRY_SIZE;
|
||||||
|
|
||||||
memory.ZeroBlock(*owner_process, thread->tls_address, Memory::TLS_ENTRY_SIZE);
|
memory.ZeroBlock(*owner_process, thread->tls_address, Memory::TLS_ENTRY_SIZE);
|
||||||
|
|
||||||
|
|
|
@ -161,7 +161,7 @@ void DSP_DSP::ReadPipeIfPossible(Kernel::HLERequestContext& ctx) {
|
||||||
|
|
||||||
IPC::RequestBuilder rb = rp.MakeBuilder(2, 2);
|
IPC::RequestBuilder rb = rp.MakeBuilder(2, 2);
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
rb.Push<u16>(pipe_buffer.size());
|
rb.Push<u16>(static_cast<u16>(pipe_buffer.size()));
|
||||||
rb.PushStaticBuffer(std::move(pipe_buffer), 0);
|
rb.PushStaticBuffer(std::move(pipe_buffer), 0);
|
||||||
|
|
||||||
LOG_DEBUG(Service_DSP, "channel={}, peer={}, size=0x{:04X}, pipe_readable_size=0x{:04X}",
|
LOG_DEBUG(Service_DSP, "channel={}, peer={}, size=0x{:04X}, pipe_readable_size=0x{:04X}",
|
||||||
|
|
|
@ -141,7 +141,7 @@ void Module::Interface::GetTagInfo(Kernel::HLERequestContext& ctx) {
|
||||||
|
|
||||||
TagInfo tag_info{};
|
TagInfo tag_info{};
|
||||||
tag_info.uuid = nfc->amiibo_data.uuid;
|
tag_info.uuid = nfc->amiibo_data.uuid;
|
||||||
tag_info.id_offset_size = tag_info.uuid.size();
|
tag_info.id_offset_size = static_cast<u16>(tag_info.uuid.size());
|
||||||
tag_info.unk1 = 0x0;
|
tag_info.unk1 = 0x0;
|
||||||
tag_info.unk2 = 0x2;
|
tag_info.unk2 = 0x2;
|
||||||
|
|
||||||
|
|
Reference in New Issue