mirror of
https://github.com/ARMSX2/ARMSX3.git
synced 2026-08-24 16:58:52 -07:00
jpolo1224
13dcec9e66
14 of the 15 upstream commits sincebab81aa23. The fifteenth, 3aea3b15d 'Fix ISO timestamps', is deliberately left out: it touches rpcs3/Loader/ISO.cpp, and the Aug-2026 upstream ISO refactor is already reverted here because it breaks some images (region_count reads 0 and the disc will not mount). It is the tip commit, so merging its parent excluded it exactly, with no surgery. Four conflicts, all of them ours-and-theirs rather than either-or: nv4097.cpp conflicted whole-file. Took ours and applied upstream 071c9f10f's set_shading_mode by hand -- an earlier merge of this same file lost two hunks by resolving it wholesale, and that is recorded inc6a0878a9. VKPipelineCompiler.cpp: ours has the mobile dynamic-state work (topology-class collapsing, normalize_dynamic_pipeline_state, compiler thread affinity), upstream adds a provoking-vertex chain for flat shading. They are independent, so both are in, with the rasterization state rebased as upstream needs. device.cpp: three hunks, all parallel feature queries -- extended dynamic state and the Android LSFG feature bits on our side, provoking vertex on theirs. All kept; ours' extension push needed its own closing brace. BUILDING.md stays deleted:30fc4e566folded it into the README, and upstream merely edited it. Core builds and links.