archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rsx: Fix build

Browse source
This commit is contained in:
kd-11 2018-05-13 13:48:28 +03:00 • committed by kd-11
parent ad108720fb
commit 4836a03a7d
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/RSX/Capture/rsx_capture.cpp
View file

@ -87,8 +87,9 @@ namespace rsx
const u32 program_offset = (shader_program & ~0x3); const u32 program_offset = (shader_program & ~0x3);
const u32 addr = get_address(program_offset, program_location); const u32 addr = get_address(program_offset, program_location);
const u32 program_start = program_hash_util::fragment_program_utils::get_fragment_program_start(vm::base(addr)); const auto program_info = program_hash_util::fragment_program_utils::analyse_fragment_program(vm::base(addr));
const u32 ucode_size = program_hash_util::fragment_program_utils::get_fragment_program_ucode_size(vm::base(addr + program_start)); const u32 program_start = program_info.program_start_offset;
const u32 ucode_size = program_info.program_ucode_length;
frame_capture_data::memory_block block; frame_capture_data::memory_block block;
block.addr = addr; block.addr = addr;

12
rpcs3/Emu/RSX/Common/ProgramStateCache.cpp
View file

@ -129,6 +129,7 @@ fragment_program_utils::fragment_program_metadata fragment_program_utils::analys
const qword *instBuffer = (const qword*)ptr; const qword *instBuffer = (const qword*)ptr;
size_t instIndex = 0; size_t instIndex = 0;
s32 program_offset = -1; s32 program_offset = -1;
u32 ucode_size = 0;
u16 textures_mask = 0; u16 textures_mask = 0;
while (true) while (true)
@ -163,13 +164,22 @@ fragment_program_utils::fragment_program_metadata fragment_program_utils::analys
{ {
//Instruction references constant, skip one slot occupied by data //Instruction references constant, skip one slot occupied by data
instIndex++; instIndex++;
ucode_size += 16;
} }
} }
if (program_offset >= 0)
{
ucode_size += 16;
}
if ((inst.word[0] >> 8) & 0x1) if ((inst.word[0] >> 8) & 0x1)
{ {
if (program_offset < 0) if (program_offset < 0)
{
program_offset = instIndex * 16; program_offset = instIndex * 16;
ucode_size = 16;
}
break; break;
} }
@ -177,7 +187,7 @@ fragment_program_utils::fragment_program_metadata fragment_program_utils::analys
instIndex++; instIndex++;
} }
return{ (u32)program_offset, textures_mask }; return{ (u32)program_offset, ucode_size, textures_mask };
} }
size_t fragment_program_utils::get_fragment_program_ucode_hash(const RSXFragmentProgram& program) size_t fragment_program_utils::get_fragment_program_ucode_hash(const RSXFragmentProgram& program)

1
rpcs3/Emu/RSX/Common/ProgramStateCache.h
View file

@ -51,6 +51,7 @@ namespace program_hash_util
struct fragment_program_metadata struct fragment_program_metadata
{ {
u32 program_start_offset; u32 program_start_offset;
u32 program_ucode_length;
u16 referenced_textures_mask; u16 referenced_textures_mask;
}; };