mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-30 22:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

clang format

Browse Source
This commit is contained in:
IndecisiveTurtle 2024-07-30 13:09:55 +03:00
parent aad9c8049e
commit 622cdafd09
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/libraries/kernel/memory_management.cpp
View File

@ -266,13 +266,11 @@ s32 PS4_SYSV_ABI sceKernelBatchMap2(OrbisKernelBatchMapEntry* entries, int numEn
processed++; processed++;
} else if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_MAP_FLEXIBLE) { } else if (entries[i].operation == MemoryOpTypes::ORBIS_KERNEL_MAP_OP_MAP_FLEXIBLE) {
result = sceKernelMapNamedFlexibleMemory(&entries[i].start, entries[i].length, result = sceKernelMapNamedFlexibleMemory(&entries[i].start, entries[i].length,
entries[i].protection, flags, ""); entries[i].protection, flags, "");
LOG_INFO( LOG_INFO(Kernel_Vmm,
Kernel_Vmm, "BatchMap: entry = {}, operation = {}, len = {:#x}, type = {}, "
"BatchMap: entry = {}, operation = {}, len = {:#x}, type = {}, " "result = {}",
"result = {}", i, entries[i].operation, entries[i].length, (u8)entries[i].type, result);
i, entries[i].operation, entries[i].length, (u8)entries[i].type,
result);
if (result == 0) if (result == 0)
processed++; processed++;

4
src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
View File

@ -205,7 +205,9 @@ void EmitContext::DefineInputs(const Info& info) {
: 1; : 1;
// Note that we pass index rather than Id // Note that we pass index rather than Id
input_params[input.binding] = { input_params[input.binding] = {
rate_idx, input_u32, U32[1], input.num_components, false, input.instance_data_buf, rate_idx, input_u32,
U32[1], input.num_components,
false, input.instance_data_buf,
}; };
} else { } else {
Id id{DefineInput(type, input.binding)}; Id id{DefineInput(type, input.binding)};

5
src/shader_recompiler/frontend/translate/vector_alu.cpp
View File

@ -624,8 +624,9 @@ void Translator::V_MAD_U64_U32(const GcnInst& inst) {
const auto src1 = GetSrc<IR::U32>(inst.src[1]); const auto src1 = GetSrc<IR::U32>(inst.src[1]);
const auto src2 = GetSrc64<IR::U64>(inst.src[2]); const auto src2 = GetSrc64<IR::U64>(inst.src[2]);
//const IR::U64 mul_result = ir.UConvert(64, ir.IMul(src0, src1)); // const IR::U64 mul_result = ir.UConvert(64, ir.IMul(src0, src1));
const IR::U64 mul_result = ir.PackUint2x32(ir.CompositeConstruct(ir.IMul(src0, src1), ir.Imm32(0U))); const IR::U64 mul_result =
ir.PackUint2x32(ir.CompositeConstruct(ir.IMul(src0, src1), ir.Imm32(0U)));
const IR::U64 sum_result = ir.IAdd(mul_result, src2); const IR::U64 sum_result = ir.IAdd(mul_result, src2);
SetDst64(inst.dst[0], sum_result); SetDst64(inst.dst[0], sum_result);

16
src/video_core/renderer_vulkan/vk_scheduler.cpp
View File

@ -62,13 +62,14 @@ void Scheduler::EndRendering() {
.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, .srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED, .dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
.image = render_state.color_images[i], .image = render_state.color_images[i],
.subresourceRange = { .subresourceRange =
.aspectMask = vk::ImageAspectFlagBits::eColor, {
.baseMipLevel = 0, .aspectMask = vk::ImageAspectFlagBits::eColor,
.levelCount = VK_REMAINING_MIP_LEVELS, .baseMipLevel = 0,
.baseArrayLayer = 0, .levelCount = VK_REMAINING_MIP_LEVELS,
.layerCount = VK_REMAINING_ARRAY_LAYERS, .baseArrayLayer = 0,
}, .layerCount = VK_REMAINING_ARRAY_LAYERS,
},
}); });
} }
current_cmdbuf.endRendering(); current_cmdbuf.endRendering();
@ -77,7 +78,6 @@ void Scheduler::EndRendering() {
vk::PipelineStageFlagBits::eFragmentShader, vk::PipelineStageFlagBits::eFragmentShader,
vk::DependencyFlagBits::eByRegion, {}, {}, barriers); vk::DependencyFlagBits::eByRegion, {}, {}, barriers);
} }
} }
void Scheduler::Flush(SubmitInfo& info) { void Scheduler::Flush(SubmitInfo& info) {

3
src/video_core/texture_cache/texture_cache.cpp
View File

@ -341,7 +341,8 @@ void TextureCache::RefreshImage(Image& image) {
cmdbuf.copyBufferToImage(buffer, image.image, vk::ImageLayout::eTransferDstOptimal, image_copy); cmdbuf.copyBufferToImage(buffer, image.image, vk::ImageLayout::eTransferDstOptimal, image_copy);
image.Transit(vk::ImageLayout::eGeneral, vk::AccessFlagBits::eMemoryWrite | vk::AccessFlagBits::eMemoryRead); image.Transit(vk::ImageLayout::eGeneral,
vk::AccessFlagBits::eMemoryWrite | vk::AccessFlagBits::eMemoryRead);
} }
vk::Sampler TextureCache::GetSampler(const AmdGpu::Sampler& sampler) { vk::Sampler TextureCache::GetSampler(const AmdGpu::Sampler& sampler) {