mirror of
https://git.triforceproject.com/triforce/source
synced 2026-11-19 16:20:01 -04:00
Triforce v0.3.2
The above-60 fixes (the pick-up counter, water ripples, sound, moving platforms, the time of day, cutscene cues) and the RDNA 1 subgroup fix, ported from NotRexed/Hookshot: Jordan Ella, hckrman101, klimovich008, Bruno Baccari. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -96,8 +96,8 @@ bool UseShuffleFallback(EmitContext& ctx) {
|
||||
(ctx.profile.has_broken_spirv_fragment_shuffle && ctx.stage == Stage::Fragment);
|
||||
}
|
||||
|
||||
Id ShuffleAbsolute(EmitContext& ctx, Id value, Id src_thread_id) {
|
||||
if (!UseShuffleFallback(ctx)) {
|
||||
Id ShuffleAbsolute(EmitContext& ctx, Id value, Id src_thread_id, bool broadcast) {
|
||||
if (!broadcast) {
|
||||
return ctx.OpGroupNonUniformShuffle(ctx.U32[1], SubgroupScope(ctx), value, src_thread_id);
|
||||
}
|
||||
Id result{ctx.u32_zero_value};
|
||||
@@ -111,8 +111,9 @@ Id ShuffleAbsolute(EmitContext& ctx, Id value, Id src_thread_id) {
|
||||
}
|
||||
|
||||
Id ShuffleRelative(EmitContext& ctx, Id value, Id delta, Id src_thread_id, spv::Op op) {
|
||||
if (!ctx.profile.support_shuffle_relative || UseShuffleFallback(ctx)) {
|
||||
return ShuffleAbsolute(ctx, value, HostThreadId(ctx, src_thread_id));
|
||||
const bool broadcast{UseShuffleFallback(ctx)};
|
||||
if (!ctx.profile.support_shuffle_relative || broadcast) {
|
||||
return ShuffleAbsolute(ctx, value, HostThreadId(ctx, src_thread_id), broadcast);
|
||||
}
|
||||
const Id result{ctx.OpGroupNonUniformShuffleXor(ctx.U32[1], SubgroupScope(ctx), value, delta)};
|
||||
ctx.opcode_rewrites.emplace_back(result.value, op);
|
||||
@@ -260,7 +261,8 @@ Id EmitShuffleIndex(EmitContext& ctx, IR::Inst* inst, Id value, Id index, Id cla
|
||||
return ctx.OpSelect(ctx.U32[1], in_range, BroadcastLane(ctx, value, lane.U32() & 31),
|
||||
value);
|
||||
}
|
||||
const Id shuffled{ShuffleAbsolute(ctx, value, HostThreadId(ctx, src_thread_id))};
|
||||
const Id shuffled{
|
||||
ShuffleAbsolute(ctx, value, HostThreadId(ctx, src_thread_id), UseShuffleFallback(ctx))};
|
||||
return ctx.OpSelect(ctx.U32[1], in_range, shuffled, value);
|
||||
}
|
||||
|
||||
@@ -316,7 +318,7 @@ Id EmitShuffleButterfly(EmitContext& ctx, IR::Inst* inst, Id value, Id index, Id
|
||||
// (hookshot) through the broadcasts where shuffles are broken (UseShuffleFallback: AMD's fragment stages, Lichii #273),
|
||||
// as the absolute and relative shuffles are; #273 left SHFL.BFLY native, and some of Kokiri Forest's plants use it
|
||||
const Id shuffled{UseShuffleFallback(ctx)
|
||||
? ShuffleAbsolute(ctx, value, HostThreadId(ctx, src_thread_id))
|
||||
? ShuffleAbsolute(ctx, value, HostThreadId(ctx, src_thread_id), true)
|
||||
: ctx.OpGroupNonUniformShuffleXor(ctx.U32[1], SubgroupScope(ctx), value, mask)};
|
||||
return ctx.OpSelect(ctx.U32[1], in_range, shuffled, value);
|
||||
}
|
||||
@@ -328,7 +330,8 @@ Id EmitQuadBroadcast(EmitContext& ctx, Id value, Id lane) {
|
||||
const Id base{ctx.OpBitwiseAnd(ctx.U32[1], GetThreadId(ctx), ctx.Const(~3u))};
|
||||
const Id local_lane{ctx.OpBitwiseAnd(ctx.U32[1], lane, ctx.Const(3u))};
|
||||
const Id src_thread_id{ctx.OpBitwiseOr(ctx.U32[1], base, local_lane)};
|
||||
return ShuffleAbsolute(ctx, value, src_thread_id);
|
||||
return ShuffleAbsolute(ctx, value, src_thread_id,
|
||||
ctx.profile.has_broken_spirv_subgroup_shuffle);
|
||||
}
|
||||
|
||||
Id EmitQuadSwap(EmitContext& ctx, Id value, Id direction) {
|
||||
|
||||
@@ -566,11 +566,9 @@ Shader::Profile make_profile() {
|
||||
p.support_scaled_attributes = false; // (*_UI2F / *_I2F read as integers, converted in the shader: R32 has no scaled format)
|
||||
p.support_multi_viewport = true;
|
||||
p.support_sampled_image_array_nonuniform_indexing = true;
|
||||
// (hookshot) a graphics stage the GPU cannot pin to 32 lanes runs at its default: 64 on AMD, where only compute is pinned
|
||||
// (vk_main.cpp). The translator then keeps each 32-lane guest warp to its half of the host's, as Eden does on AMD; the
|
||||
// long path is right at 32 lanes too. The ballots and shuffles of the game's fragment shaders ran across both halves
|
||||
p.warp_size_potentially_larger_than_guest =
|
||||
dev.subgroup_size > 32 && (dev.sg32_stages & VK_SHADER_STAGE_ALL_GRAPHICS) != VK_SHADER_STAGE_ALL_GRAPHICS;
|
||||
// Unpinned SPIR-V 1.6 stages can use any supported subgroup size, even when the default is 32.
|
||||
// The stage-specific profiles below keep the short path only where pin_subgroup actually pins 32 lanes.
|
||||
p.warp_size_potentially_larger_than_guest = dev.subgroup_max > 32;
|
||||
// (RX_VK_WARP64=0 or 1, a test: the graphics stages' long warp path off or on, whatever the GPU; in the cache's stamp)
|
||||
if (const char* e = getenv("RX_VK_WARP64")) p.warp_size_potentially_larger_than_guest = e[0] == '1';
|
||||
p.lower_left_origin_mode = false;
|
||||
@@ -1225,9 +1223,11 @@ uint64_t disk_stamp() {
|
||||
const uint32_t mesh = (dev.mesh_shader ? 1u : 0u) | (dev.mesh_fallback ? 2u : 0u) | (dev.task_mesh_fallback ? 4u : 0u);
|
||||
add(&mesh, sizeof mesh);
|
||||
// (and what of the GPU the translator is told (make_profile): its warps' lanes and the driver's shuffle workaround, and
|
||||
// which stages it pins to 32 lanes, which keep the short path: profile_graphics)
|
||||
// which stages it pins to 32 lanes, which keep the short path: profile_graphics. An explicit warp override bypasses
|
||||
// the pinned graphics profile even if the base profile already has the requested width)
|
||||
const uint32_t lanes[] = {profile().warp_size_potentially_larger_than_guest ? 1u : 0u, profile().max_subgroup_size,
|
||||
profile().has_broken_spirv_fragment_shuffle ? 1u : 0u, (uint32_t)dev.sg32_stages};
|
||||
profile().has_broken_spirv_fragment_shuffle ? 1u : 0u, (uint32_t)dev.sg32_stages,
|
||||
getenv("RX_VK_WARP64") ? 1u : 0u};
|
||||
add(lanes, sizeof lanes);
|
||||
// (the records keep Shader::Info as it lies in memory: a cache written by another C++ library (the MSVC build's, then the
|
||||
// llvm-mingw one's libc++) has other layouts, and reading it crashed at start. The library and the sizes, so it starts again)
|
||||
|
||||
Reference in New Issue
Block a user