omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add renderer sampler state contract

Browse Source
This commit is contained in:
omigamedev
2026-06-02 15:56:26 +02:00
parent b68ddc42c6
commit 952a00e7d3
9 changed files with 322 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
tests/renderer_api/renderer_api_tests.cpp
View File

@@ -37,6 +37,11 @@ using pp::renderer::RecordingRenderDevice;
using pp::renderer::RecordingRenderTarget;
using pp::renderer::RecordingShaderProgram;
using pp::renderer::RecordingTexture2D;
using pp::renderer::SamplerAddressMode;
using pp::renderer::sampler_address_mode_name;
using pp::renderer::SamplerDesc;
using pp::renderer::SamplerFilter;
using pp::renderer::sampler_filter_name;
using pp::renderer::ScissorRect;
using pp::renderer::ShaderProgramDesc;
using pp::renderer::ShaderStageSource;
@@ -63,6 +68,9 @@ using pp::renderer::validate_compare_op;
using pp::renderer::validate_depth_state;
using pp::renderer::validate_mesh_desc;
using pp::renderer::validate_readback_region;
using pp::renderer::validate_sampler_address_mode;
using pp::renderer::validate_sampler_desc;
using pp::renderer::validate_sampler_filter;
using pp::renderer::validate_scissor;
using pp::renderer::validate_shader_catalog;
using pp::renderer::validate_shader_program_desc;
@@ -222,6 +230,26 @@ public:
return pp::foundation::Status::success();
}
[[nodiscard]] pp::foundation::Status bind_sampler(
std::uint32_t slot,
SamplerDesc sampler) noexcept override
{
if (!in_render_pass) {
return pp::foundation::Status::invalid_argument("render pass has not begun");
}
const auto slot_status = validate_texture_slot(slot);
if (!slot_status.ok()) {
return slot_status;
}
const auto sampler_status = validate_sampler_desc(sampler);
if (!sampler_status.ok()) {
return sampler_status;
}
last_sampler_slot = slot;
last_sampler_desc = sampler;
return pp::foundation::Status::success();
}
[[nodiscard]] pp::foundation::Status bind_mesh(IMesh& mesh) noexcept override
{
return validate_mesh_desc(mesh.desc());
@@ -324,6 +352,8 @@ public:
DepthState last_depth_state {};
std::uint32_t last_texture_slot = 0;
std::uint64_t last_texture_bytes = 0;
std::uint32_t last_sampler_slot = 0;
SamplerDesc last_sampler_desc {};
std::uint64_t last_upload_bytes = 0;
std::uint64_t last_readback_bytes = 0;
std::uint64_t last_capture_bytes = 0;
@@ -550,6 +580,39 @@ void validates_depth_contract(pp::tests::Harness& h)
PP_EXPECT(h, compare_op_name(static_cast<CompareOp>(255)) == std::string_view("unknown"));
}
void validates_sampler_contract(pp::tests::Harness& h)
{
const SamplerDesc sampler {
.min_filter = SamplerFilter::linear,
.mag_filter = SamplerFilter::nearest,
.mip_filter = SamplerFilter::linear,
.address_u = SamplerAddressMode::repeat,
.address_v = SamplerAddressMode::mirrored_repeat,
.address_w = SamplerAddressMode::clamp_to_border,
};
PP_EXPECT(h, validate_sampler_desc(sampler).ok());
PP_EXPECT(h, validate_sampler_filter(SamplerFilter::nearest).ok());
PP_EXPECT(h, validate_sampler_address_mode(SamplerAddressMode::clamp_to_border).ok());
PP_EXPECT(h, sampler_filter_name(SamplerFilter::linear) == std::string_view("linear"));
PP_EXPECT(h, sampler_address_mode_name(SamplerAddressMode::mirrored_repeat) == std::string_view("mirrored_repeat"));
auto bad_filter = sampler;
bad_filter.min_filter = static_cast<SamplerFilter>(255);
auto bad_address = sampler;
bad_address.address_w = static_cast<SamplerAddressMode>(255);
const auto bad_filter_status = validate_sampler_desc(bad_filter);
const auto bad_address_status = validate_sampler_desc(bad_address);
PP_EXPECT(h, !bad_filter_status.ok());
PP_EXPECT(h, bad_filter_status.code == StatusCode::invalid_argument);
PP_EXPECT(h, !bad_address_status.ok());
PP_EXPECT(h, bad_address_status.code == StatusCode::invalid_argument);
PP_EXPECT(h, sampler_filter_name(static_cast<SamplerFilter>(255)) == std::string_view("unknown"));
PP_EXPECT(h, sampler_address_mode_name(static_cast<SamplerAddressMode>(255)) == std::string_view("unknown"));
}
void validates_viewports_and_mesh_descriptors(pp::tests::Harness& h)
{
const Extent2D target { .width = 64, .height = 32 };
@@ -740,6 +803,12 @@ void renderer_interfaces_support_backend_neutral_dispatch(pp::tests::Harness& h)
.ok());
PP_EXPECT(h, context.bind_shader(shader).ok());
PP_EXPECT(h, context.bind_texture(2, texture).ok());
PP_EXPECT(h, context.bind_sampler(2, SamplerDesc {
.min_filter = SamplerFilter::linear,
.mag_filter = SamplerFilter::nearest,
.address_u = SamplerAddressMode::repeat,
})
.ok());
PP_EXPECT(h, context.bind_mesh(mesh).ok());
PP_EXPECT(h, context.draw().ok());
context.end_render_pass();
@@ -777,6 +846,9 @@ void renderer_interfaces_support_backend_neutral_dispatch(pp::tests::Harness& h)
PP_EXPECT(h, device.context.last_depth_state.compare == CompareOp::less_or_equal);
PP_EXPECT(h, device.context.last_texture_slot == 2U);
PP_EXPECT(h, device.context.last_texture_bytes == 8192U);
PP_EXPECT(h, device.context.last_sampler_slot == 2U);
PP_EXPECT(h, device.context.last_sampler_desc.mag_filter == SamplerFilter::nearest);
PP_EXPECT(h, device.context.last_sampler_desc.address_u == SamplerAddressMode::repeat);
PP_EXPECT(h, device.context.last_upload_bytes == 80U);
PP_EXPECT(h, device.context.last_readback_bytes == 80U);
PP_EXPECT(h, device.context.last_capture_bytes == 8192U);
@@ -831,12 +903,20 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
.ok());
PP_EXPECT(h, context.bind_shader(shader).ok());
PP_EXPECT(h, context.bind_texture(1, texture).ok());
PP_EXPECT(h, context.bind_sampler(1, SamplerDesc {
.min_filter = SamplerFilter::linear,
.mag_filter = SamplerFilter::nearest,
.address_u = SamplerAddressMode::repeat,
.address_v = SamplerAddressMode::clamp_to_edge,
.address_w = SamplerAddressMode::clamp_to_border,
})
.ok());
PP_EXPECT(h, context.bind_mesh(mesh).ok());
PP_EXPECT(h, context.draw().ok());
context.end_render_pass();
const auto commands = device.commands();
PP_EXPECT(h, commands.size() == 11U);
PP_EXPECT(h, commands.size() == 12U);
PP_EXPECT(h, commands[0].kind == RecordedRenderCommandKind::trace_marker);
PP_EXPECT(h, commands[0].component == std::string_view("renderer"));
PP_EXPECT(h, commands[0].name == std::string_view("frame"));
@@ -865,11 +945,16 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
PP_EXPECT(h, commands[7].texture_slot == 1U);
PP_EXPECT(h, commands[7].texture_desc.extent.height == 32U);
PP_EXPECT(h, recorded_render_command_kind_name(commands[7].kind) == std::string_view("bind_texture"));
PP_EXPECT(h, commands[8].kind == RecordedRenderCommandKind::bind_mesh);
PP_EXPECT(h, commands[8].mesh_desc.vertex_count == 3U);
PP_EXPECT(h, commands[9].kind == RecordedRenderCommandKind::draw);
PP_EXPECT(h, commands[10].kind == RecordedRenderCommandKind::end_render_pass);
PP_EXPECT(h, recorded_render_command_kind_name(commands[9].kind) == std::string_view("draw"));
PP_EXPECT(h, commands[8].kind == RecordedRenderCommandKind::bind_sampler);
PP_EXPECT(h, commands[8].sampler_slot == 1U);
PP_EXPECT(h, commands[8].sampler_desc.mag_filter == SamplerFilter::nearest);
PP_EXPECT(h, commands[8].sampler_desc.address_w == SamplerAddressMode::clamp_to_border);
PP_EXPECT(h, recorded_render_command_kind_name(commands[8].kind) == std::string_view("bind_sampler"));
PP_EXPECT(h, commands[9].kind == RecordedRenderCommandKind::bind_mesh);
PP_EXPECT(h, commands[9].mesh_desc.vertex_count == 3U);
PP_EXPECT(h, commands[10].kind == RecordedRenderCommandKind::draw);
PP_EXPECT(h, commands[11].kind == RecordedRenderCommandKind::end_render_pass);
PP_EXPECT(h, recorded_render_command_kind_name(commands[10].kind) == std::string_view("draw"));
PP_EXPECT(h, context.upload_texture(
texture,
@@ -877,12 +962,12 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
upload_bytes)
.ok());
const auto commands_after_upload = device.commands();
PP_EXPECT(h, commands_after_upload.size() == 12U);
PP_EXPECT(h, commands_after_upload[11].kind == RecordedRenderCommandKind::upload_texture);
PP_EXPECT(h, commands_after_upload[11].texture_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_upload[11].readback_region.x == 4U);
PP_EXPECT(h, commands_after_upload[11].upload_bytes == 96U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_upload[11].kind) == std::string_view("upload_texture"));
PP_EXPECT(h, commands_after_upload.size() == 13U);
PP_EXPECT(h, commands_after_upload[12].kind == RecordedRenderCommandKind::upload_texture);
PP_EXPECT(h, commands_after_upload[12].texture_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_upload[12].readback_region.x == 4U);
PP_EXPECT(h, commands_after_upload[12].upload_bytes == 96U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_upload[12].kind) == std::string_view("upload_texture"));
PP_EXPECT(h, context.read_texture(
texture,
@@ -890,22 +975,22 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
readback_buffer)
.ok());
const auto commands_after_readback = device.commands();
PP_EXPECT(h, commands_after_readback.size() == 13U);
PP_EXPECT(h, commands_after_readback[12].kind == RecordedRenderCommandKind::read_texture);
PP_EXPECT(h, commands_after_readback[12].texture_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_readback[12].readback_region.x == 4U);
PP_EXPECT(h, commands_after_readback[12].readback_region.height == 3U);
PP_EXPECT(h, commands_after_readback[12].readback_bytes == 96U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_readback[12].kind) == std::string_view("read_texture"));
PP_EXPECT(h, commands_after_readback.size() == 14U);
PP_EXPECT(h, commands_after_readback[13].kind == RecordedRenderCommandKind::read_texture);
PP_EXPECT(h, commands_after_readback[13].texture_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_readback[13].readback_region.x == 4U);
PP_EXPECT(h, commands_after_readback[13].readback_region.height == 3U);
PP_EXPECT(h, commands_after_readback[13].readback_bytes == 96U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_readback[13].kind) == std::string_view("read_texture"));
PP_EXPECT(h, context.capture_frame(target, readback_buffer).ok());
const auto commands_after_capture = device.commands();
PP_EXPECT(h, commands_after_capture.size() == 14U);
PP_EXPECT(h, commands_after_capture[13].kind == RecordedRenderCommandKind::capture_frame);
PP_EXPECT(h, commands_after_capture[13].target_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_capture[13].target_desc.extent.height == 32U);
PP_EXPECT(h, commands_after_capture[13].capture_bytes == 8192U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_capture[13].kind) == std::string_view("capture_frame"));
PP_EXPECT(h, commands_after_capture.size() == 15U);
PP_EXPECT(h, commands_after_capture[14].kind == RecordedRenderCommandKind::capture_frame);
PP_EXPECT(h, commands_after_capture[14].target_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_capture[14].target_desc.extent.height == 32U);
PP_EXPECT(h, commands_after_capture[14].capture_bytes == 8192U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_capture[14].kind) == std::string_view("capture_frame"));
PP_EXPECT(h, context.blit_render_target(
target,
@@ -915,16 +1000,16 @@ void recording_renderer_records_valid_command_sequences(pp::tests::Harness& h)
BlitFilter::linear)
.ok());
const auto commands_after_blit = device.commands();
PP_EXPECT(h, commands_after_blit.size() == 15U);
PP_EXPECT(h, commands_after_blit[14].kind == RecordedRenderCommandKind::blit_render_target);
PP_EXPECT(h, commands_after_blit[14].source_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_blit[14].destination_desc.extent.height == 32U);
PP_EXPECT(h, commands_after_blit[14].source_region.width == 16U);
PP_EXPECT(h, commands_after_blit[14].destination_region.x == 2U);
PP_EXPECT(h, commands_after_blit[14].blit_filter == BlitFilter::linear);
PP_EXPECT(h, commands_after_blit[14].blit_source_bytes == 512U);
PP_EXPECT(h, commands_after_blit[14].blit_destination_bytes == 128U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_blit[14].kind) == std::string_view("blit_render_target"));
PP_EXPECT(h, commands_after_blit.size() == 16U);
PP_EXPECT(h, commands_after_blit[15].kind == RecordedRenderCommandKind::blit_render_target);
PP_EXPECT(h, commands_after_blit[15].source_desc.extent.width == 64U);
PP_EXPECT(h, commands_after_blit[15].destination_desc.extent.height == 32U);
PP_EXPECT(h, commands_after_blit[15].source_region.width == 16U);
PP_EXPECT(h, commands_after_blit[15].destination_region.x == 2U);
PP_EXPECT(h, commands_after_blit[15].blit_filter == BlitFilter::linear);
PP_EXPECT(h, commands_after_blit[15].blit_source_bytes == 512U);
PP_EXPECT(h, commands_after_blit[15].blit_destination_bytes == 128U);
PP_EXPECT(h, recorded_render_command_kind_name(commands_after_blit[15].kind) == std::string_view("blit_render_target"));
device.clear();
PP_EXPECT(h, device.commands().empty());
@@ -978,6 +1063,10 @@ void recording_renderer_rejects_invalid_command_order_and_targets(pp::tests::Har
PP_EXPECT(h, !depth_before_begin.ok());
PP_EXPECT(h, depth_before_begin.code == StatusCode::invalid_argument);
const auto sampler_before_begin = context.bind_sampler(0, SamplerDesc {});
PP_EXPECT(h, !sampler_before_begin.ok());
PP_EXPECT(h, sampler_before_begin.code == StatusCode::invalid_argument);
const auto invalid_target = context.begin_render_pass(non_render_target, ClearColor {});
PP_EXPECT(h, !invalid_target.ok());
PP_EXPECT(h, invalid_target.code == StatusCode::invalid_argument);
@@ -1069,6 +1158,18 @@ void recording_renderer_rejects_invalid_command_order_and_targets(pp::tests::Har
PP_EXPECT(h, bind_texture_bad_slot.code == StatusCode::out_of_range);
PP_EXPECT(h, context.bind_texture(0, texture).ok());
const auto bind_sampler_bad_slot = context.bind_sampler(max_texture_slots, SamplerDesc {});
PP_EXPECT(h, !bind_sampler_bad_slot.ok());
PP_EXPECT(h, bind_sampler_bad_slot.code == StatusCode::out_of_range);
auto invalid_sampler = SamplerDesc {};
invalid_sampler.min_filter = static_cast<SamplerFilter>(255);
const auto bind_invalid_sampler = context.bind_sampler(0, invalid_sampler);
PP_EXPECT(h, !bind_invalid_sampler.ok());
PP_EXPECT(h, bind_invalid_sampler.code == StatusCode::invalid_argument);
PP_EXPECT(h, context.bind_sampler(0, SamplerDesc {}).ok());
const auto draw_without_mesh = context.draw();
PP_EXPECT(h, !draw_without_mesh.ok());
PP_EXPECT(h, draw_without_mesh.code == StatusCode::invalid_argument);
@@ -1101,6 +1202,10 @@ void recording_renderer_rejects_invalid_command_order_and_targets(pp::tests::Har
PP_EXPECT(h, !bind_texture_after_end.ok());
PP_EXPECT(h, bind_texture_after_end.code == StatusCode::invalid_argument);
const auto bind_sampler_after_end = context.bind_sampler(0, SamplerDesc {});
PP_EXPECT(h, !bind_sampler_after_end.ok());
PP_EXPECT(h, bind_sampler_after_end.code == StatusCode::invalid_argument);
const auto read_outside_bounds = context.read_texture(
texture,
ReadbackRegion { .x = 31, .y = 15, .width = 2, .height = 1 },
@@ -1187,6 +1292,7 @@ int main()
harness.run("validates_blit_contract", validates_blit_contract);
harness.run("validates_blend_contract", validates_blend_contract);
harness.run("validates_depth_contract", validates_depth_contract);
harness.run("validates_sampler_contract", validates_sampler_contract);
harness.run("validates_viewports_and_mesh_descriptors", validates_viewports_and_mesh_descriptors);
harness.run("validates_shader_program_descriptors", validates_shader_program_descriptors);
harness.run("validates_panopainter_shader_catalog", validates_panopainter_shader_catalog);