exposure_f.comp ran NGX's auto exposure in two passes: the 16x16 blocks wrote their fixed-point luma sums, then a single workgroup added them after a barrier and finished (11 us of a 25 us stage). PASS 2 does what NVIDIA's kernel does: each block adds its sum to a 64-bit total with an atomic add and counts itself in with an acquire-release add; the last block reads the total, finishes and leaves both words zero for the next frame. The total is an integer, the same in any order, so the exposure image and the values are the two passes' bit for bit. compile_rr2.py builds exposure_f2.spv next to the two passes' shaders (the block sum and the finish are shared functions now; their arithmetic is unchanged). 64-bit buffer atomics are a device feature (shaderBufferInt64Atomics), so RModel takes whether the device has it enabled (default no) and preset F uses the one pass only then and only with a model that has exposure_f2.spv; otherwise the two passes as before. vkd3d-proton creates its device with every feature the GPU reports except a list it turns off, which does not include this one (it backs D3D12's 64-bit atomics with it); the shim reads the device's features through the interop interface (GetDeviceFeatures) and logs the result. d4r-rr enables every feature the GPU has, and D4R_RR_TEST_NO_INT64_ATOMICS=1 turns this one off to run the two passes. Ray Reconstruction never runs on the native Vulkan frontend's device. Every image of every frame byte-identical to the previous build (1280x720 -> 1440p, 1114x626 -> 1080p, 960x540 -> 1080p, the stress inputs, with D4R_RR_TEST_ROBUST2=1, at levels 0 and 3, with D4R_RR2_SPLIT=1), and so is the two-pass fallback of the new build; presets D and E unchanged. Controls: the last block finishing with twice the total changes 64 of the 90 images of the 1280x720 sequence (and nothing under the fallback), finishing without its own block's sum 58 of 90. RX 9070 XT, d4r-rr 720p -> 1440p, interleaved: exposure 25.2 -> 14.9 us, frame 3.536 -> 3.526 ms (the fallback 25.1 us). Signed-off-by: itchyfeetleech <[email protected]>
133 lines
5.7 KiB
Plaintext
133 lines
5.7 KiB
Plaintext
#version 460
|
|
// Ray Reconstruction preset F (rr2_*): the auto exposure of rr2_histogram_auto_exposure_basic_kernel.
|
|
//
|
|
// NVIDIA's kernel sums a clamped luma per 16x16 block (a pairwise tree over the block's threads), converts each block
|
|
// sum to fixed point (x 2^32 / 10000, round to nearest) and adds them with a 64-bit atomic; the last block to finish
|
|
// turns the total into the exposure:
|
|
// exposure = 0.23547088 / max(mean luma, 0.005) -> the 1x1 exposure image of this frame
|
|
// values = { e, p, 1 / e, clamp(log2(e / p), -6, 6) / 6 } -> the 16-byte buffer encoder 0 and the output passes read
|
|
// with e the exposure truncated to binary16 and p the previous frame's (1 where either is zero).
|
|
// PASS 2 is that kernel (64-bit atomics on a storage buffer: shaderBufferInt64Atomics). Without them the runtime runs
|
|
// two passes: PASS 0 writes every block's fixed-point sum and PASS 1 (one workgroup) adds them and does what the last
|
|
// block does. The total is an integer: it does not depend on the order of the blocks, so both give the same values.
|
|
#extension GL_EXT_shader_explicit_arithmetic_types : require
|
|
#extension GL_EXT_control_flow_attributes : require
|
|
#ifndef PASS
|
|
#define PASS 0
|
|
#endif
|
|
#if PASS == 2
|
|
#extension GL_EXT_shader_atomic_int64 : require
|
|
#extension GL_KHR_memory_scope_semantics : require
|
|
#endif
|
|
layout(set = 0, binding = 0, std430) readonly buffer Params {
|
|
ivec2 last; // render size - 1
|
|
uint blocksX, blocks;
|
|
float invCount; // 10000 / (2^32 * render pixels)
|
|
uint reset; // the kernel's argument 32: no log ratio when set
|
|
} p;
|
|
#if PASS != 1
|
|
// One thread per column of the 16x16 block. NVIDIA's tree over the block's 256 threads (index 16 y + x: i += i + 128,
|
|
// then 64, 32, ... 1) is, per column, ((r0 + r8) + (r4 + r12)) + ((r2 + r10) + (r6 + r14)) of the even rows plus the
|
|
// same of the odd rows, and then the columns (c + c8, + 4, + 2, + 1).
|
|
layout(local_size_x = 16) in;
|
|
layout(set = 0, binding = 1) uniform sampler2D color;
|
|
shared float col[16];
|
|
// the block's fixed-point sum, in thread 0
|
|
uint64_t blockSum()
|
|
{
|
|
const uint tx = gl_LocalInvocationID.x;
|
|
const int x = int(gl_GlobalInvocationID.x), y0 = int(gl_WorkGroupID.y) * 16;
|
|
float r[16];
|
|
[[unroll]] for (int k = 0; k < 16; ++k) {
|
|
float v = 0.0;
|
|
if (x <= p.last.x && y0 + k <= p.last.y) {
|
|
const vec3 t = texelFetch(color, ivec2(x, y0 + k), 0).rgb;
|
|
precise float l = fma(t.b, 0.25, fma(t.r, 0.25, t.g * 0.5));
|
|
v = min(max(l, 0.0), 10000.0);
|
|
}
|
|
r[k] = v;
|
|
}
|
|
precise float u[8];
|
|
[[unroll]] for (int k = 0; k < 8; ++k) u[k] = r[k + 8] + r[k];
|
|
precise float v4[4];
|
|
[[unroll]] for (int k = 0; k < 4; ++k) v4[k] = u[k + 4] + u[k];
|
|
precise float w0 = v4[2] + v4[0], w1 = v4[3] + v4[1];
|
|
precise float c = w1 + w0;
|
|
col[tx] = c;
|
|
barrier();
|
|
if (tx != 0u) return 0ul;
|
|
precise float d[8];
|
|
[[unroll]] for (int k = 0; k < 8; ++k) d[k] = col[k + 8] + col[k];
|
|
precise float e0 = d[4] + d[0], e1 = d[5] + d[1], e2 = d[6] + d[2], e3 = d[7] + d[3];
|
|
precise float f0 = e2 + e0, f1 = e3 + e1;
|
|
precise float g = f1 + f0;
|
|
return uint64_t(roundEven(g * 429496.71875));
|
|
}
|
|
#endif
|
|
#if PASS == 0
|
|
layout(set = 0, binding = 2, std430) writeonly buffer Sums { uint64_t s[]; } sums;
|
|
void main()
|
|
{
|
|
const uint64_t s = blockSum();
|
|
if (gl_LocalInvocationID.x == 0u) sums.s[gl_WorkGroupID.y * p.blocksX + gl_WorkGroupID.x] = s;
|
|
}
|
|
#else
|
|
#if PASS == 1
|
|
layout(local_size_x = 64) in;
|
|
shared uint64_t part[64];
|
|
layout(set = 0, binding = 1, std430) readonly buffer Sums { uint64_t s[]; } sums;
|
|
#else
|
|
// s[0]: the total, s[1]: the blocks done; the last block leaves both 0 for the next frame
|
|
layout(set = 0, binding = 2, std430) buffer Sums { uint64_t s[]; } sums;
|
|
#endif
|
|
layout(set = 0, binding = PASS + 1, std430) writeonly buffer Values { vec4 v; } values;
|
|
layout(set = 0, binding = PASS + 2) uniform sampler2D previous;
|
|
layout(set = 0, binding = PASS + 3, r16f) uniform writeonly image2D current;
|
|
// the last block's work, from the frame's total
|
|
void finish(uint64_t total)
|
|
{
|
|
precise float mean = p.invCount * float(total);
|
|
precise float e = 0.23547088 / max(mean, 0.005);
|
|
imageStore(current, ivec2(0), vec4(e));
|
|
// cvt.rz.f16.f32: toward zero (e > 0)
|
|
float16_t h = float16_t(e);
|
|
if (float(h) > e) h = uint16BitsToFloat16(float16BitsToUint16(h) - uint16_t(1));
|
|
float cur = float(h);
|
|
if (cur == 0.0) cur = 1.0;
|
|
float prev = texelFetch(previous, ivec2(0), 0).r;
|
|
if (prev == 0.0) prev = 1.0;
|
|
float ratio = 0.0;
|
|
if (p.reset == 0u) ratio = clamp(log2(max(cur, 1e-8) / max(prev, 1e-8)), -6.0, 6.0) * 0.16666667;
|
|
values.v = vec4(cur, prev, 1.0 / cur, ratio);
|
|
}
|
|
#if PASS == 1
|
|
void main()
|
|
{
|
|
// the block sums are integers: any order. 64 strided partial sums, then thread 0 finishes
|
|
const uint tid = gl_LocalInvocationID.x;
|
|
uint64_t mine = 0ul;
|
|
for (uint b = tid; b < p.blocks; b += 64u) mine += sums.s[b];
|
|
part[tid] = mine;
|
|
barrier();
|
|
if (tid != 0u) return;
|
|
uint64_t total = 0ul;
|
|
for (uint b = 0u; b < 64u; ++b) total += part[b];
|
|
finish(total);
|
|
}
|
|
#else
|
|
void main()
|
|
{
|
|
const uint64_t s = blockSum();
|
|
if (gl_LocalInvocationID.x != 0u) return;
|
|
atomicAdd(sums.s[0], s, gl_ScopeDevice, 0, gl_SemanticsRelaxed);
|
|
// the release orders this block's add before its count, and the last block's acquire every block's add before
|
|
// its read of the total
|
|
if (atomicAdd(sums.s[1], 1ul, gl_ScopeDevice, gl_StorageSemanticsBuffer, gl_SemanticsAcquireRelease) != uint64_t(p.blocks - 1u))
|
|
return;
|
|
const uint64_t total = atomicExchange(sums.s[0], 0ul, gl_ScopeDevice, 0, gl_SemanticsRelaxed);
|
|
atomicExchange(sums.s[1], 0ul, gl_ScopeDevice, 0, gl_SemanticsRelaxed);
|
|
finish(total);
|
|
}
|
|
#endif
|
|
#endif
|