Add a native D3D12 FSR Ray Regeneration route for gfx1200/gfx1201, using the game's device and queue with embedded HLSL guide preparation and output composition. Preserve the vkd3d compatibility route for RDNA3 and expose explicit route overrides and diagnostics. Improve Windows runtime compatibility: - Retry rejected application-ID initialization with a project identity. - Defer expensive RR backend creation until feature creation. - Recover from transient submission failures without disabling later frames. - Add shared-buffer export fallbacks through explicit heaps and a private device on the same adapter. - Safely evict old RR descriptor sets when input views change. - Treat requested RR presets as hints when a configured model is available. - Expand SR/RR input formats and handle diffuse/specular hit distances, packed normals, depth-stencil resources, and unused FSR guides. Reduce SR overhead by batching output downloads and format conversion under one completion wait. Optimize strict M enc2/tube attention with bounded FP32 accumulation and the original FP64 fallback for ambiguous rounding cases. Extend RDNA4 tooling with gfx1200/gfx1201 native FP8 RR model builds, capability checks, architecture-aware deployment, and experimental K/M kernel paths. Require matching model and runtime arithmetic families. Add optional embedded FSR shader optimizations keyed by shader hash and exact original SPIR-V contents. Preserve reflected metadata and record optimizer provenance, artifact hashes, and cache identity. Simplify Windows installation with automatic backend dependency downloads, download progress and ETA, backed-up absolute OptiScaler library paths, and recovery from interrupted RR model builds. Add build-kernels.bat and a kernels-only build matrix for all eleven registered RDNA targets, with code-object target validation and SHA256 manifests. Expand conversion probes, numerical stress tests, temporal benchmark tooling, installer/deployment tests, and setup documentation. Document synthetic regression and timing results, experimental build options, and remaining RDNA4 hardware validation requirements.
116 lines
7.2 KiB
C++
116 lines
7.2 KiB
C++
#pragma once
|
|
#include "d3d12_external.h"
|
|
#include "pixel_format.h"
|
|
#include <array>
|
|
|
|
namespace d4r::win {
|
|
struct PixelSpec {
|
|
pixel::Storage storage;
|
|
unsigned bytes;
|
|
bool direct;
|
|
};
|
|
inline PixelSpec pixel_spec(unsigned plane, DXGI_FORMAT format) {
|
|
using namespace pixel;
|
|
// Typeless resources use the corresponding floating-point/UNORM view,
|
|
// as NGX's resource-only ABI provides no SRV descriptor to disambiguate.
|
|
switch (format) {
|
|
case DXGI_FORMAT_R16G16B16A16_FLOAT: case DXGI_FORMAT_R16G16B16A16_TYPELESS:
|
|
return {rgba16f, 8, plane == color || plane == output};
|
|
case DXGI_FORMAT_R32G32B32A32_FLOAT: return {rgba32f, 16, false};
|
|
case DXGI_FORMAT_R11G11B10_FLOAT: return {r11g11b10f, 4, false};
|
|
case DXGI_FORMAT_R10G10B10A2_UNORM: case DXGI_FORMAT_R10G10B10A2_TYPELESS: return {rgb10a2, 4, false};
|
|
// sRGB views are read as their stored UNORM values, as the Linux shim does.
|
|
case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_TYPELESS: case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB:
|
|
return {rgba8, 4, false};
|
|
case DXGI_FORMAT_B8G8R8A8_UNORM: case DXGI_FORMAT_B8G8R8A8_TYPELESS: case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB:
|
|
return {bgra8, 4, false};
|
|
case DXGI_FORMAT_R9G9B9E5_SHAREDEXP: return {rgb9e5, 4, false};
|
|
case DXGI_FORMAT_R16G16_FLOAT: case DXGI_FORMAT_R16G16_TYPELESS: return {rg16f, 4, plane == motion};
|
|
case DXGI_FORMAT_R32G32_FLOAT: case DXGI_FORMAT_R32G32_TYPELESS: return {rg32f, 8, false};
|
|
case DXGI_FORMAT_R16G16_SNORM: return {rg16snorm, 4, false};
|
|
case DXGI_FORMAT_R16G16_UNORM: return {rg16unorm, 4, false};
|
|
case DXGI_FORMAT_R32_FLOAT: case DXGI_FORMAT_R32_TYPELESS: case DXGI_FORMAT_D32_FLOAT:
|
|
return {r32f, 4, plane == depth || plane == exposure};
|
|
case DXGI_FORMAT_R32G8X24_TYPELESS: case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS:
|
|
if (plane != depth) throw std::runtime_error("Depth/stencil resources are supported only for the depth input");
|
|
return {r32f, 4, true}; // D3D12 subresource 0 is the R32 depth plane.
|
|
case DXGI_FORMAT_R16_FLOAT: return {r16f, 2, false};
|
|
case DXGI_FORMAT_D24_UNORM_S8_UINT: case DXGI_FORMAT_R24G8_TYPELESS: case DXGI_FORMAT_R24_UNORM_X8_TYPELESS:
|
|
return {depth24, 4, false};
|
|
case DXGI_FORMAT_R16_TYPELESS: return {plane == exposure ? r16f : r16unorm, 2, false};
|
|
case DXGI_FORMAT_D16_UNORM: case DXGI_FORMAT_R16_UNORM:
|
|
return {r16unorm, 2, false};
|
|
default: throw std::runtime_error("No validated GPU conversion for DXGI format=" + std::to_string(format));
|
|
}
|
|
}
|
|
inline bool pixel_supported(unsigned plane, pixel::Storage storage) {
|
|
using namespace pixel;
|
|
switch (plane) {
|
|
// The Linux shim's supported_input/supported_output sets, plus the RG16 SNORM/UNORM motion formats.
|
|
case color: case output: return storage <= rgb10a2 || storage == rgb9e5;
|
|
case motion: return storage == rgba16f || storage == rgba32f || storage == rgba8 || (storage >= rg16f && storage <= rg16unorm);
|
|
case depth: return storage == r32f || storage == depth24 || storage == r16unorm || storage == r16f;
|
|
case exposure: return storage == r32f || storage == r16f || storage == rgba16f || storage == rgba32f ||
|
|
storage == rgba8 || storage == bgra8;
|
|
default: return false;
|
|
}
|
|
}
|
|
class PixelProgram {
|
|
diag::HipApi& hip_;
|
|
hipModule_t module_ = nullptr;
|
|
hipFunction_t decode_ = nullptr, encode_ = nullptr;
|
|
hipFunction_t validate_ = nullptr;
|
|
void* counters_ = nullptr;
|
|
public:
|
|
PixelProgram(diag::HipApi& hip, const std::filesystem::path& module) : hip_(hip) {
|
|
try {
|
|
diag::require_code_object_target(module, diag::HipApi::target_arch());
|
|
hip.check(hip.hipModuleLoad(&module_, diag::utf8(module.c_str()).c_str()), "Load native GPU format conversion");
|
|
hip.check(hip.hipModuleGetFunction(&decode_, module_, "d4r_pixel_decode"), "Resolve GPU pixel decode");
|
|
hip.check(hip.hipModuleGetFunction(&encode_, module_, "d4r_pixel_encode"), "Resolve GPU pixel encode");
|
|
} catch (...) { if (module_) (void)hip.hipModuleUnload(module_); throw; }
|
|
}
|
|
~PixelProgram() { if (counters_) (void)hip_.hipFree(counters_); if (module_) (void)hip_.hipModuleUnload(module_); }
|
|
PixelProgram(const PixelProgram&) = delete;
|
|
std::array<unsigned,2> validate(const void* source, uint64_t pitch, unsigned width, unsigned height) {
|
|
if (!width || !height || uint64_t(width) * height > UINT32_MAX / 4) throw std::runtime_error("Invalid output validation dimensions");
|
|
if (!validate_) hip_.check(hip_.hipModuleGetFunction(&validate_, module_, "d4r_pixel_validate"), "Resolve output validation kernel");
|
|
if (!counters_) hip_.check(hip_.hipMalloc(&counters_, 2 * sizeof(unsigned)), "Allocate validation counters");
|
|
std::array<unsigned,2> result{};
|
|
hip_.check(hip_.hipMemcpy(counters_, result.data(), sizeof(result), hipMemcpyHostToDevice), "Clear validation counters");
|
|
void* args[] = {&source, &pitch, &width, &height, &counters_};
|
|
hip_.check(hip_.hipModuleLaunchKernel(validate_, unsigned((uint64_t(width) * height + 255) / 256),1,1,256,1,1,0,nullptr,args,nullptr), "Validate output on GPU");
|
|
hip_.check(hip_.hipDeviceSynchronize(), "Output validation completion");
|
|
hip_.check(hip_.hipMemcpy(result.data(), counters_, sizeof(result), hipMemcpyDeviceToHost), "Read validation counters");
|
|
return result;
|
|
}
|
|
void convert_deferred(bool encode, const void* source, uint64_t sourcePitch, void* dest, uint64_t destPitch,
|
|
unsigned width, unsigned height, pixel::Storage format, unsigned plane) {
|
|
if (!width || !height || uint64_t(width) * height > UINT32_MAX) throw std::runtime_error("Invalid GPU conversion dimensions");
|
|
unsigned storage = unsigned(format);
|
|
void* args[] = {&source, &sourcePitch, &dest, &destPitch, &width, &height, &storage, &plane};
|
|
hip_.check(hip_.hipModuleLaunchKernel(encode ? encode_ : decode_, unsigned((uint64_t(width) * height + 255) / 256), 1, 1,
|
|
256, 1, 1, 0, nullptr, args, nullptr), encode ? "GPU pixel encode" : "GPU pixel decode");
|
|
}
|
|
void convert(bool encode, const void* source, uint64_t sourcePitch, void* dest, uint64_t destPitch,
|
|
unsigned width, unsigned height, pixel::Storage format, unsigned plane) {
|
|
convert_deferred(encode, source, sourcePitch, dest, destPitch, width, height, format, plane);
|
|
// CUDA may use other nonblocking streams. Standalone conversions must
|
|
// establish completion before handing the allocation to that API.
|
|
hip_.check(hip_.hipDeviceSynchronize(), "GPU conversion completion");
|
|
}
|
|
};
|
|
class PixelAllocation {
|
|
diag::HipApi& hip_;
|
|
public:
|
|
void* data = nullptr;
|
|
uint64_t pitch;
|
|
PixelAllocation(diag::HipApi& hip, unsigned width, unsigned height, unsigned canonicalBytes) : hip_(hip) {
|
|
pitch = (uint64_t(width) * canonicalBytes + 255) & ~uint64_t(255);
|
|
hip.check(hip.hipMalloc(&data, size_t(pitch * height)), "Allocate canonical GPU pixels");
|
|
}
|
|
~PixelAllocation() { if (data) (void)hip_.hipFree(data); }
|
|
PixelAllocation(const PixelAllocation&) = delete;
|
|
};
|
|
}
|