mirror of
https://github.com/KytyPS5/KytyPS5.git
synced 2026-10-20 02:47:02 +02:00
tests: cover 1D-array color render targets (#377)
* tests: cover 1D-array color render targets * tests: build shader regressions on Windows CI --------- Co-authored-by: nmzik <Nmzik@mail.ru>
This commit is contained in:
@@ -114,6 +114,7 @@ jobs:
|
||||
run: |
|
||||
cmake --build _Build/windows --target launcher ^
|
||||
audio_out2_port_tests pad_haptics_tests ime_dialog_tests lru_cache_tests virtual_memory_allocation_tests ^
|
||||
shader_recompiler_compute_tests ^
|
||||
resource_tracking_tests scalar_provenance_tests ^
|
||||
resource_materialization_tests shader_vertex_metadata_tests archive_file_tests avplayer_file_tests --parallel
|
||||
|
||||
|
||||
@@ -644,6 +644,8 @@ if(BUILD_TESTING)
|
||||
COMMAND $<TARGET_FILE:shader_recompiler_compute_tests> --compute-meta-clear-only)
|
||||
add_test(NAME buffer_cache_dirty_gc
|
||||
COMMAND $<TARGET_FILE:shader_recompiler_compute_tests> --buffer-cache-gc-only)
|
||||
add_test(NAME color_render_target_1d
|
||||
COMMAND $<TARGET_FILE:shader_recompiler_compute_tests> --rt1d-only)
|
||||
|
||||
if(WIN32)
|
||||
# These tests still depend on the Windows multisample-depth path.
|
||||
|
||||
@@ -8591,6 +8591,121 @@ public:
|
||||
std::printf("[gpu] %-32s ok\n", name);
|
||||
}
|
||||
|
||||
void CheckRenderExecutorColor1DArrayDiscovery() {
|
||||
constexpr const char *name = "RenderExecutorColor1DArrayDiscovery";
|
||||
constexpr uintptr_t base = 0x0000000203a00000ull;
|
||||
constexpr uint32_t width = 512;
|
||||
constexpr uint32_t height = 1;
|
||||
constexpr uint32_t bytes_per_element = 4;
|
||||
constexpr uint32_t first_slice = 2;
|
||||
constexpr uint32_t last_slice = 5;
|
||||
constexpr uint32_t image_layers = last_slice + 1;
|
||||
constexpr uint32_t view_layers = last_slice - first_slice + 1;
|
||||
constexpr uint64_t allocation_alignment = 0x10000;
|
||||
EnsureRuntimeContext();
|
||||
|
||||
const auto pitch = TileGetRenderTargetPitch(width, bytes_per_element, 0);
|
||||
TileSizeAlign layout{};
|
||||
Require(name, "tile layout",
|
||||
pitch == width &&
|
||||
TileGetRenderTargetSize(width, height, pitch,
|
||||
bytes_per_element, layout, 0) &&
|
||||
layout.size == 0x40000 &&
|
||||
layout.align == allocation_alignment,
|
||||
"1D-array render-target layout is unavailable");
|
||||
const auto allocation_size = layout.size * image_layers;
|
||||
|
||||
int64_t direct_offset = -1;
|
||||
Require(name, "direct allocation",
|
||||
Libs::LibKernel::Memory::KernelAllocateDirectMemory(
|
||||
0, Libs::LibKernel::Memory::KernelGetDirectMemorySize(),
|
||||
allocation_size, allocation_alignment, 0, &direct_offset) == 0,
|
||||
"1D-array color direct-memory allocation failed");
|
||||
void *mapped = reinterpret_cast<void *>(base);
|
||||
Require(name, "direct mapping",
|
||||
Libs::LibKernel::Memory::KernelMapDirectMemory(
|
||||
&mapped, allocation_size, 0x3, 0x10, direct_offset,
|
||||
allocation_alignment) == 0 &&
|
||||
mapped == reinterpret_cast<void *>(base),
|
||||
"1D-array color fixed mapping failed");
|
||||
std::memset(mapped, 0, allocation_size);
|
||||
|
||||
{
|
||||
RenderContext context(m_runtime_context);
|
||||
auto &scheduler = context.GetCommandScheduler();
|
||||
HW::Context registers{};
|
||||
HW::UserConfig user_config{};
|
||||
HW::Shader shaders{};
|
||||
registers.SetColorBase(0, {.addr = base});
|
||||
registers.SetColorInfo(
|
||||
0, {.format = Prospero::ChannelLayout::k8_8_8_8,
|
||||
.channel_type = Prospero::ChannelType::kSrgb,
|
||||
.channel_order = Prospero::ChannelOrder::kStandard});
|
||||
registers.SetColorView(
|
||||
0, {.base_array_slice_index = first_slice,
|
||||
.last_array_slice_index = last_slice});
|
||||
registers.SetColorAttrib2(0, {.height = height - 1, .width = width - 1});
|
||||
registers.SetColorAttrib3(0,
|
||||
{.tile_mode = Prospero::TileMode::kRenderTarget,
|
||||
.dimension = 0,
|
||||
.metadata_pipe_aligned = true});
|
||||
registers.SetRenderTargetMask(0x0f);
|
||||
scheduler.Begin(registers, user_config, shaders);
|
||||
|
||||
auto &resources = context;
|
||||
auto &texture_cache = resources.GetTextureCache();
|
||||
auto &executor = context.GetRenderExecutor();
|
||||
resources.MapMemory(base, allocation_size);
|
||||
|
||||
RenderColorInfo color{};
|
||||
RenderExecutorTestAccess::ResolveRenderColorTarget(
|
||||
executor, scheduler.Current(), color, 0);
|
||||
const auto attachment =
|
||||
texture_cache.FindRenderTarget(color.image_id, color.desc);
|
||||
const auto &image = texture_cache.GetImage(color.image_id);
|
||||
RenderDepthInfo no_depth{};
|
||||
const auto rendering = RenderExecutorTestAccess::AcquireRenderTargets(
|
||||
executor, scheduler.Current(), &color, 1, no_depth);
|
||||
scheduler.Current().BeginRendering(rendering);
|
||||
scheduler.Current().EndRendering();
|
||||
Require(
|
||||
name, "captured 1D-array target",
|
||||
color.image_id && attachment != nullptr &&
|
||||
rendering.color_attachments[0].image_view == attachment &&
|
||||
color.guest_array_layer == first_slice &&
|
||||
color.desc.info.type == Prospero::ImageType::kColor1D &&
|
||||
color.desc.info.extent == vk::Extent3D{width, height, 1} &&
|
||||
color.desc.info.resources == ImageSubresources{1, image_layers} &&
|
||||
color.desc.info.pitch == pitch &&
|
||||
color.desc.info.data.size == allocation_size &&
|
||||
color.desc.info.mip_layout[0].offset == 0 &&
|
||||
color.desc.info.mip_layout[0].size == allocation_size &&
|
||||
color.desc.view_info.type == vk::ImageViewType::e1DArray &&
|
||||
color.desc.view_info.base_layer == first_slice &&
|
||||
color.desc.view_info.layer_count == view_layers &&
|
||||
image.backing.image_type == vk::ImageType::e1D &&
|
||||
image.backing.layers == image_layers &&
|
||||
rendering.width == width && rendering.height == height &&
|
||||
rendering.num_layers == view_layers &&
|
||||
rendering.num_color_attachments == 1,
|
||||
"SDK dimension=0 slice range did not create a Vulkan 1D-array "
|
||||
"attachment view");
|
||||
|
||||
RenderExecutorTestAccess::ResetBindings(executor);
|
||||
resources.UnmapMemory(base, allocation_size);
|
||||
scheduler.Finish();
|
||||
}
|
||||
|
||||
Require(name, "unmap direct backing",
|
||||
Libs::LibKernel::Memory::KernelMunmap(base, allocation_size) == 0,
|
||||
"1D-array color direct mapping release failed");
|
||||
Require(name, "release direct backing",
|
||||
Libs::LibKernel::Memory::KernelReleaseDirectMemory(
|
||||
direct_offset, allocation_size) == 0,
|
||||
"1D-array color direct-memory allocation release failed");
|
||||
std::printf("[gpu] %-32s ok\n", name);
|
||||
}
|
||||
|
||||
void CheckRenderExecutorColorVolumeDiscovery() {
|
||||
constexpr const char *name = "RenderExecutorColorVolumeDiscovery";
|
||||
constexpr uintptr_t base = 0x0000000203e00000ull;
|
||||
@@ -35322,6 +35437,7 @@ int main(int argc, char **argv) {
|
||||
VulkanHarness vulkan;
|
||||
vulkan.CheckRasterization(false);
|
||||
vulkan.CheckRenderExecutorColorDiscovery();
|
||||
vulkan.CheckRenderExecutorColor1DArrayDiscovery();
|
||||
vulkan.CheckRenderExecutorColorVolumeDiscovery();
|
||||
vulkan.CheckRenderExecutorColorMetadataClear();
|
||||
vulkan.CheckSampledDccClear();
|
||||
@@ -35425,6 +35541,12 @@ int main(int argc, char **argv) {
|
||||
RunCase(&vulkan, VectorReadlaneSelectsTwoKeysWithinWave());
|
||||
return 0;
|
||||
}
|
||||
if (argc == 2 && std::strcmp(argv[1], "--rt1d-only") == 0) {
|
||||
VulkanHarness vulkan;
|
||||
vulkan.CheckRenderExecutorColorDiscovery();
|
||||
vulkan.CheckRenderExecutorColor1DArrayDiscovery();
|
||||
return 0;
|
||||
}
|
||||
#if KYTY_PLATFORM == KYTY_PLATFORM_WINDOWS
|
||||
if (argc == 2 && std::strcmp(argv[1], "--reverse-rt-death") == 0) {
|
||||
RunReverseRenderTargetDeathCase();
|
||||
@@ -35580,6 +35702,7 @@ int main(int argc, char **argv) {
|
||||
vulkan.CheckGraphicsPushConstantBank();
|
||||
#if KYTY_PLATFORM == KYTY_PLATFORM_WINDOWS
|
||||
vulkan.CheckRenderExecutorColorDiscovery();
|
||||
vulkan.CheckRenderExecutorColor1DArrayDiscovery();
|
||||
vulkan.CheckRenderExecutorColorVolumeDiscovery();
|
||||
vulkan.CheckRenderExecutorColorMetadataClear();
|
||||
vulkan.CheckSampledDccClear();
|
||||
|
||||
Reference in New Issue
Block a user