Keep temporal diagnostic staging alive through resize
Native and manual checks / native (ubuntu-24.04) (push) Failing after 34s
Native and manual checks / manual (push) Successful in 31s
Native and manual checks / native (windows-2025) (push) Canceled after 0s
Windows editor and software Vulkan / windows-graphics (push) Canceled after 0s
Native and manual checks / native (ubuntu-24.04) (push) Failing after 34s
Native and manual checks / manual (push) Successful in 31s
Native and manual checks / native (windows-2025) (push) Canceled after 0s
Windows editor and software Vulkan / windows-graphics (push) Canceled after 0s
This commit is contained in:
@@ -1,8 +1,18 @@
|
||||
#include "render_temporal_fixtures.hpp"
|
||||
#include <SDL3/SDL.h>
|
||||
#include <SDL3/SDL_vulkan.h>
|
||||
#include <vulkan/vulkan.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <chrono>
|
||||
#include <cstring>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
#include <string_view>
|
||||
#include <thread>
|
||||
#include <vector>
|
||||
|
||||
using namespace faset::render;
|
||||
using namespace faset::render::temporal_test;
|
||||
@@ -72,10 +82,98 @@ void pixel_decisions_are_diagnostic_only(VisibilityMode visibility) {
|
||||
require(renderer.pixels() == reference.pixels(),
|
||||
"Diagnostic toggles preserve the Off image");
|
||||
}
|
||||
|
||||
int resize_recreates_swapchain_with_diagnostics() {
|
||||
#ifndef _WIN32
|
||||
if (!std::getenv("DISPLAY") && !std::getenv("WAYLAND_DISPLAY"))
|
||||
return 77;
|
||||
#endif
|
||||
// A headless Vulkan ICD can render the other diagnostics tests but cannot
|
||||
// create the SDL surface needed to exercise swapchain recreation.
|
||||
if (!SDL_InitSubSystem(SDL_INIT_VIDEO))
|
||||
return 77;
|
||||
Uint32 required_count{};
|
||||
const auto* required = SDL_Vulkan_GetInstanceExtensions(&required_count);
|
||||
std::uint32_t available_count{};
|
||||
const auto enumerated = vkEnumerateInstanceExtensionProperties(
|
||||
nullptr, &available_count, nullptr) == VK_SUCCESS;
|
||||
std::vector<VkExtensionProperties> available(available_count);
|
||||
const bool queried = enumerated &&
|
||||
vkEnumerateInstanceExtensionProperties(nullptr, &available_count,
|
||||
available.data()) == VK_SUCCESS;
|
||||
const bool surface_supported = required && queried &&
|
||||
std::all_of(required, required + required_count, [&](const char* name) {
|
||||
return std::any_of(available.begin(), available.end(), [&](const auto& extension) {
|
||||
return std::strcmp(extension.extensionName, name) == 0;
|
||||
});
|
||||
});
|
||||
SDL_QuitSubSystem(SDL_INIT_VIDEO);
|
||||
if (!surface_supported)
|
||||
return 77;
|
||||
std::jthread watchdog([](std::stop_token stop) {
|
||||
for (int i = 0; i < 150 && !stop.stop_requested(); ++i)
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(200));
|
||||
if (!stop.stop_requested())
|
||||
std::_Exit(70);
|
||||
});
|
||||
RendererConfig config;
|
||||
config.width = 320;
|
||||
config.height = 240;
|
||||
config.headless = false;
|
||||
config.validation = true;
|
||||
config.temporal_mode = TemporalMode::TAA;
|
||||
config.temporal_diagnostics = true;
|
||||
Renderer renderer(config);
|
||||
auto frame = lit_scene(config.width, config.height);
|
||||
frame.draws.push_back(cube({0, 0, 0}, {.9f, .4f, .2f, 1}, "resized-cube"));
|
||||
renderer.render(frame);
|
||||
require(renderer.stats().temporal_counters_valid,
|
||||
"Initial window frame must have valid temporal pixel counts");
|
||||
const auto previous_width = renderer.width();
|
||||
const auto previous_height = renderer.height();
|
||||
renderer.resize(480, 270);
|
||||
const auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(3);
|
||||
while (std::chrono::steady_clock::now() < deadline) {
|
||||
SDL_PumpEvents();
|
||||
int pixel_width{}, pixel_height{};
|
||||
int window_count{};
|
||||
auto windows = SDL_GetWindows(&window_count);
|
||||
if (windows && window_count == 1)
|
||||
SDL_GetWindowSizeInPixels(windows[0], &pixel_width, &pixel_height);
|
||||
SDL_free(windows);
|
||||
if (pixel_width > 0 && pixel_height > 0 &&
|
||||
(std::uint32_t(pixel_width) != previous_width ||
|
||||
std::uint32_t(pixel_height) != previous_height))
|
||||
break;
|
||||
SDL_Delay(10);
|
||||
}
|
||||
if (std::chrono::steady_clock::now() >= deadline)
|
||||
return 77;
|
||||
renderer.render(frame);
|
||||
require(renderer.width() != previous_width || renderer.height() != previous_height,
|
||||
"Render must recreate swapchain and temporal targets at the new extent");
|
||||
require(renderer.stats().temporal_counters_valid &&
|
||||
renderer.stats().temporal_accepted_pixels == 0 &&
|
||||
renderer.stats().temporal_rejected_pixels ==
|
||||
renderer.width() * renderer.height() &&
|
||||
renderer.stats().validation_errors == 0,
|
||||
"Resize frame must reject old history and read back a fresh counter buffer");
|
||||
renderer.render(frame);
|
||||
require(renderer.stats().temporal_counters_valid &&
|
||||
renderer.stats().temporal_accepted_pixels +
|
||||
renderer.stats().temporal_rejected_pixels ==
|
||||
renderer.width() * renderer.height() &&
|
||||
renderer.stats().validation_errors == 0,
|
||||
"Following frame must retain valid temporal counters after resize");
|
||||
return 0;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
int main() {
|
||||
int main(int argc, char** argv) {
|
||||
try {
|
||||
if (argc == 2 && std::string_view(argv[1]) == "--window-resize")
|
||||
return resize_recreates_swapchain_with_diagnostics();
|
||||
require(argc == 1, "Unknown temporal diagnostics test arguments");
|
||||
pixel_decisions_are_diagnostic_only(VisibilityMode::Direct);
|
||||
pixel_decisions_are_diagnostic_only(VisibilityMode::GpuFrustum);
|
||||
std::cout << "Temporal pixel diagnostics are opt-in and exact\n";
|
||||
|
||||
Reference in New Issue
Block a user